lkml.org 
[lkml]   [2017]   [Feb]   [5]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 3.10 244/319] brcmsmac: Free packet if dma_mapping_error() fails in dma_rxfill
    Date
    From: Florian Fainelli <f.fainelli@gmail.com>

    commit 5c5fa1f464ac954982df1d96b9f9a5103d21aedd upstream.

    In case dma_mapping_error() returns an error in dma_rxfill, we would be
    leaking a packet that we allocated with brcmu_pkt_buf_get_skb().

    Reported-by: coverity (CID 1081819)
    Fixes: 67d0cf50bd32 ("brcmsmac: Fix WARNING caused by lack of calls to dma_mapping_error()")
    Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
    Acked-by: Arend van Spriel <arend@broadcom.com>
    Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
    Signed-off-by: Willy Tarreau <w@1wt.eu>
    ---
    drivers/net/wireless/brcm80211/brcmsmac/dma.c | 4 +++-
    1 file changed, 3 insertions(+), 1 deletion(-)

    diff --git a/drivers/net/wireless/brcm80211/brcmsmac/dma.c b/drivers/net/wireless/brcm80211/brcmsmac/dma.c
    index 4fb9635..7660b52 100644
    --- a/drivers/net/wireless/brcm80211/brcmsmac/dma.c
    +++ b/drivers/net/wireless/brcm80211/brcmsmac/dma.c
    @@ -1079,8 +1079,10 @@ bool dma_rxfill(struct dma_pub *pub)

    pa = dma_map_single(di->dmadev, p->data, di->rxbufsize,
    DMA_FROM_DEVICE);
    - if (dma_mapping_error(di->dmadev, pa))
    + if (dma_mapping_error(di->dmadev, pa)) {
    + brcmu_pkt_buf_free_skb(p);
    return false;
    + }

    /* save the free packet pointer */
    di->rxp[rxout] = p;
    --
    2.8.0.rc2.1.gbe9624a
    \
     
     \ /
      Last update: 2017-02-05 21:09    [W:4.199 / U:0.224 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site