]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
mt76: mt7663u: fix memory leak in set key
authorSean Wang <sean.wang@mediatek.com>
Tue, 7 Jul 2020 19:16:46 +0000 (03:16 +0800)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Wed, 19 Aug 2020 06:26:40 +0000 (08:26 +0200)
[ Upstream commit 4a850f8dc68b8c4a20333521b31600c9d31ccb5d ]

Fix memory leak in set key.

Fixes: eb99cc95c3b6 ("mt76: mt7615: introduce mt7663u support")
Signed-off-by: Sean Wang <sean.wang@mediatek.com>
Acked-by: Lorenzo Bianconi <lorenzo@kernel.org>
Signed-off-by: Felix Fietkau <nbd@nbd.name>
Signed-off-by: Sasha Levin <sashal@kernel.org>
drivers/net/wireless/mediatek/mt76/mt7615/usb.c

index 5be6704770ad0ca313208f720595ad6d79d83a43..7906e6a71c5b985852e074210b068a88c305a0bd 100644 (file)
@@ -166,12 +166,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;
 
@@ -179,19 +183,22 @@ __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);
+
+       return err;
 }
 
 void mt7663u_wtbl_work(struct work_struct *work)