From mboxrd@z Thu Jan 1 00:00:00 1970 From: Mukesh Ojha Date: Wed, 10 Apr 2019 09:44:43 +0000 Subject: Re: [PATCH][V2] brcmfmac: fix leak of mypkt on error return path Message-Id: List-Id: References: <20190409114333.24342-1-colin.king@canonical.com> In-Reply-To: <20190409114333.24342-1-colin.king@canonical.com> MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: Colin King , Arend van Spriel , Franky Lin , Hante Meuleman , Chi-Hsien Lin , Wright Feng , Kalle Valo , "David S . Miller" , linux-wireless@vger.kernel.org, brcm80211-dev-list.pdl@broadcom.com, brcm80211-dev-list@cypress.com, netdev@vger.kernel.org Cc: kernel-janitors@vger.kernel.org, linux-kernel@vger.kernel.org On 4/9/2019 5:13 PM, Colin King wrote: > From: Colin Ian King > > Currently if the call to brcmf_sdiod_set_backplane_window fails then Fix this one extra then pointed by Sergie. otherwise looks good to me. Reviewed-by: Mukesh Ojha Cheers, -Mukesh > then error return path leaks mypkt. Fix this by returning by a new > error path labelled 'out' that calls brcmu_pkt_buf_free_skb to free > mypkt. Also remove redundant check on err before calling > brcmf_sdiod_skbuff_write. > > Addresses-Coverity: ("Resource Leak") > Fixes: a7c3aa1509e2 ("brcmfmac: Remove brcmf_sdiod_addrprep()") > Signed-off-by: Colin Ian King > --- > > V2: Remove redundant check on err before calling > brcmf_sdiod_skbuff_write, kudos to Dan Carpenter and Arend Van Spriel > for spotting this. > > --- > drivers/net/wireless/broadcom/brcm80211/brcmfmac/bcmsdh.c | 8 +++----- > 1 file changed, 3 insertions(+), 5 deletions(-) > > diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/bcmsdh.c b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/bcmsdh.c > index ec129864cc9c..60aede5abb4d 100644 > --- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/bcmsdh.c > +++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/bcmsdh.c > @@ -628,15 +628,13 @@ int brcmf_sdiod_send_buf(struct brcmf_sdio_dev *sdiodev, u8 *buf, uint nbytes) > > err = brcmf_sdiod_set_backplane_window(sdiodev, addr); > if (err) > - return err; > + goto out; > > addr &= SBSDIO_SB_OFT_ADDR_MASK; > addr |= SBSDIO_SB_ACCESS_2_4B_FLAG; > > - if (!err) > - err = brcmf_sdiod_skbuff_write(sdiodev, sdiodev->func2, addr, > - mypkt); > - > + err = brcmf_sdiod_skbuff_write(sdiodev, sdiodev->func2, addr, mypkt); > +out: > brcmu_pkt_buf_free_skb(mypkt); > > return err;