aboutsummaryrefslogtreecommitdiffstats
diff options
authorStephen Rothwell <sfr@canb.auug.org.au>2022-06-28 08:56:27 +1000
committerStephen Rothwell <sfr@canb.auug.org.au>2022-06-28 08:56:27 +1000
commit46dd13a5b18c0dee49a2fd54d8a739979551f9f1 (patch)
treeb3b8577d0ecd037656845bc0be3064d168d98769
parent57efdfe7b5f8e2c55ce14f9e0a5d5a4f1c340f07 (diff)
parent039d4ed3428cf9c2052048d177880ebd02104764 (diff)
downloadlinux-next-46dd13a5b18c0dee49a2fd54d8a739979551f9f1.tar.gz
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input.git
-rw-r--r--drivers/input/touchscreen/usbtouchscreen.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/input/touchscreen/usbtouchscreen.c b/drivers/input/touchscreen/usbtouchscreen.c
index 43c521f50c851..3dda6eaabdab8 100644
--- a/drivers/input/touchscreen/usbtouchscreen.c
+++ b/drivers/input/touchscreen/usbtouchscreen.c
@@ -1654,6 +1654,9 @@ static int usbtouch_probe(struct usb_interface *intf,
if (id->driver_info == DEVTYPE_IGNORE)
return -ENODEV;
+ if (id->driver_info >= ARRAY_SIZE(usbtouch_dev_info))
+ return -ENODEV;
+
endpoint = usbtouch_get_input_endpoint(intf->cur_altsetting);
if (!endpoint)
return -ENXIO;