diff options
| author | Chen Gang <gang.chen.5i5j@gmail.com> | 2014-12-17 04:48:54 +0800 |
|---|---|---|
| committer | Stefan Hajnoczi <stefanha@redhat.com> | 2015-01-12 10:16:23 +0000 |
| commit | b4f72e31b924bec2c18fe0b2a8c6462dbed9dcb2 (patch) | |
| tree | 9e6ad856c8a9aa1122911e2e6f1049501e8b1e98 /hw/net/xen_nic.c | |
| parent | 57407ea44cc0a3d630b9b89a2be011f1955ce5c1 (diff) | |
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>
Diffstat (limited to 'hw/net/xen_nic.c')
| -rw-r--r-- | hw/net/xen_nic.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/hw/net/xen_nic.c b/hw/net/xen_nic.c index 63918ae1a0..7a57feb29b 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); |