Commit 3a146b7e authored by Shang XiaoJing's avatar Shang XiaoJing Committed by David S. Miller

nfc: s3fwrn5: Fix potential memory leak in s3fwrn5_nci_send()

s3fwrn5_nci_send() will call s3fwrn5_i2c_write() or s3fwrn82_uart_write(),
and free the skb if write() failed. However, even if the write() run
succeeds, the skb will not be freed in write(). As the result, the skb
will memleak. s3fwrn5_nci_send() should also free the skb when write()
succeeds.

Fixes: c04c674f ("nfc: s3fwrn5: Add driver for Samsung S3FWRN5 NFC Chip")
Signed-off-by: default avatarShang XiaoJing <shangxiaojing@huawei.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 7bf1ed6a
...@@ -110,11 +110,15 @@ static int s3fwrn5_nci_send(struct nci_dev *ndev, struct sk_buff *skb) ...@@ -110,11 +110,15 @@ static int s3fwrn5_nci_send(struct nci_dev *ndev, struct sk_buff *skb)
} }
ret = s3fwrn5_write(info, skb); ret = s3fwrn5_write(info, skb);
if (ret < 0) if (ret < 0) {
kfree_skb(skb); kfree_skb(skb);
mutex_unlock(&info->mutex); mutex_unlock(&info->mutex);
return ret; return ret;
}
consume_skb(skb);
mutex_unlock(&info->mutex);
return 0;
} }
static int s3fwrn5_nci_post_setup(struct nci_dev *ndev) static int s3fwrn5_nci_post_setup(struct nci_dev *ndev)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment