From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:44170) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XUzPW-00080Q-DJ for qemu-devel@nongnu.org; Fri, 19 Sep 2014 10:43:53 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1XUzPQ-0007Hk-H6 for qemu-devel@nongnu.org; Fri, 19 Sep 2014 10:43:46 -0400 Received: from mx1.redhat.com ([209.132.183.28]:58908) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XUzPQ-0007GT-6J for qemu-devel@nongnu.org; Fri, 19 Sep 2014 10:43:40 -0400 From: Stefan Hajnoczi Date: Fri, 19 Sep 2014 15:41:45 +0100 Message-Id: <1411137738-31280-27-git-send-email-stefanha@redhat.com> In-Reply-To: <1411137738-31280-1-git-send-email-stefanha@redhat.com> References: <1411137738-31280-1-git-send-email-stefanha@redhat.com> Subject: [Qemu-devel] [PULL 26/59] qdev-monitor: fix segmentation fault on qdev_device_help() List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Peter Maydell , Gonglei , Stefan Hajnoczi From: Gonglei Normally, qmp_device_list_properties() may return NULL when a device haven't special properties excpet Object and DeviceState properties, such as virtio-balloon-device. We just need check local_err instead of prop_list. Example: Segmentation fault (core dumped) The backtrace as below: Program received signal SIGSEGV, Segmentation fault. 0x00005555559af1a8 in error_get_pretty (err=0x0) at util/error.c:152 152 return err->msg; (gdb) bt #0 0x00005555559af1a8 in error_get_pretty (err=0x0) at util/error.c:152 #1 0x000055555572fce9 in qdev_device_help (opts=0x5555562fdfe0) at qdev-monitor.c:210 #2 0x000055555574a6f2 in device_help_func (opts=0x5555562fdfe0, opaque=0x0) at vl.c:2362 #3 0x00005555559c0a33 in qemu_opts_foreach (list=0x555555dd0b40 , func=0x55555574a6ca , opaque=0x0, abort_on_failure=0) at util/qemu-option.c:1072 #4 0x000055555574f514 in main (argc=3, argv=0x7fffffffe218, envp=0x7fffffffe238) at vl.c:4246 Signed-off-by: Gonglei Reviewed-by: Markus Armbruster Signed-off-by: Stefan Hajnoczi --- qdev-monitor.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/qdev-monitor.c b/qdev-monitor.c index fb9ee24..5ec6606 100644 --- a/qdev-monitor.c +++ b/qdev-monitor.c @@ -206,7 +206,7 @@ int qdev_device_help(QemuOpts *opts) } prop_list = qmp_device_list_properties(driver, &local_err); - if (!prop_list) { + if (local_err) { error_printf("%s\n", error_get_pretty(local_err)); error_free(local_err); return 1; -- 1.9.3