From: Henry Martin <bsdhenrymartin@gmail.com>
Date: Tue, 1 Apr 2025 09:48:53 +0000 (+0800)
Subject: HID: uclogic: Add NULL check in uclogic_input_configured()
X-Git-Tag: v6.6.92~86
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=ad6caaf29bc26a48b1241ce82561fcbcf0a75aa9;p=thirdparty%2Fkernel%2Fstable.git

HID: uclogic: Add NULL check in uclogic_input_configured()

[ Upstream commit bd07f751208ba190f9b0db5e5b7f35d5bb4a8a1e ]

devm_kasprintf() returns NULL when memory allocation fails. Currently,
uclogic_input_configured() does not check for this case, which results
in a NULL pointer dereference.

Add NULL check after devm_kasprintf() to prevent this issue.

Fixes: dd613a4e45f8 ("HID: uclogic: Correct devm device reference for hidinput input_dev name")
Signed-off-by: Henry Martin <bsdhenrymartin@gmail.com>
Signed-off-by: Jiri Kosina <jkosina@suse.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
---

diff --git a/drivers/hid/hid-uclogic-core.c b/drivers/hid/hid-uclogic-core.c
index ad74cbc9a0aa5..45de01dea4b1c 100644
--- a/drivers/hid/hid-uclogic-core.c
+++ b/drivers/hid/hid-uclogic-core.c
@@ -142,11 +142,12 @@ static int uclogic_input_configured(struct hid_device *hdev,
 			suffix = "System Control";
 			break;
 		}
-	}
-
-	if (suffix)
+	} else {
 		hi->input->name = devm_kasprintf(&hdev->dev, GFP_KERNEL,
 						 "%s %s", hdev->name, suffix);
+		if (!hi->input->name)
+			return -ENOMEM;
+	}
 
 	return 0;
 }