leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

xen/netback: free already allocated memory on failure in xen_netbk_get_requests

Browse Source 
Signed-off-by: Ian Campbell <ian.campbell@citrix.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Ian Campbell 2013-02-06 23:41:37 +00:00 committed by David S. Miller
parent 7d5145d8eb
commit 4cc7c1cb7b
1 changed files with 12 additions and 1 deletions

13
drivers/net/xen-netback/netback.c
View File

@ -978,7 +978,7 @@ static struct gnttab_copy *xen_netbk_get_requests(struct xen_netbk *netbk,
pending_idx = netbk->pending_ring[index]; pending_idx = netbk->pending_ring[index];
page = xen_netbk_alloc_page(netbk, skb, pending_idx); page = xen_netbk_alloc_page(netbk, skb, pending_idx);
if (!page) if (!page)
return NULL; goto err;
gop->source.u.ref = txp->gref; gop->source.u.ref = txp->gref;
gop->source.domid = vif->domid; gop->source.domid = vif->domid;
@ -1000,6 +1000,17 @@ static struct gnttab_copy *xen_netbk_get_requests(struct xen_netbk *netbk,
} }
return gop; return gop;
err:
/* Unwind, freeing all pages and sending error responses. */
while (i-- > start) {
xen_netbk_idx_release(netbk, frag_get_pending_idx(&frags[i]),
XEN_NETIF_RSP_ERROR);
}
/* The head too, if necessary. */
if (start)
xen_netbk_idx_release(netbk, pending_idx, XEN_NETIF_RSP_ERROR);
return NULL;
} }
static int xen_netbk_tx_check_gop(struct xen_netbk *netbk, static int xen_netbk_tx_check_gop(struct xen_netbk *netbk,