Patch "HID: multitouch: Add NULL check in mt_input_configured" has been added to the 5.10-stable tree

[Sasha Levin <sashal@xxxxxxxxxx>]

This is a note to let you know that I've just added the patch titled

    HID: multitouch: Add NULL check in mt_input_configured

to the 5.10-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-multitouch-add-null-check-in-mt_input_configured.patch
and it can be found in the queue-5.10 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@xxxxxxxxxxxxxxx> know about it.



commit a3c856cabaf26de3c89e483e80884830d89ffe7c
Author: Charles Han <hanchunchao@xxxxxxxxxx>
Date:   Fri Nov 15 14:26:21 2024 +0800

    HID: multitouch: Add NULL check in mt_input_configured
    
    [ Upstream commit 9b8e2220d3a052a690b1d1b23019673e612494c5 ]
    
    devm_kasprintf() can return a NULL pointer on failure,but this
    returned value in mt_input_configured() is not checked.
    Add NULL check in mt_input_configured(), to handle kernel NULL
    pointer dereference error.
    
    Fixes: 479439463529 ("HID: multitouch: Correct devm device reference for hidinput input_dev name")
    Signed-off-by: Charles Han <hanchunchao@xxxxxxxxxx>
    Signed-off-by: Jiri Kosina <jkosina@xxxxxxxx>
    Signed-off-by: Sasha Levin <sashal@xxxxxxxxxx>

diff --git a/drivers/hid/hid-multitouch.c b/drivers/hid/hid-multitouch.c
index f36ddcb4e2ef2..006af6e143073 100644
--- a/drivers/hid/hid-multitouch.c
+++ b/drivers/hid/hid-multitouch.c
@@ -1594,9 +1594,12 @@ static int mt_input_configured(struct hid_device *hdev, struct hid_input *hi)
 		break;
 	}
 
-	if (suffix)
+	if (suffix) {
 		hi->input->name = devm_kasprintf(&hdev->dev, GFP_KERNEL,
 						 "%s %s", hdev->name, suffix);
+		if (!hi->input->name)
+			return -ENOMEM;
+	}
 
 	return 0;
 }