From: Lorenzo Bianconi <lorenzo@kernel.org>
To: sean.wang@mediatek.com
Cc: nbd@nbd.name, lorenzo.bianconi@redhat.com,
ryder.lee@mediatek.com, linux-wireless@vger.kernel.org,
linux-mediatek@lists.infradead.org
Subject: Re: [PATCH 1/3] mt76: mt7663u: fix memory leak in set key
Date: Tue, 30 Jun 2020 09:24:29 +0200 [thread overview]
Message-ID: <20200630072429.GD2169@localhost.localdomain> (raw)
In-Reply-To: <5e8786d9cf0ccd09dd9c13c24c48ce441afbf0ff.1593491298.git.sean.wang@mediatek.com>
[-- Attachment #1: Type: text/plain, Size: 1811 bytes --]
> From: Sean Wang <sean.wang@mediatek.com>
>
> Fix memory leak in set key.
>
> Fixes: eb99cc95c3b6 ("mt76: mt7615: introduce mt7663u support")
> Signed-off-by: Sean Wang <sean.wang@mediatek.com>
> ---
> .../net/wireless/mediatek/mt76/mt7615/usb.c | 22 +++++++++++++------
> 1 file changed, 15 insertions(+), 7 deletions(-)
>
> diff --git a/drivers/net/wireless/mediatek/mt76/mt7615/usb.c b/drivers/net/wireless/mediatek/mt76/mt7615/usb.c
> index 0ba28d37c414..96a081be108e 100644
> --- a/drivers/net/wireless/mediatek/mt76/mt7615/usb.c
> +++ b/drivers/net/wireless/mediatek/mt76/mt7615/usb.c
> @@ -165,12 +165,16 @@ __mt7663u_mac_set_key(struct mt7615_dev *dev,
>
> lockdep_assert_held(&dev->mt76.mutex);
>
> - if (!sta)
> - return -EINVAL;
> + if (!sta) {
> + err = -EINVAL;
> + goto out;
> + }
>
> cipher = mt7615_mac_get_cipher(key->cipher);
> - if (cipher == MT_CIPHER_NONE)
> - return -EOPNOTSUPP;
> + if (cipher == MT_CIPHER_NONE) {
> + err = -EOPNOTSUPP;
> + goto out;
> + }
>
> wcid = &wd->sta->wcid;
>
> @@ -178,19 +182,23 @@ __mt7663u_mac_set_key(struct mt7615_dev *dev,
> err = mt7615_mac_wtbl_update_key(dev, wcid, key->key, key->keylen,
> cipher, key->cmd);
> if (err < 0)
> - return err;
> + goto out;
>
> err = mt7615_mac_wtbl_update_pk(dev, wcid, cipher, key->keyidx,
> key->cmd);
> if (err < 0)
> - return err;
> + goto out;
>
> if (key->cmd == SET_KEY)
> wcid->cipher |= BIT(cipher);
> else
> wcid->cipher &= ~BIT(cipher);
>
> - return 0;
> +out:
> + kfree(key->key);
> + kfree(wd);
Actually we do not need to free wd since it is done in mt7663u_wtbl_work()
> +
> + return err;
> }
>
> void mt7663u_wtbl_work(struct work_struct *work)
> --
> 2.25.1
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 228 bytes --]
next prev parent reply other threads:[~2020-06-30 7:24 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-06-30 4:37 [PATCH 1/3] mt76: mt7663u: fix memory leak in set key sean.wang
2020-06-30 4:37 ` [PATCH 2/3] mt76: mt7663u: fix potential memory leak in mcu message handler sean.wang
2020-06-30 7:13 ` Lorenzo Bianconi
2020-06-30 4:37 ` [PATCH 3/3] mt76: mt7615: " sean.wang
2020-06-30 7:17 ` Lorenzo Bianconi
2020-06-30 7:07 ` [PATCH 1/3] mt76: mt7663u: fix memory leak in set key Lorenzo Bianconi
2020-06-30 7:24 ` Lorenzo Bianconi [this message]
2020-06-30 21:41 ` sean.wang
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=20200630072429.GD2169@localhost.localdomain \
--to=lorenzo@kernel.org \
--cc=linux-mediatek@lists.infradead.org \
--cc=linux-wireless@vger.kernel.org \
--cc=lorenzo.bianconi@redhat.com \
--cc=nbd@nbd.name \
--cc=ryder.lee@mediatek.com \
--cc=sean.wang@mediatek.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;
as well as URLs for NNTP newsgroup(s).