aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/drivers/nfc
diff options
context:
space:
mode:
authorMartin Faltesek <mfaltesek@google.com>2022-11-21 18:42:45 -0600
committerJakub Kicinski <kuba@kernel.org>2022-11-23 20:01:50 -0800
commit440f2ae9c9f06e26f5dcea697a53717fc61a318c (patch)
tree3265dc0d85db87edc75c3c681a533b36a378d427 /drivers/nfc
parentnfc: st-nci: fix incorrect validating logic in EVT_TRANSACTION (diff)
downloadwireguard-linux-440f2ae9c9f06e26f5dcea697a53717fc61a318c.tar.xz
wireguard-linux-440f2ae9c9f06e26f5dcea697a53717fc61a318c.zip
nfc: st-nci: fix memory leaks in EVT_TRANSACTION
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>
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 589e1dec78e7..fc59916ae5ae 100644
--- a/drivers/nfc/st-nci/se.c
+++ b/drivers/nfc/st-nci/se.c
@@ -339,8 +339,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 +