diff options
| author | Shang XiaoJing <shangxiaojing@huawei.com> | 2022-10-27 22:03:30 +0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2022-10-30 21:43:26 +0000 |
| commit | 7bf1ed6aff0f70434bd0cdd45495e83f1dffb551 (patch) | |
| tree | b7de31f00d8216c695de39fe50e7b8d5b0e96d75 /drivers/nfc | |
| parent | 8e4aae6b8ca76afb1fb64dcb24be44ba814e7f8a (diff) | |
| download | linux-rpi-7bf1ed6aff0f70434bd0cdd45495e83f1dffb551.tar.gz linux-rpi-7bf1ed6aff0f70434bd0cdd45495e83f1dffb551.tar.bz2 linux-rpi-7bf1ed6aff0f70434bd0cdd45495e83f1dffb551.zip | |
nfc: nxp-nci: Fix potential memory leak in nxp_nci_send()
nxp_nci_send() will call nxp_nci_i2c_write(), and only free skb when
nxp_nci_i2c_write() failed. However, even if the nxp_nci_i2c_write()
run succeeds, the skb will not be freed in nxp_nci_i2c_write(). As the
result, the skb will memleak. nxp_nci_send() should also free the skb
when nxp_nci_i2c_write() succeeds.
Fixes: dece45855a8b ("NFC: nxp-nci: Add support for NXP NCI chips")
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/nxp-nci/core.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/drivers/nfc/nxp-nci/core.c b/drivers/nfc/nxp-nci/core.c index 7c93d484dc1b..580cb6ecffee 100644 --- a/drivers/nfc/nxp-nci/core.c +++ b/drivers/nfc/nxp-nci/core.c @@ -80,10 +80,13 @@ static int nxp_nci_send(struct nci_dev *ndev, struct sk_buff *skb) return -EINVAL; r = info->phy_ops->write(info->phy_id, skb); - if (r < 0) + if (r < 0) { kfree_skb(skb); + return r; + } - return r; + consume_skb(skb); + return 0; } static int nxp_nci_rf_pll_unlocked_ntf(struct nci_dev *ndev, |