summaryrefslogtreecommitdiff
path: root/drivers/nfc
diff options
context:
space:
mode:
authorChuhong Yuan <hslester96@gmail.com>2020-05-28 18:20:37 +0800
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2020-06-10 20:24:54 +0200
commit165508e456b1dd04ef680cf3d0d20133dfc84292 (patch)
treea678c3a0ef3a49fe50c717b0b7d92dc7633fd49a /drivers/nfc
parent87adb76710d0119cee1fabdfa5ad5b0ed8f6ad12 (diff)
downloadlinux-165508e456b1dd04ef680cf3d0d20133dfc84292.tar.gz
linux-165508e456b1dd04ef680cf3d0d20133dfc84292.tar.bz2
linux-165508e456b1dd04ef680cf3d0d20133dfc84292.zip
NFC: st21nfca: add missed kfree_skb() in an error path
[ Upstream commit 3decabdc714ca56c944f4669b4cdec5c2c1cea23 ] st21nfca_tm_send_atr_res() misses to call kfree_skb() in an error path. Add the missed function call to fix it. Fixes: 1892bf844ea0 ("NFC: st21nfca: Adding P2P support to st21nfca in Initiator & Target mode") Signed-off-by: Chuhong Yuan <hslester96@gmail.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/dep.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/nfc/st21nfca/dep.c b/drivers/nfc/st21nfca/dep.c
index 60acdfd1cb8c..856a10c293f8 100644
--- a/drivers/nfc/st21nfca/dep.c
+++ b/drivers/nfc/st21nfca/dep.c
@@ -173,8 +173,10 @@ static int st21nfca_tm_send_atr_res(struct nfc_hci_dev *hdev,
memcpy(atr_res->gbi, atr_req->gbi, gb_len);
r = nfc_set_remote_general_bytes(hdev->ndev, atr_res->gbi,
gb_len);
- if (r < 0)
+ if (r < 0) {
+ kfree_skb(skb);
return r;
+ }
}
info->dep_info.curr_nfc_dep_pni = 0;