This is a note to let you know that I've just added the patch titled
HID: amd_sfh: Fix potential NULL pointer dereference - take 2
to the 5.14-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
hid-amd_sfh-fix-potential-null-pointer-dereference-take-2.patch
and it can be found in the queue-5.14 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@xxxxxxxxxxxxxxx> know about it.
>From 88a04049c08cd62e698bc1b1af2d09574b9e0aee Mon Sep 17 00:00:00 2001
From: Basavaraj Natikar <Basavaraj.Natikar@xxxxxxx>
Date: Thu, 23 Sep 2021 17:59:27 +0530
Subject: HID: amd_sfh: Fix potential NULL pointer dereference - take 2
From: Basavaraj Natikar <Basavaraj.Natikar@xxxxxxx>
commit 88a04049c08cd62e698bc1b1af2d09574b9e0aee upstream.
The cl_data field of a privdata must be allocated and updated before
using in amd_sfh_hid_client_init() function.
Hence handling NULL pointer cl_data accordingly.
Fixes: d46ef750ed58 ("HID: amd_sfh: Fix potential NULL pointer dereference")
Signed-off-by: Basavaraj Natikar <Basavaraj.Natikar@xxxxxxx>
Signed-off-by: Jiri Kosina <jkosina@xxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
---
drivers/hid/amd-sfh-hid/amd_sfh_pcie.c | 12 ++++--------
1 file changed, 4 insertions(+), 8 deletions(-)
--- a/drivers/hid/amd-sfh-hid/amd_sfh_pcie.c
+++ b/drivers/hid/amd-sfh-hid/amd_sfh_pcie.c
@@ -235,21 +235,17 @@ static int amd_mp2_pci_probe(struct pci_
return rc;
}
- rc = amd_sfh_hid_client_init(privdata);
- if (rc)
- return rc;
-
privdata->cl_data = devm_kzalloc(&pdev->dev, sizeof(struct amdtp_cl_data), GFP_KERNEL);
if (!privdata->cl_data)
return -ENOMEM;
- rc = devm_add_action_or_reset(&pdev->dev, amd_mp2_pci_remove, privdata);
+ mp2_select_ops(privdata);
+
+ rc = amd_sfh_hid_client_init(privdata);
if (rc)
return rc;
- mp2_select_ops(privdata);
-
- return 0;
+ return devm_add_action_or_reset(&pdev->dev, amd_mp2_pci_remove, privdata);
}
static const struct pci_device_id amd_mp2_pci_tbl[] = {
Patches currently in stable-queue which might be from Basavaraj.Natikar@xxxxxxx are
queue-5.14/hid-amd_sfh-fix-potential-null-pointer-dereference-take-2.patch
queue-5.14/hid-amd_sfh-fix-potential-null-pointer-dereference.patch
