diff options
| author | Shang XiaoJing <shangxiaojing@huawei.com> | 2022-10-27 16:03:32 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2022-10-30 22:43:26 +0100 |
| commit | 93d904a734a74c54d945a9884b4962977f1176cd (patch) | |
| tree | 358abf6f470edc7dc072ccf4eb9782448606d4d9 /drivers/nfc | |
| parent | nfc: s3fwrn5: Fix potential memory leak in s3fwrn5_nci_send() (diff) | |
| download | linux-93d904a734a74c54d945a9884b4962977f1176cd.tar.xz linux-93d904a734a74c54d945a9884b4962977f1176cd.zip | |
nfc: nfcmrvl: Fix potential memory leak in nfcmrvl_i2c_nci_send()
nfcmrvl_i2c_nci_send() will be called by nfcmrvl_nci_send(), and skb
should be freed in nfcmrvl_i2c_nci_send(). However, nfcmrvl_nci_send()
will only free skb when i2c_master_send() return >=0, which means skb
will memleak when i2c_master_send() failed. Free skb no matter whether
i2c_master_send() succeeds.
Fixes: b5b3e23e4cac ("NFC: nfcmrvl: add i2c driver")
Signed-off-by: Shang XiaoJing <shangxiaojing@huawei.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/nfc')
| -rw-r--r-- | drivers/nfc/nfcmrvl/i2c.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/drivers/nfc/nfcmrvl/i2c.c b/drivers/nfc/nfcmrvl/i2c.c index acef0cfd76af..24436c9e54c9 100644 --- a/drivers/nfc/nfcmrvl/i2c.c +++ b/drivers/nfc/nfcmrvl/i2c.c @@ -132,10 +132,15 @@ static int nfcmrvl_i2c_nci_send(struct nfcmrvl_private *priv, ret = -EREMOTEIO; } else ret = 0; + } + + if (ret) { kfree_skb(skb); + return ret; } - return ret; + consume_skb(skb); + return 0; } static void nfcmrvl_i2c_nci_update_config(struct nfcmrvl_private *priv, |