Patchwork net: Reject non-netdevs in qmp_netdev_del()

login
register
mail settings
Submitter Stefan Hajnoczi
Date Oct. 24, 2012, 12:34 p.m.
Message ID <1351082052-13387-1-git-send-email-stefanha@redhat.com>
Download mbox | patch
Permalink /patch/193759/
State New
Headers show

Comments

Stefan Hajnoczi - Oct. 24, 2012, 12:34 p.m.
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 <stefanha@redhat.com>
---
 net.c | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)
Stefan Hajnoczi - Nov. 1, 2012, 10:06 a.m.
On Wed, Oct 24, 2012 at 02:34:12PM +0200, Stefan Hajnoczi wrote:
> 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 <stefanha@redhat.com>
> ---
>  net.c | 9 ++++++++-
>  1 file changed, 8 insertions(+), 1 deletion(-)

Applied to the net tree:
https://github.com/stefanha/qemu/commits/net

Stefan

Patch

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)