[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 3/4] net: Reject non-netdevs in qmp_netdev_del()
From: |
Stefan Hajnoczi |
Subject: |
[Qemu-devel] [PATCH 3/4] net: Reject non-netdevs in qmp_netdev_del() |
Date: |
Thu, 1 Nov 2012 12:10:17 +0100 |
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 <address@hidden>
---
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
- [Qemu-devel] [PULL 1.3 0/4] Net patches, Stefan Hajnoczi, 2012/11/01
- [Qemu-devel] [PATCH 1/4] e1000: drop check_rxov, always treat RX ring with RDH == RDT as empty, Stefan Hajnoczi, 2012/11/01
- [Qemu-devel] [PATCH 3/4] net: Reject non-netdevs in qmp_netdev_del(),
Stefan Hajnoczi <=
- [Qemu-devel] [PATCH 4/4] e1000: pre-initialize RAH/RAL registers, Stefan Hajnoczi, 2012/11/01
- [Qemu-devel] [PATCH 2/4] net: use "socket" model name for UDP sockets, Stefan Hajnoczi, 2012/11/01
- Re: [Qemu-devel] [PULL 1.3 0/4] Net patches, Anthony Liguori, 2012/11/01