From patchwork Sat Jan 22 13:07:26 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefan Hajnoczi X-Patchwork-Id: 80002 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 25F03B7102 for ; Sun, 23 Jan 2011 00:09:23 +1100 (EST) Received: from localhost ([127.0.0.1]:45950 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1PgdDM-0000eV-0V for incoming@patchwork.ozlabs.org; Sat, 22 Jan 2011 08:09:12 -0500 Received: from [140.186.70.92] (port=59352 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1PgdC8-0000B1-97 for qemu-devel@nongnu.org; Sat, 22 Jan 2011 08:07:57 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1PgdC7-0004FA-8Q for qemu-devel@nongnu.org; Sat, 22 Jan 2011 08:07:56 -0500 Received: from mtagate1.uk.ibm.com ([194.196.100.161]:40611) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1PgdC6-0004Ec-Ue for qemu-devel@nongnu.org; Sat, 22 Jan 2011 08:07:55 -0500 Received: from d06nrmr1806.portsmouth.uk.ibm.com (d06nrmr1806.portsmouth.uk.ibm.com [9.149.39.193]) by mtagate1.uk.ibm.com (8.13.1/8.13.1) with ESMTP id p0MD7q8Y010501 for ; Sat, 22 Jan 2011 13:07:52 GMT Received: from d06av08.portsmouth.uk.ibm.com (d06av08.portsmouth.uk.ibm.com [9.149.37.249]) by d06nrmr1806.portsmouth.uk.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id p0MD7qYd1466446 for ; Sat, 22 Jan 2011 13:07:54 GMT Received: from d06av08.portsmouth.uk.ibm.com (loopback [127.0.0.1]) by d06av08.portsmouth.uk.ibm.com (8.14.4/8.13.1/NCO v10.0 AVout) with ESMTP id p0MD7nLm029426 for ; Sat, 22 Jan 2011 13:07:49 GMT Received: from stefanha-thinkpad.ibm.com (sig-9-145-178-27.de.ibm.com [9.145.178.27]) by d06av08.portsmouth.uk.ibm.com (8.14.4/8.13.1/NCO v10.0 AVin) with ESMTP id p0MD7mjT029423; Sat, 22 Jan 2011 13:07:49 GMT From: Stefan Hajnoczi To: Date: Sat, 22 Jan 2011 13:07:26 +0000 Message-Id: <1295701646-3022-1-git-send-email-stefanha@linux.vnet.ibm.com> X-Mailer: git-send-email 1.7.2.3 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6, seldom 2.4 (older, 4) Cc: Anthony Liguori , Stefan Hajnoczi Subject: [Qemu-devel] [PATCH] qemu-char: Check for missing backend name 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 Check if the backend option is missing before searching the backend table. This fixes a NULL pointer dereference when QEMU is invoked with the following invalid command-line: $ qemu -chardev id=foo,path=/tmp/socket Previously QEMU would segfault, now it produces this error message: chardev: "foo" missing backend Signed-off-by: Stefan Hajnoczi --- qemu-char.c | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/qemu-char.c b/qemu-char.c index edc9ad6..8a424d6 100644 --- a/qemu-char.c +++ b/qemu-char.c @@ -2508,6 +2508,11 @@ CharDriverState *qemu_chr_open_opts(QemuOpts *opts, return NULL; } + if (qemu_opt_get(opts, "backend") == NULL) { + fprintf(stderr, "chardev: \"%s\" missing backend\n", + qemu_opts_id(opts)); + return NULL; + } for (i = 0; i < ARRAY_SIZE(backend_table); i++) { if (strcmp(backend_table[i].name, qemu_opt_get(opts, "backend")) == 0) break;