projects
/
platform
/
kernel
/
linux-starfive.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
fd79a0c
)
nfc: fix potential NULL pointer deref in nfc_genl_dump_ses_done
author
Krzysztof Kozlowski
<krzysztof.kozlowski@canonical.com>
Thu, 9 Dec 2021 08:13:07 +0000
(09:13 +0100)
committer
Jakub Kicinski
<kuba@kernel.org>
Thu, 9 Dec 2021 15:50:32 +0000
(07:50 -0800)
The done() netlink callback nfc_genl_dump_ses_done() should check if
received argument is non-NULL, because its allocation could fail earlier
in dumpit() (nfc_genl_dump_ses()).
Fixes:
ac22ac466a65
("NFC: Add a GET_SE netlink API")
Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@canonical.com>
Link:
https://lore.kernel.org/r/20211209081307.57337-1-krzysztof.kozlowski@canonical.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
net/nfc/netlink.c
patch
|
blob
|
history
diff --git
a/net/nfc/netlink.c
b/net/nfc/netlink.c
index
0b4fae1
..
f184b0d
100644
(file)
--- a/
net/nfc/netlink.c
+++ b/
net/nfc/netlink.c
@@
-1394,8
+1394,10
@@
static int nfc_genl_dump_ses_done(struct netlink_callback *cb)
{
struct class_dev_iter *iter = (struct class_dev_iter *) cb->args[0];
- nfc_device_iter_exit(iter);
- kfree(iter);
+ if (iter) {
+ nfc_device_iter_exit(iter);
+ kfree(iter);
+ }
return 0;
}