lkml.org 
[lkml]   [2013]   [Feb]   [17]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[ 58/66] xen/netback: free already allocated memory on failure in xen_netbk_get_requests
    3.2-stable review patch.  If anyone has any objections, please let me know.

    ------------------

    From: Ian Campbell <Ian.Campbell@citrix.com>

    [ Upstream commit 4cc7c1cb7b11b6f3515bd9075527576a1eecc4aa ]

    Signed-off-by: Ian Campbell <ian.campbell@citrix.com>
    Signed-off-by: David S. Miller <davem@davemloft.net>
    Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
    ---
    drivers/net/xen-netback/netback.c | 13 ++++++++++++-
    1 file changed, 12 insertions(+), 1 deletion(-)

    diff --git a/drivers/net/xen-netback/netback.c b/drivers/net/xen-netback/netback.c
    index d6c2359..a14b3a2 100644
    --- a/drivers/net/xen-netback/netback.c
    +++ b/drivers/net/xen-netback/netback.c
    @@ -950,7 +950,7 @@ static struct gnttab_copy *xen_netbk_get_requests(struct xen_netbk *netbk,
    pending_idx = netbk->pending_ring[index];
    page = xen_netbk_alloc_page(netbk, skb, pending_idx);
    if (!page)
    - return NULL;
    + goto err;

    netbk->mmap_pages[pending_idx] = page;

    @@ -974,6 +974,17 @@ static struct gnttab_copy *xen_netbk_get_requests(struct xen_netbk *netbk,
    }

    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,



    \
     
     \ /
      Last update: 2013-02-18 00:21    [W:2.537 / U:0.008 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site