From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:36348) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1T3rRm-00086z-Ey for qemu-devel@nongnu.org; Tue, 21 Aug 2012 12:36:55 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1T3rRg-0006lc-3w for qemu-devel@nongnu.org; Tue, 21 Aug 2012 12:36:54 -0400 Received: from mail-iy0-f173.google.com ([209.85.210.173]:38557) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1T3rRf-0006lM-VT for qemu-devel@nongnu.org; Tue, 21 Aug 2012 12:36:48 -0400 Received: by iakx26 with SMTP id x26so3432806iak.4 for ; Tue, 21 Aug 2012 09:36:46 -0700 (PDT) Sender: fluxion From: Michael Roth Date: Tue, 21 Aug 2012 11:36:36 -0500 Message-Id: <1345566996-13782-1-git-send-email-mdroth@linux.vnet.ibm.com> Subject: [Qemu-devel] [PATCH for-1.2] libcacard: Fix segfault when no backend specified List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: aliguori@us.ibm.com When a user does not specify a backend, a segfault can be triggered due to a strcmp() being called on a NULL char*: $ gdb --args qemu -usb -device usb-ccid \ -device ccid-card-emulated,id=smartcard0 \ ... (gdb) s emulated_initfn (base=0x555556cb2e70) at /home/mdroth/w/qemu.git/hw/ccid-card-emulated.c:503 503 card->backend = parse_enumeration(card->backend_str, backend_enum_table, 0); (gdb) s parse_enumeration (not_found_value=0, table=0x555555b9b3c0, str=0x0) at /home/mdroth/w/qemu.git/hw/ccid-card-emulated.c:476 476 while (table->name != NULL) { (gdb) s 477 if (strcmp(table->name, str) == 0) { (gdb) s Program received signal SIGSEGV, Segmentation fault. 0x00007ffff60df09a in ?? () from /lib/x86_64-linux-gnu/libc.so.6 After the fix: $ qemu -usb -device usb-ccid \ -device ccid-card-emulated,id=smartcard0 \ ... unknown backend, must be one of: nss-emulated certificates qemu-system-x86_64: -device ccid-card-emulated,id=smartcard0,backend=nss-certificates: Device 'ccid-card-emulated' could not be initialized Signed-off-by: Michael Roth --- hw/ccid-card-emulated.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/hw/ccid-card-emulated.c b/hw/ccid-card-emulated.c index f4a6da4..740e8df 100644 --- a/hw/ccid-card-emulated.c +++ b/hw/ccid-card-emulated.c @@ -473,6 +473,9 @@ static uint32_t parse_enumeration(char *str, { uint32_t ret = not_found_value; + if (!str) { + return ret; + } while (table->name != NULL) { if (strcmp(table->name, str) == 0) { ret = table->value; -- 1.7.9.5