summaryrefslogtreecommitdiff
path: root/net
diff options
context:
space:
mode:
authorFedor Pchelkin <pchelkin@ispras.ru>2023-02-25 13:56:14 +0300
committerDavid S. Miller <davem@davemloft.net>2023-02-26 17:55:13 +0300
commit25ff6f8a5a3b8dc48e8abda6f013e8cc4b14ffea (patch)
tree51a9c9f0cc736d90bc3d1cfc12f91e25472a8a96 /net
parentcf871006c01709211f2620a33de37257362a05e8 (diff)
downloadlinux-25ff6f8a5a3b8dc48e8abda6f013e8cc4b14ffea.tar.xz
nfc: fix memory leak of se_io context in nfc_genl_se_io
The callback context for sending/receiving APDUs to/from the selected secure element is allocated inside nfc_genl_se_io and supposed to be eventually freed in se_io_cb callback function. However, there are several error paths where the bwi_timer is not charged to call se_io_cb later, and the cb_context is leaked. The patch proposes to free the cb_context explicitly on those error paths. At the moment we can't simply check 'dev->ops->se_io()' return value as it may be negative in both cases: when the timer was charged and was not. Fixes: 5ce3f32b5264 ("NFC: netlink: SE API implementation") Reported-by: syzbot+df64c0a2e8d68e78a4fa@syzkaller.appspotmail.com Signed-off-by: Fedor Pchelkin <pchelkin@ispras.ru> Signed-off-by: Alexey Khoroshilov <khoroshilov@ispras.ru> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net')
-rw-r--r--net/nfc/netlink.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/net/nfc/netlink.c b/net/nfc/netlink.c
index 1fc339084d89..348bf561bc9f 100644
--- a/net/nfc/netlink.c
+++ b/net/nfc/netlink.c
@@ -1442,7 +1442,11 @@ static int nfc_se_io(struct nfc_dev *dev, u32 se_idx,
rc = dev->ops->se_io(dev, se_idx, apdu,
apdu_length, cb, cb_context);
+ device_unlock(&dev->dev);
+ return rc;
+
error:
+ kfree(cb_context);
device_unlock(&dev->dev);
return rc;
}