From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.1 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 5827AC433DF for ; Tue, 30 Jun 2020 07:07:32 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 319C520759 for ; Tue, 30 Jun 2020 07:07:32 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1593500852; bh=dPzQ1b+X74tG/VK6jGk6QBhiIJidaJbrfTaR58NFdtE=; h=Date:From:To:Cc:Subject:References:In-Reply-To:List-ID:From; b=RS7toZ+M3HRSU88pr09S6voWFCQC5jctuv604r7QoH5KVKUyGcJPaTZGvC9+SNDXY Seo5as4hab+L2djyvFWCdcosHeVxGDluLTOgCAXVWwwtRz24hAXUUZDvy5tK3BTyFD PWJ4Cson2oC5v53z1IyJ1TrjgELApzA49mNjALpk= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730561AbgF3HHb (ORCPT ); Tue, 30 Jun 2020 03:07:31 -0400 Received: from mail.kernel.org ([198.145.29.99]:40294 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730386AbgF3HHb (ORCPT ); Tue, 30 Jun 2020 03:07:31 -0400 Received: from localhost (unknown [151.48.138.186]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 1B9812073E; Tue, 30 Jun 2020 07:07:29 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1593500850; bh=dPzQ1b+X74tG/VK6jGk6QBhiIJidaJbrfTaR58NFdtE=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=GUtETFoPUrpqTbY5pabj5+jnOVxqsjl6/jlBjhJhlJlDkFKLNYm0rF+TLFkVOAPdR pe/teLzD/xFSVvhtjoSKAl83IvtAGBB4yVoLLl+ICdR1aRetFmSW3EfVHKFJhzUlB/ KF/X7ad/Pz2VXoGOdSlGGlyC5O25ExeseEMzcIno= Date: Tue, 30 Jun 2020 09:07:25 +0200 From: Lorenzo Bianconi 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 Message-ID: <20200630070725.GA2169@localhost.localdomain> References: <5e8786d9cf0ccd09dd9c13c24c48ce441afbf0ff.1593491298.git.sean.wang@mediatek.com> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="pWyiEgJYm5f9v55/" Content-Disposition: inline In-Reply-To: <5e8786d9cf0ccd09dd9c13c24c48ce441afbf0ff.1593491298.git.sean.wang@mediatek.com> Sender: linux-wireless-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org --pWyiEgJYm5f9v55/ Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable > From: Sean Wang >=20 > Fix memory leak in set key. >=20 Acked-by: Lorenzo Bianconi > Fixes: eb99cc95c3b6 ("mt76: mt7615: introduce mt7663u support") > Signed-off-by: Sean Wang > --- > .../net/wireless/mediatek/mt76/mt7615/usb.c | 22 +++++++++++++------ > 1 file changed, 15 insertions(+), 7 deletions(-) >=20 > diff --git a/drivers/net/wireless/mediatek/mt76/mt7615/usb.c b/drivers/ne= t/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, > =20 > lockdep_assert_held(&dev->mt76.mutex); > =20 > - if (!sta) > - return -EINVAL; > + if (!sta) { > + err =3D -EINVAL; > + goto out; > + } > =20 > cipher =3D mt7615_mac_get_cipher(key->cipher); > - if (cipher =3D=3D MT_CIPHER_NONE) > - return -EOPNOTSUPP; > + if (cipher =3D=3D MT_CIPHER_NONE) { > + err =3D -EOPNOTSUPP; > + goto out; > + } > =20 > wcid =3D &wd->sta->wcid; > =20 > @@ -178,19 +182,23 @@ __mt7663u_mac_set_key(struct mt7615_dev *dev, > err =3D mt7615_mac_wtbl_update_key(dev, wcid, key->key, key->keylen, > cipher, key->cmd); > if (err < 0) > - return err; > + goto out; > =20 > err =3D mt7615_mac_wtbl_update_pk(dev, wcid, cipher, key->keyidx, > key->cmd); > if (err < 0) > - return err; > + goto out; > =20 > if (key->cmd =3D=3D SET_KEY) > wcid->cipher |=3D BIT(cipher); > else > wcid->cipher &=3D ~BIT(cipher); > =20 > - return 0; > +out: > + kfree(key->key); > + kfree(wd); > + > + return err; > } > =20 > void mt7663u_wtbl_work(struct work_struct *work) > --=20 > 2.25.1 --pWyiEgJYm5f9v55/ Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iHUEABYIAB0WIQTquNwa3Txd3rGGn7Y6cBh0uS2trAUCXvrkqgAKCRA6cBh0uS2t rJW7AQDzRpCy7iO+dgNKsP9qclqjjH70wDijsS5eb5HzUjqt9QD7BkwTOimphjKz /KpwjRwlo2567sM+026yGKzrds1wgAk= =YUPq -----END PGP SIGNATURE----- --pWyiEgJYm5f9v55/--