From patchwork Thu May 30 14:14:45 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefan Hajnoczi X-Patchwork-Id: 247613 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id E398B2C007A for ; Fri, 31 May 2013 00:17:35 +1000 (EST) Received: from localhost ([::1]:43979 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Ui3fa-0001Ie-3P for incoming@patchwork.ozlabs.org; Thu, 30 May 2013 10:17:34 -0400 Received: from eggs.gnu.org ([208.118.235.92]:45410) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Ui3dK-0006c0-GA for qemu-devel@nongnu.org; Thu, 30 May 2013 10:15:21 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Ui3dE-0004FB-9x for qemu-devel@nongnu.org; Thu, 30 May 2013 10:15:14 -0400 Received: from mx1.redhat.com ([209.132.183.28]:48978) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Ui3dD-0004Ef-VL; Thu, 30 May 2013 10:15:08 -0400 Received: from int-mx01.intmail.prod.int.phx2.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id r4UEEtp6008761 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Thu, 30 May 2013 10:14:56 -0400 Received: from localhost (ovpn-112-44.ams2.redhat.com [10.36.112.44]) by int-mx01.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id r4UEEsiW011463; Thu, 30 May 2013 10:14:55 -0400 From: Stefan Hajnoczi To: Date: Thu, 30 May 2013 16:14:45 +0200 Message-Id: <1369923286-22260-3-git-send-email-stefanha@redhat.com> In-Reply-To: <1369923286-22260-1-git-send-email-stefanha@redhat.com> References: <1369923286-22260-1-git-send-email-stefanha@redhat.com> X-Scanned-By: MIMEDefang 2.67 on 10.5.11.11 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 209.132.183.28 Cc: Cam Macdonell , Markus Armbruster , Stefan Hajnoczi , qemu-stable@nongnu.org Subject: [Qemu-devel] [PATCH 2/3] ivshmem: add missing error exit(2) X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org If the user fails to specify 'chardev' or 'shm' then we cannot continue. Exit right away so that we don't invoke shm_open(3) with a NULL pointer. It would be nice to replace exit(1) with error returns in the PCI device .init() function, but leave that for another patch since exit(1) is currently used elsewhere. Spotted by Coverity. Cc: Cam Macdonell Cc: qemu-stable@nongnu.org Signed-off-by: Stefan Hajnoczi --- hw/misc/ivshmem.c | 1 + 1 file changed, 1 insertion(+) diff --git a/hw/misc/ivshmem.c b/hw/misc/ivshmem.c index a19a6d6..5658f73 100644 --- a/hw/misc/ivshmem.c +++ b/hw/misc/ivshmem.c @@ -735,6 +735,7 @@ static int pci_ivshmem_init(PCIDevice *dev) if (s->shmobj == NULL) { fprintf(stderr, "Must specify 'chardev' or 'shm' to ivshmem\n"); + exit(1); } IVSHMEM_DPRINTF("using shm_open (shm object = %s)\n", s->shmobj);