| Message ID | 1468884277-18606-2-git-send-email-f.fainelli@gmail.com (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 3bdae810721b33061d2e541bd78a70f86ca42af3 |
| Delegated to: | Kalle Valo |
| Headers | show |
On 19-7-2016 1:24, Florian Fainelli wrote: > In case brcmf_sdiod_recv_chain() cannot complete a succeful call to > brcmf_sdiod_buffrw, we would be leaking glom_skb and not free it as we > should, fix this. > > Reported-by: coverity (CID 1164856) > Fixes: a413e39a38573 ("brcmfmac: fix brcmf_sdcard_recv_chain() for host without sg support") Acked-by: Arend van Spriel <arend.vanspriel@broadcom.com> > Signed-off-by: Florian Fainelli <f.fainelli@gmail.com> > --- > drivers/net/wireless/broadcom/brcm80211/brcmfmac/bcmsdh.c | 4 +++- > 1 file changed, 3 insertions(+), 1 deletion(-) > > diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/bcmsdh.c b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/bcmsdh.c > index c4b89d27e2e8..f549c25608d6 100644 > --- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/bcmsdh.c > +++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/bcmsdh.c > @@ -726,8 +726,10 @@ int brcmf_sdiod_recv_chain(struct brcmf_sdio_dev *sdiodev, > return -ENOMEM; > err = brcmf_sdiod_buffrw(sdiodev, SDIO_FUNC_2, false, addr, > glom_skb); > - if (err) > + if (err) { > + brcmu_pkt_buf_free_skb(glom_skb); > goto done; > + } > > skb_queue_walk(pktq, skb) { > memcpy(skb->data, glom_skb->data, skb->len); > -- To unsubscribe from this list: send the line "unsubscribe linux-wireless" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Florian Fainelli <f.fainelli@gmail.com> wrote: > In case brcmf_sdiod_recv_chain() cannot complete a succeful call to > brcmf_sdiod_buffrw, we would be leaking glom_skb and not free it as we > should, fix this. > > Reported-by: coverity (CID 1164856) > Fixes: a413e39a38573 ("brcmfmac: fix brcmf_sdcard_recv_chain() for host without sg support") > Signed-off-by: Florian Fainelli <f.fainelli@gmail.com> > Acked-by: Arend van Spriel <arend.vanspriel@broadcom.com> Thanks, 3 patches applied to wireless-drivers-next.git: 3bdae810721b brcmfmac: Fix glob_skb leak in brcmf_sdiod_recv_chain 5c5fa1f464ac brcmsmac: Free packet if dma_mapping_error() fails in dma_rxfill f823a2aa8f46 brcmsmac: Initialize power in brcms_c_stf_ss_algo_channel_get()
diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/bcmsdh.c b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/bcmsdh.c index c4b89d27e2e8..f549c25608d6 100644 --- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/bcmsdh.c +++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/bcmsdh.c @@ -726,8 +726,10 @@ int brcmf_sdiod_recv_chain(struct brcmf_sdio_dev *sdiodev, return -ENOMEM; err = brcmf_sdiod_buffrw(sdiodev, SDIO_FUNC_2, false, addr, glom_skb); - if (err) + if (err) { + brcmu_pkt_buf_free_skb(glom_skb); goto done; + } skb_queue_walk(pktq, skb) { memcpy(skb->data, glom_skb->data, skb->len);
In case brcmf_sdiod_recv_chain() cannot complete a succeful call to brcmf_sdiod_buffrw, we would be leaking glom_skb and not free it as we should, fix this. Reported-by: coverity (CID 1164856) Fixes: a413e39a38573 ("brcmfmac: fix brcmf_sdcard_recv_chain() for host without sg support") Signed-off-by: Florian Fainelli <f.fainelli@gmail.com> --- drivers/net/wireless/broadcom/brcm80211/brcmfmac/bcmsdh.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)