Commit d6b11409 authored by Linus Torvalds's avatar Linus Torvalds Committed by Greg Kroah-Hartman

i2c-hid: properly terminate i2c_hid_dmi_desc_override_table[] array

commit b59dfdae upstream.

Commit 9ee3e066 ("HID: i2c-hid: override HID descriptors for certain
devices") added a new dmi_system_id quirk table to override certain HID
report descriptors for some systems that lack them.

But the table wasn't properly terminated, causing the dmi matching to
walk off into la-la-land, and starting to treat random data as dmi
descriptor pointers, causing boot-time oopses if you were at all

Terminate the array.

We really should have some way to just statically check that arrays that
should be terminated by an empty entry actually are so.  But the HID
people really should have caught this themselves, rather than have me
deal with an oops during the merge window.  Tssk, tssk.

Cc: Julian Sax <>
Cc: Benjamin Tissoires <>
Cc: Jiri Kosina <>
Signed-off-by: default avatarLinus Torvalds <>
Cc: Ambrož Bizjak <>
Signed-off-by: default avatarGreg Kroah-Hartman <>
parent 4024e3bd
......@@ -337,7 +337,8 @@ static const struct dmi_system_id i2c_hid_dmi_desc_override_table[] = {
.driver_data = (void *)&sipodev_desc
{ } /* Terminate list */
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment