diff options
| author | Pietro Borrello <borrello@diag.uniroma1.it> | 2023-01-16 11:11:24 +0000 |
|---|---|---|
| committer | Alexander Grund <flamefire89@gmail.com> | 2023-11-09 19:17:23 +0100 |
| commit | c48d1e51003b8558454200da22974dd17834d21d (patch) | |
| tree | 0b8c85bf4a0685b184dc729e40a38b28bd11dfba | |
| parent | a4e8915d05392abcf31237e567746890b5ebbc49 (diff) | |
HID: check empty report_list in hid_validate_values()
[ Upstream commit b12fece4c64857e5fab4290bf01b2e0317a88456 ]
Add a check for empty report_list in hid_validate_values().
The missing check causes a type confusion when issuing a list_entry()
on an empty report_list.
The problem is caused by the assumption that the device must
have valid report_list. While this will be true for all normal HID
devices, a suitably malicious device can violate the assumption.
Fixes: 1b15d2e5b807 ("HID: core: fix validation of report id 0")
Change-Id: I990e3685de15a63e636a008dce7c450966c47cf8
Signed-off-by: Pietro Borrello <borrello@diag.uniroma1.it>
Signed-off-by: Jiri Kosina <jkosina@suse.cz>
Signed-off-by: Sasha Levin <sashal@kernel.org>
Signed-off-by: Ulrich Hecht <uli+cip@fpond.eu>
| -rw-r--r-- | drivers/hid/hid-core.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/hid/hid-core.c b/drivers/hid/hid-core.c index a0a048d947be..c0f276e27561 100644 --- a/drivers/hid/hid-core.c +++ b/drivers/hid/hid-core.c @@ -968,8 +968,8 @@ struct hid_report *hid_validate_values(struct hid_device *hid, * Validating on id 0 means we should examine the first * report in the list. */ - report = list_entry( - hid->report_enum[type].report_list.next, + report = list_first_entry_or_null( + &hid->report_enum[type].report_list, struct hid_report, list); } else { report = hid->report_enum[type].report_id_hash[id]; |