Message ID | 54909AB6.7020705@gmail.com |
---|---|
State | New |
Headers | show |
On Wed, Dec 17, 2014 at 04:48:54AM +0800, Chen Gang wrote: > 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> > --- > hw/net/xen_nic.c | 7 ++++++- > 1 file changed, 6 insertions(+), 1 deletion(-) Thanks, applied to my net tree: https://github.com/stefanha/qemu/commits/net Stefan
diff --git a/hw/net/xen_nic.c b/hw/net/xen_nic.c index 63918ae..7a57feb 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);
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> --- hw/net/xen_nic.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-)