| Message ID | 1573090400-23570-1-git-send-email-bianpan2016@163.com |
|---|---|
| State | Accepted |
| Delegated to: | David Miller |
| Headers | show |
| Series | NFC: st21nfca: fix double free | expand |
From: Pan Bian <bianpan2016@163.com> Date: Thu, 7 Nov 2019 09:33:20 +0800 > 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> Applied and queued up for -stable.
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,
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> --- drivers/nfc/st21nfca/core.c | 1 + 1 file changed, 1 insertion(+)