From: Greg Kroah-Hartman Date: Fri, 10 Dec 2021 15:51:17 +0000 (+0100) Subject: 4.9-stable patches X-Git-Tag: v4.4.295~58 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=a41be493ebf8654b1337b52a237162bb5e566d50;p=thirdparty%2Fkernel%2Fstable-queue.git 4.9-stable patches added patches: nfc-fix-potential-null-pointer-deref-in-nfc_genl_dump_ses_done.patch --- diff --git a/queue-4.9/nfc-fix-potential-null-pointer-deref-in-nfc_genl_dump_ses_done.patch b/queue-4.9/nfc-fix-potential-null-pointer-deref-in-nfc_genl_dump_ses_done.patch new file mode 100644 index 00000000000..755479d871d --- /dev/null +++ b/queue-4.9/nfc-fix-potential-null-pointer-deref-in-nfc_genl_dump_ses_done.patch @@ -0,0 +1,37 @@ +From 4cd8371a234d051f9c9557fcbb1f8c523b1c0d10 Mon Sep 17 00:00:00 2001 +From: Krzysztof Kozlowski +Date: Thu, 9 Dec 2021 09:13:07 +0100 +Subject: nfc: fix potential NULL pointer deref in nfc_genl_dump_ses_done + +From: Krzysztof Kozlowski + +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 +Link: https://lore.kernel.org/r/20211209081307.57337-1-krzysztof.kozlowski@canonical.com +Signed-off-by: Jakub Kicinski +Signed-off-by: Greg Kroah-Hartman +--- + net/nfc/netlink.c | 6 ++++-- + 1 file changed, 4 insertions(+), 2 deletions(-) + +--- a/net/nfc/netlink.c ++++ b/net/nfc/netlink.c +@@ -1403,8 +1403,10 @@ static int nfc_genl_dump_ses_done(struct + { + 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; + } diff --git a/queue-4.9/series b/queue-4.9/series index 6f171eecbbb..55bb82f373c 100644 --- a/queue-4.9/series +++ b/queue-4.9/series @@ -6,3 +6,4 @@ hid-add-usb_hid-dependancy-on-some-usb-hid-drivers.patch hid-wacom-fix-problems-when-device-is-not-a-valid-usb-device.patch hid-check-for-valid-usb-device-for-many-hid-drivers.patch can-sja1000-fix-use-after-free-in-ems_pcmcia_add_card.patch +nfc-fix-potential-null-pointer-deref-in-nfc_genl_dump_ses_done.patch