Skip to content

Commit 039d4ed

Browse files
jhovolddtor
authored andcommitted
Input: usbtouchscreen - add driver_info sanity check
Add a sanity check on the device id-table driver_info field to make sure we never access a type structure (and function pointers) outside of the device info array (e.g. if someone fails to ifdef a device-id entry). Note that this also suppresses a compiler warning with -Warray-bounds (gcc-11.3.0) when compile-testing the driver without enabling any of the device type Kconfig options: drivers/input/touchscreen/usbtouchscreen.c: In function 'usbtouch_probe': drivers/input/touchscreen/usbtouchscreen.c:1668:16:warning: array subscript <unknown> is outside array bounds of 'struct usbtouch_device_info[0]' [-Warray-bounds] 1668 | type = &usbtouch_dev_info[id->driver_info]; Signed-off-by: Johan Hovold <johan@kernel.org> Link: https://lore.kernel.org/r/20220623062446.16944-1-johan@kernel.org Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
1 parent 6ab2e51 commit 039d4ed

File tree

1 file changed

+3
-0
lines changed

1 file changed

+3
-0
lines changed

drivers/input/touchscreen/usbtouchscreen.c

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1654,6 +1654,9 @@ static int usbtouch_probe(struct usb_interface *intf,
16541654
if (id->driver_info == DEVTYPE_IGNORE)
16551655
return -ENODEV;
16561656

1657+
if (id->driver_info >= ARRAY_SIZE(usbtouch_dev_info))
1658+
return -ENODEV;
1659+
16571660
endpoint = usbtouch_get_input_endpoint(intf->cur_altsetting);
16581661
if (!endpoint)
16591662
return -ENXIO;

0 commit comments

Comments
 (0)