From: Andreas Färber <afaerber@suse.de>
Date: Tue, 12 Feb 2013 22:16:06 +0000 (+0100)
Subject: net: Avoid NULL function pointer dereference on cleanup
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=cc2a90432d9cb7546a2c4360ad7200a2fb3af31a;p=qemu.git

net: Avoid NULL function pointer dereference on cleanup

The pSeries machine and some other devices don't supply a cleanup
callback. Revert part of 1ceef9f27359cbe92ef124bf74de6f792e71f6fb that
started calling it unconditionally.

Cc: Jason Wang <jasowang@redhat.com>
Signed-off-by: Andreas Färber <afaerber@suse.de>
Message-id: 1360707366-9271-1-git-send-email-afaerber@suse.de
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
---

diff --git a/net/net.c b/net/net.c
index f9e7136a2b..be03a8dd14 100644
--- a/net/net.c
+++ b/net/net.c
@@ -287,7 +287,9 @@ static void qemu_cleanup_net_client(NetClientState *nc)
 {
     QTAILQ_REMOVE(&net_clients, nc, next);
 
-    nc->info->cleanup(nc);
+    if (nc->info->cleanup) {
+        nc->info->cleanup(nc);
+    }
 }
 
 static void qemu_free_net_client(NetClientState *nc)