From patchwork Mon Jun 7 14:42:18 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?q?Daniel_P=2E_Berrang=C3=A9?= X-Patchwork-Id: 54868 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [199.232.76.165]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id D746EB7D1C for ; Tue, 8 Jun 2010 01:00:42 +1000 (EST) Received: from localhost ([127.0.0.1]:36891 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1OLdoR-0008Ea-Sw for incoming@patchwork.ozlabs.org; Mon, 07 Jun 2010 11:00:27 -0400 Received: from [140.186.70.92] (port=56226 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1OLdXx-0005r0-EF for qemu-devel@nongnu.org; Mon, 07 Jun 2010 10:43:45 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69) (envelope-from ) id 1OLdXf-00055O-As for qemu-devel@nongnu.org; Mon, 07 Jun 2010 10:43:24 -0400 Received: from mx1.redhat.com ([209.132.183.28]:19032) by eggs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1OLdXf-00055E-3x for qemu-devel@nongnu.org; Mon, 07 Jun 2010 10:43:07 -0400 Received: from int-mx05.intmail.prod.int.phx2.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.18]) by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id o57Eh6gN018181 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Mon, 7 Jun 2010 10:43:06 -0400 Received: from localhost.localdomain (dhcp-1-192.lcy.redhat.com [10.32.224.192]) by int-mx05.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id o57EgrCW031909; Mon, 7 Jun 2010 10:43:04 -0400 From: "Daniel P. Berrange" To: qemu-devel@nongnu.org Date: Mon, 7 Jun 2010 15:42:18 +0100 Message-Id: <1275921752-29420-6-git-send-email-berrange@redhat.com> In-Reply-To: <1275921752-29420-1-git-send-email-berrange@redhat.com> References: <1275921752-29420-1-git-send-email-berrange@redhat.com> X-Scanned-By: MIMEDefang 2.67 on 10.5.11.18 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. Cc: Subject: [Qemu-devel] [PATCH 05/19] Ensure that QEMU exits if drive_add parsing fails X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org The drive_add() method returns NULL if it failed to parse the parameter values for any reason. All callers must check this and exit if failure occurred. Annotate the method so that the compiler validates this. Signed-off-by: Daniel P. Berrange --- vl.c | 38 ++++++++++++++++++++++++++------------ 1 files changed, 26 insertions(+), 12 deletions(-) diff --git a/vl.c b/vl.c index 7121cd0..3d08a44 100644 --- a/vl.c +++ b/vl.c @@ -654,6 +654,7 @@ static int bt_parse(const char *opt) #define MTD_ALIAS "if=mtd" #define SD_ALIAS "index=0,if=sd" +QEMU_WARN_UNUSED_RESULT QemuOpts *drive_add(const char *file, const char *fmt, ...) { va_list ap; @@ -2682,7 +2683,8 @@ int main(int argc, char **argv, char **envp) if (optind >= argc) break; if (argv[optind][0] != '-') { - hda_opts = drive_add(argv[optind++], HD_ALIAS, 0); + if (!(hda_opts = drive_add(argv[optind++], HD_ALIAS, 0))) + exit(1); } else { const QEMUOption *popt; @@ -2731,14 +2733,18 @@ int main(int argc, char **argv, char **envp) ",trans=lba" : translation == BIOS_ATA_TRANSLATION_NONE ? ",trans=none" : ""); - break; + if (!hda_opts) + exit(1); + break; case QEMU_OPTION_hdb: case QEMU_OPTION_hdc: case QEMU_OPTION_hdd: - drive_add(optarg, HD_ALIAS, popt->index - QEMU_OPTION_hda); + if (!drive_add(optarg, HD_ALIAS, popt->index - QEMU_OPTION_hda)) + exit(1); break; case QEMU_OPTION_drive: - drive_add(NULL, "%s", optarg); + if (!drive_add(NULL, "%s", optarg)) + exit(1); break; case QEMU_OPTION_set: if (qemu_set_option(optarg) != 0) @@ -2749,13 +2755,16 @@ int main(int argc, char **argv, char **envp) exit(1); break; case QEMU_OPTION_mtdblock: - drive_add(optarg, MTD_ALIAS); + if (!drive_add(optarg, MTD_ALIAS)) + exit(1); break; case QEMU_OPTION_sd: - drive_add(optarg, SD_ALIAS); + if (!drive_add(optarg, SD_ALIAS)) + exit(1); break; case QEMU_OPTION_pflash: - drive_add(optarg, PFLASH_ALIAS); + if (!drive_add(optarg, PFLASH_ALIAS)) + exit(1); break; case QEMU_OPTION_snapshot: snapshot = 1; @@ -2834,7 +2843,8 @@ int main(int argc, char **argv, char **envp) kernel_cmdline = optarg; break; case QEMU_OPTION_cdrom: - drive_add(optarg, CDROM_ALIAS); + if (!drive_add(optarg, CDROM_ALIAS)) + exit(1); break; case QEMU_OPTION_boot: { @@ -2887,7 +2897,8 @@ int main(int argc, char **argv, char **envp) break; case QEMU_OPTION_fda: case QEMU_OPTION_fdb: - drive_add(optarg, FD_ALIAS, popt->index - QEMU_OPTION_fda); + if (!drive_add(optarg, FD_ALIAS, popt->index - QEMU_OPTION_fda)) + exit(1); break; case QEMU_OPTION_no_fd_bootchk: fd_bootchk = 0; @@ -3625,17 +3636,20 @@ int main(int argc, char **argv, char **envp) if (default_cdrom) { /* we always create the cdrom drive, even if no disk is there */ - drive_add(NULL, CDROM_ALIAS); + if (!drive_add(NULL, CDROM_ALIAS)) + exit(1); } if (default_floppy) { /* we always create at least one floppy */ - drive_add(NULL, FD_ALIAS, 0); + if (!drive_add(NULL, FD_ALIAS, 0)) + exit(1); } if (default_sdcard) { /* we always create one sd slot, even if no card is in it */ - drive_add(NULL, SD_ALIAS); + if (!drive_add(NULL, SD_ALIAS)) + exit(1); } /* open the virtual block devices */