From: Chen Gang <gang.chen.5i5j@gmail.com>
Date: Tue, 16 Dec 2014 20:48:54 +0000 (+0800)
Subject: hw/net/xen_nic.c: Free 'netdev->txs' when map 'netdev->rxs' fails
X-Git-Tag: v2.3.0-rc0~106^2~2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=b4f72e31b924bec2c18fe0b2a8c6462dbed9dcb2;p=thirdparty%2Fqemu.git

hw/net/xen_nic.c: Free 'netdev->txs' when map 'netdev->rxs' fails

When map 'netdev->rxs' fails, need free the original resource, or will
cause resource leak.

Signed-off-by: Chen Gang <gang.chen.5i5j@gmail.com>
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
---

diff --git a/hw/net/xen_nic.c b/hw/net/xen_nic.c
index 63918ae1a0e..7a57feb29bb 100644
--- a/hw/net/xen_nic.c
+++ b/hw/net/xen_nic.c
@@ -370,11 +370,16 @@ static int net_connect(struct XenDevice *xendev)
                                           netdev->xendev.dom,
                                           netdev->tx_ring_ref,
                                           PROT_READ | PROT_WRITE);
+    if (!netdev->txs) {
+        return -1;
+    }
     netdev->rxs = xc_gnttab_map_grant_ref(netdev->xendev.gnttabdev,
                                           netdev->xendev.dom,
                                           netdev->rx_ring_ref,
                                           PROT_READ | PROT_WRITE);
-    if (!netdev->txs || !netdev->rxs) {
+    if (!netdev->rxs) {
+        xc_gnttab_munmap(netdev->xendev.gnttabdev, netdev->txs, 1);
+        netdev->txs = NULL;
         return -1;
     }
     BACK_RING_INIT(&netdev->tx_ring, netdev->txs, XC_PAGE_SIZE);