From: Greg Kroah-Hartman Date: Wed, 24 Apr 2019 17:07:41 +0000 (+0200) Subject: 4.14-stable patches X-Git-Tag: v3.18.139~15 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=7ae1405409efab4abcdeb178d63d26efb4e68636;p=thirdparty%2Fkernel%2Fstable-queue.git 4.14-stable patches added patches: i2c-hid-properly-terminate-i2c_hid_dmi_desc_override_table-array.patch --- diff --git a/queue-4.14/i2c-hid-properly-terminate-i2c_hid_dmi_desc_override_table-array.patch b/queue-4.14/i2c-hid-properly-terminate-i2c_hid_dmi_desc_override_table-array.patch new file mode 100644 index 00000000000..edc3b8b57dc --- /dev/null +++ b/queue-4.14/i2c-hid-properly-terminate-i2c_hid_dmi_desc_override_table-array.patch @@ -0,0 +1,48 @@ +From b59dfdaef173677b0b7e10f375226c0a1114fd20 Mon Sep 17 00:00:00 2001 +From: Linus Torvalds +Date: Sat, 27 Oct 2018 09:10:48 -0700 +Subject: i2c-hid: properly terminate i2c_hid_dmi_desc_override_table[] array + +From: Linus Torvalds + +commit b59dfdaef173677b0b7e10f375226c0a1114fd20 upstream. + +Commit 9ee3e06610fd ("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 +unlucky. + +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: Linus Torvalds +Cc: Ambrož Bizjak +Signed-off-by: Greg Kroah-Hartman + +--- + drivers/hid/i2c-hid/i2c-hid-dmi-quirks.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +--- a/drivers/hid/i2c-hid/i2c-hid-dmi-quirks.c ++++ b/drivers/hid/i2c-hid/i2c-hid-dmi-quirks.c +@@ -337,7 +337,8 @@ static const struct dmi_system_id i2c_hi + DMI_EXACT_MATCH(DMI_PRODUCT_NAME, "FlexBook edge11 - M-FBE11"), + }, + .driver_data = (void *)&sipodev_desc +- } ++ }, ++ { } /* Terminate list */ + }; + + diff --git a/queue-4.14/series b/queue-4.14/series index ab45d91faf3..b990527e888 100644 --- a/queue-4.14/series +++ b/queue-4.14/series @@ -67,3 +67,4 @@ tools-include-adopt-linux-bits.h.patch iomap-report-collisions-between-directio-and-buffered-writes-to-userspace.patch xfs-add-the-ability-to-join-a-held-buffer-to-a-defer_ops.patch xfs-hold-xfs_buf-locked-between-shortform-leaf-conversion-and-the-addition-of-an-attribute.patch +i2c-hid-properly-terminate-i2c_hid_dmi_desc_override_table-array.patch