summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorShang XiaoJing <shangxiaojing@huawei.com>2022-11-17 19:37:12 +0800
committerDavid S. Miller <davem@davemloft.net>2022-11-21 08:31:52 +0000
commite204ead35401af5e120f653a133d54ee2595627e (patch)
treeaa6f4bee97031b1705359778b4303a1e9c8d7c1b
parent7cef6b73fba96abef731a53501924fc3c4a0f947 (diff)
downloadlinux-e204ead35401af5e120f653a133d54ee2595627e.tar.gz
linux-e204ead35401af5e120f653a133d54ee2595627e.tar.bz2
linux-e204ead35401af5e120f653a133d54ee2595627e.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() won't free the skb when it failed for the test_bit(). Free the skb when test_bit() failed. Fixes: b5b3e23e4cac ("NFC: nfcmrvl: add i2c driver") Signed-off-by: Shang XiaoJing <shangxiaojing@huawei.com> Suggested-by: Pavel Machek <pavel@denx.de> Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r--drivers/nfc/nfcmrvl/i2c.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/nfc/nfcmrvl/i2c.c b/drivers/nfc/nfcmrvl/i2c.c
index 24436c9e54c9..97600826af69 100644
--- a/drivers/nfc/nfcmrvl/i2c.c
+++ b/drivers/nfc/nfcmrvl/i2c.c
@@ -112,8 +112,10 @@ static int nfcmrvl_i2c_nci_send(struct nfcmrvl_private *priv,
struct nfcmrvl_i2c_drv_data *drv_data = priv->drv_data;
int ret;
- if (test_bit(NFCMRVL_PHY_ERROR, &priv->flags))
+ if (test_bit(NFCMRVL_PHY_ERROR, &priv->flags)) {
+ kfree_skb(skb);
return -EREMOTEIO;
+ }
ret = i2c_master_send(drv_data->i2c, skb->data, skb->len);