diff options
| author |   Shang XiaoJing <shangxiaojing@huawei.com> | 2022-10-27 22:03:29 +0800 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2022-10-30 21:43:26 +0000 |
| commit | 8e4aae6b8ca76afb1fb64dcb24be44ba814e7f8a (patch) | |
| tree | afdb6bf47a5afbd7d1fe510e9e434bafbd16570c /drivers/nfc | |
| parent | net: dsa: fall back to default tagger if we can't load the one from DT (diff) | |
| download | wireguard-linux-8e4aae6b8ca76afb1fb64dcb24be44ba814e7f8a.tar.xz wireguard-linux-8e4aae6b8ca76afb1fb64dcb24be44ba814e7f8a.zip | |
nfc: fdp: Fix potential memory leak in fdp_nci_send()
fdp_nci_send() will call fdp_nci_i2c_write that will not free skb in
the function. As a result, when fdp_nci_i2c_write() finished, the skb
will memleak. fdp_nci_send() should free skb after fdp_nci_i2c_write()
finished.
Fixes: a06347c04c13 ("NFC: Add Intel Fields Peak NFC solution 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/fdp/fdp.c | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/drivers/nfc/fdp/fdp.c b/drivers/nfc/fdp/fdp.c index c6b3334f24c9..f12f903a9dd1 100644 --- a/drivers/nfc/fdp/fdp.c +++ b/drivers/nfc/fdp/fdp.c @@ -249,11 +249,19 @@ static int fdp_nci_close(struct nci_dev *ndev) static int fdp_nci_send(struct nci_dev *ndev, struct sk_buff *skb) { struct fdp_nci_info *info = nci_get_drvdata(ndev); + int ret; if (atomic_dec_and_test(&info->data_pkt_counter)) info->data_pkt_counter_cb(ndev); - return info->phy_ops->write(info->phy, skb); + ret = info->phy_ops->write(info->phy, skb); + if (ret < 0) { + kfree_skb(skb); + return ret; + } + + consume_skb(skb); + return 0; } static int fdp_nci_request_firmware(struct nci_dev *ndev) |