From: Colin Ian King <colin.king@canonical.com>
To: Dan Carpenter <dan.carpenter@oracle.com>
Cc: Arend van Spriel <arend.vanspriel@broadcom.com>,
Franky Lin <franky.lin@broadcom.com>,
Hante Meuleman <hante.meuleman@broadcom.com>,
Chi-Hsien Lin <chi-hsien.lin@cypress.com>,
Wright Feng <wright.feng@cypress.com>,
Kalle Valo <kvalo@codeaurora.org>,
"David S . Miller" <davem@davemloft.net>,
linux-wireless@vger.kernel.org,
brcm80211-dev-list.pdl@broadcom.com,
brcm80211-dev-list@cypress.com, netdev@vger.kernel.org,
kernel-janitors@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: Re: [PATCH] brcmfmac: fix leak of mypkt on error return path
Date: Tue, 9 Apr 2019 12:35:30 +0100 [thread overview]
Message-ID: <e0d4531b-bece-e9f3-9347-e0325225b712@canonical.com> (raw)
In-Reply-To: <20190409113245.GB6095@kadam>
On 09/04/2019 12:32, Dan Carpenter wrote:
> On Tue, Apr 09, 2019 at 12:20:11PM +0100, Colin King wrote:
>> From: Colin Ian King <colin.king@canonical.com>
>>
>> Currently if the call to brcmf_sdiod_set_backplane_window fails then
>> 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.
>>
>> Addresses-Coverity: ("Resource Leak")
>> Fixes: a7c3aa1509e2 ("brcmfmac: Remove brcmf_sdiod_addrprep()")
>> Signed-off-by: Colin Ian King <colin.king@canonical.com>
>> ---
>> drivers/net/wireless/broadcom/brcm80211/brcmfmac/bcmsdh.c | 4 ++--
>> 1 file changed, 2 insertions(+), 2 deletions(-)
>>
>> diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/bcmsdh.c b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/bcmsdh.c
>> index ec129864cc9c..f3d11e024e71 100644
>> --- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/bcmsdh.c
>> +++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/bcmsdh.c
>> @@ -628,7 +628,7 @@ 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;
>> @@ -636,7 +636,7 @@ int brcmf_sdiod_send_buf(struct brcmf_sdio_dev *sdiodev, u8 *buf, uint nbytes)
>> if (!err)
> ^^^^
> This is not required, btw.
Good point.
>
>> err = brcmf_sdiod_skbuff_write(sdiodev, sdiodev->func2, addr,
>> mypkt);
>> -
>> +out:
>> brcmu_pkt_buf_free_skb(mypkt);
>
> regards,
> dan carpenter
>
next prev parent reply other threads:[~2019-04-09 11:35 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-04-09 11:20 [PATCH] brcmfmac: fix leak of mypkt on error return path Colin King
2019-04-09 11:32 ` Dan Carpenter
2019-04-09 11:35 ` Colin Ian King [this message]
2019-04-09 11:40 ` Arend Van Spriel
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=e0d4531b-bece-e9f3-9347-e0325225b712@canonical.com \
--to=colin.king@canonical.com \
--cc=arend.vanspriel@broadcom.com \
--cc=brcm80211-dev-list.pdl@broadcom.com \
--cc=brcm80211-dev-list@cypress.com \
--cc=chi-hsien.lin@cypress.com \
--cc=dan.carpenter@oracle.com \
--cc=davem@davemloft.net \
--cc=franky.lin@broadcom.com \
--cc=hante.meuleman@broadcom.com \
--cc=kernel-janitors@vger.kernel.org \
--cc=kvalo@codeaurora.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-wireless@vger.kernel.org \
--cc=netdev@vger.kernel.org \
--cc=wright.feng@cypress.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox