diff options
| author | Krzysztof Kozlowski <krzysztof.kozlowski@canonical.com> | 2021-12-09 09:13:07 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2021-12-14 10:57:08 +0100 |
| commit | fae9705d281091254d4a81fa2da9d22346097dca (patch) | |
| tree | 1354a229768b59ec83eb2ff88ddcda7e44f63984 | |
| parent | 0159c7b266830a082f73f0a48da3d21b5936bbec (diff) | |
| download | linux-stable-fae9705d281091254d4a81fa2da9d22346097dca.tar.gz linux-stable-fae9705d281091254d4a81fa2da9d22346097dca.tar.bz2 linux-stable-fae9705d281091254d4a81fa2da9d22346097dca.zip | |
nfc: fix potential NULL pointer deref in nfc_genl_dump_ses_done
commit 4cd8371a234d051f9c9557fcbb1f8c523b1c0d10 upstream.
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>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| -rw-r--r-- | net/nfc/netlink.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/net/nfc/netlink.c b/net/nfc/netlink.c index 49089c50872e..082085c25a8e 100644 --- a/net/nfc/netlink.c +++ b/net/nfc/netlink.c @@ -1392,8 +1392,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; } |