summaryrefslogtreecommitdiffstats
path: root/drivers/nfc
diff options
context:
space:
mode:
authorPan Bian <bianpan2016@163.com>2019-11-07 09:33:20 +0800
committerDavid S. Miller <davem@davemloft.net>2019-11-06 21:48:29 -0800
commit99a8efbb6e30b72ac98cecf81103f847abffb1e5 (patch)
treeed92ada605c3dbdcb6438597daa1a287c737be5b /drivers/nfc
parent648db0514a3808eead513d7abfaf650d02a64d5c (diff)
downloadlinux-99a8efbb6e30b72ac98cecf81103f847abffb1e5.tar.gz
linux-99a8efbb6e30b72ac98cecf81103f847abffb1e5.tar.bz2
linux-99a8efbb6e30b72ac98cecf81103f847abffb1e5.zip
NFC: st21nfca: fix double free
The variable nfcid_skb is not changed in the callee nfc_hci_get_param() if error occurs. Consequently, the freed variable nfcid_skb will be freed again, resulting in a double free bug. Set nfcid_skb to NULL after releasing it to fix the bug. Signed-off-by: Pan Bian <bianpan2016@163.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/nfc')
-rw-r--r--drivers/nfc/st21nfca/core.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/nfc/st21nfca/core.c b/drivers/nfc/st21nfca/core.c
index f9ac176cf257..2ce17932a073 100644
--- a/drivers/nfc/st21nfca/core.c
+++ b/drivers/nfc/st21nfca/core.c
@@ -708,6 +708,7 @@ static int st21nfca_hci_complete_target_discovered(struct nfc_hci_dev *hdev,
NFC_PROTO_FELICA_MASK;
} else {
kfree_skb(nfcid_skb);
+ nfcid_skb = NULL;
/* P2P in type A */
r = nfc_hci_get_param(hdev, ST21NFCA_RF_READER_F_GATE,
ST21NFCA_RF_READER_F_NFCID1,