Blame patches.suse/NFC-st21nfca-fix-double-free.patch
|
Jiri Slaby |
f6819b |
From: Pan Bian <bianpan2016@163.com>
|
|
Jiri Slaby |
f6819b |
Date: Thu, 7 Nov 2019 09:33:20 +0800
|
|
Jiri Slaby |
f6819b |
Subject: NFC: st21nfca: fix double free
|
|
Jiri Slaby |
f6819b |
Git-commit: 99a8efbb6e30b72ac98cecf81103f847abffb1e5
|
|
Jiri Slaby |
f6819b |
Patch-mainline: 5.4-rc7
|
|
Jiri Slaby |
f6819b |
References: networking-stable-19_11_10
|
|
Jiri Slaby |
f6819b |
|
|
Jiri Slaby |
f6819b |
The variable nfcid_skb is not changed in the callee nfc_hci_get_param()
|
|
Jiri Slaby |
f6819b |
if error occurs. Consequently, the freed variable nfcid_skb will be
|
|
Jiri Slaby |
f6819b |
freed again, resulting in a double free bug. Set nfcid_skb to NULL after
|
|
Jiri Slaby |
f6819b |
releasing it to fix the bug.
|
|
Jiri Slaby |
f6819b |
|
|
Jiri Slaby |
f6819b |
Signed-off-by: Pan Bian <bianpan2016@163.com>
|
|
Jiri Slaby |
f6819b |
Signed-off-by: David S. Miller <davem@davemloft.net>
|
|
Jiri Slaby |
f6819b |
Signed-off-by: Jiri Slaby <jslaby@suse.cz>
|
|
Jiri Slaby |
f6819b |
---
|
|
Jiri Slaby |
f6819b |
drivers/nfc/st21nfca/core.c | 1 +
|
|
Jiri Slaby |
f6819b |
1 file changed, 1 insertion(+)
|
|
Jiri Slaby |
f6819b |
|
|
Jiri Slaby |
f6819b |
--- a/drivers/nfc/st21nfca/core.c
|
|
Jiri Slaby |
f6819b |
+++ b/drivers/nfc/st21nfca/core.c
|
|
Jiri Slaby |
f6819b |
@@ -719,6 +719,7 @@ static int st21nfca_hci_complete_target_
|
|
Jiri Slaby |
f6819b |
NFC_PROTO_FELICA_MASK;
|
|
Jiri Slaby |
f6819b |
} else {
|
|
Jiri Slaby |
f6819b |
kfree_skb(nfcid_skb);
|
|
Jiri Slaby |
f6819b |
+ nfcid_skb = NULL;
|
|
Jiri Slaby |
f6819b |
/* P2P in type A */
|
|
Jiri Slaby |
f6819b |
r = nfc_hci_get_param(hdev, ST21NFCA_RF_READER_F_GATE,
|
|
Jiri Slaby |
f6819b |
ST21NFCA_RF_READER_F_NFCID1,
|