summaryrefslogtreecommitdiffstats
path: root/drivers/nfc
diff options
context:
space:
mode:
authorMartin Faltesek <mfaltesek@google.com>2022-11-21 18:42:45 -0600
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2022-12-08 11:18:30 +0100
commitcbbad86ebc505d0993ad0a032812f817e7e31157 (patch)
tree2b7d1a4180d8d116d3aa11aa6c449130da154268 /drivers/nfc
parentf4e1301a44508730ca0cd0337a0feca1f721e12e (diff)
downloadlinux-stable-cbbad86ebc505d0993ad0a032812f817e7e31157.tar.gz
linux-stable-cbbad86ebc505d0993ad0a032812f817e7e31157.tar.bz2
linux-stable-cbbad86ebc505d0993ad0a032812f817e7e31157.zip
nfc: st-nci: fix memory leaks in EVT_TRANSACTION
[ Upstream commit 440f2ae9c9f06e26f5dcea697a53717fc61a318c ] Error path does not free previously allocated memory. Add devm_kfree() to the failure path. Reported-by: Denis Efremov <denis.e.efremov@oracle.com> Reviewed-by: Guenter Roeck <groeck@google.com> Fixes: 5d1ceb7f5e56 ("NFC: st21nfcb: Add HCI transaction event support") Signed-off-by: Martin Faltesek <mfaltesek@google.com> Reviewed-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org> Signed-off-by: Jakub Kicinski <kuba@kernel.org> Signed-off-by: Sasha Levin <sashal@kernel.org>
Diffstat (limited to 'drivers/nfc')
-rw-r--r--drivers/nfc/st-nci/se.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/nfc/st-nci/se.c b/drivers/nfc/st-nci/se.c
index 7774a7196bb3..cdf9e915c974 100644
--- a/drivers/nfc/st-nci/se.c
+++ b/drivers/nfc/st-nci/se.c
@@ -352,8 +352,10 @@ static int st_nci_hci_connectivity_event_received(struct nci_dev *ndev,
/* Check next byte is PARAMETERS tag (82) */
if (skb->data[transaction->aid_len + 2] !=
- NFC_EVT_TRANSACTION_PARAMS_TAG)
+ NFC_EVT_TRANSACTION_PARAMS_TAG) {
+ devm_kfree(dev, transaction);
return -EPROTO;
+ }
transaction->params_len = skb->data[transaction->aid_len + 3];
memcpy(transaction->params, skb->data +