Skip to content

Commit 94e7272

Browse files
Henry Martingregkh
Henry Martin
authored andcommitted
HID: uclogic: Add NULL check in uclogic_input_configured()
[ Upstream commit bd07f75 ] 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: dd613a4 ("HID: uclogic: Correct devm device reference for hidinput input_dev name") Signed-off-by: Henry Martin <[email protected]> Signed-off-by: Jiri Kosina <[email protected]> Signed-off-by: Sasha Levin <[email protected]>
1 parent a699995 commit 94e7272

File tree

1 file changed

+4
-3
lines changed

1 file changed

+4
-3
lines changed

drivers/hid/hid-uclogic-core.c

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -142,11 +142,12 @@ static int uclogic_input_configured(struct hid_device *hdev,
142142
suffix = "System Control";
143143
break;
144144
}
145-
}
146-
147-
if (suffix)
145+
} else {
148146
hi->input->name = devm_kasprintf(&hdev->dev, GFP_KERNEL,
149147
"%s %s", hdev->name, suffix);
148+
if (!hi->input->name)
149+
return -ENOMEM;
150+
}
150151

151152
return 0;
152153
}

0 commit comments

Comments
 (0)