From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:47071) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TTsfW-0005AZ-9O for qemu-devel@nongnu.org; Thu, 01 Nov 2012 07:10:44 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1TTsfV-0007rJ-48 for qemu-devel@nongnu.org; Thu, 01 Nov 2012 07:10:38 -0400 Received: from mx1.redhat.com ([209.132.183.28]:38246) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TTsfU-0007rC-KE for qemu-devel@nongnu.org; Thu, 01 Nov 2012 07:10:36 -0400 From: Stefan Hajnoczi Date: Thu, 1 Nov 2012 12:10:17 +0100 Message-Id: <1351768218-21466-4-git-send-email-stefanha@redhat.com> In-Reply-To: <1351768218-21466-1-git-send-email-stefanha@redhat.com> References: <1351768218-21466-1-git-send-email-stefanha@redhat.com> Subject: [Qemu-devel] [PATCH 3/4] net: Reject non-netdevs in qmp_netdev_del() List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Anthony Liguori Cc: qemu-devel@nongnu.org, Stefan Hajnoczi The netdev_del command crashes when given a -net device, because it calls qemu_opts_del(NULL). Check that this is a -netdev before attempting to delete it and the QemuOpts. Note the subtle change from qemu_find_opts_err("netdev", errp) to qemu_find_opts_err("netdev", NULL). Since "netdev" is a built in options group and we don't check for NULL return anyway, there's no use in passing errp here. Signed-off-by: Stefan Hajnoczi --- net.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/net.c b/net.c index ae4bc0d..e8ae13e 100644 --- a/net.c +++ b/net.c @@ -827,6 +827,7 @@ exit_err: void qmp_netdev_del(const char *id, Error **errp) { NetClientState *nc; + QemuOpts *opts; nc = qemu_find_netdev(id); if (!nc) { @@ -834,8 +835,14 @@ void qmp_netdev_del(const char *id, Error **errp) return; } + opts = qemu_opts_find(qemu_find_opts_err("netdev", NULL), id); + if (!opts) { + error_setg(errp, "Device '%s' is not a netdev", id); + return; + } + qemu_del_net_client(nc); - qemu_opts_del(qemu_opts_find(qemu_find_opts_err("netdev", errp), id)); + qemu_opts_del(opts); } void print_net_client(Monitor *mon, NetClientState *nc) -- 1.7.12.1