diff options
| author | Pan Bian <bianpan2016@163.com> | 2019-11-07 09:33:20 +0800 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2019-11-12 19:15:40 +0100 |
| commit | 79049c11e38a816c2d620f11e3ad3c6b909907ba (patch) | |
| tree | ab34cb75aa9b5df8f98e29fac9f28301b43dbb43 /drivers/nfc | |
| parent | 8a0a54313cc9f3a143ad64a2790e9f86adbcfe8b (diff) | |
| download | linux-stable-79049c11e38a816c2d620f11e3ad3c6b909907ba.tar.gz linux-stable-79049c11e38a816c2d620f11e3ad3c6b909907ba.tar.bz2 linux-stable-79049c11e38a816c2d620f11e3ad3c6b909907ba.zip | |
NFC: st21nfca: fix double free
[ Upstream commit 99a8efbb6e30b72ac98cecf81103f847abffb1e5 ]
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>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/nfc')
| -rw-r--r-- | drivers/nfc/st21nfca/core.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/nfc/st21nfca/core.c b/drivers/nfc/st21nfca/core.c index dacb9166081b..2f08e16ba566 100644 --- a/drivers/nfc/st21nfca/core.c +++ b/drivers/nfc/st21nfca/core.c @@ -719,6 +719,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, |