Input: sur40 - fix interface sanity checks
authorJohan Hovold <johan@kernel.org>
Fri, 10 Jan 2020 20:01:27 +0000 (12:01 -0800)
committerDmitry Torokhov <dmitry.torokhov@gmail.com>
Fri, 10 Jan 2020 22:43:01 +0000 (14:43 -0800)
Make sure to use the current alternate setting when verifying the
interface descriptors to avoid binding to an invalid interface.

This in turn could cause the driver to misbehave or trigger a WARN() in
usb_submit_urb() that kernels with panic_on_warn set would choke on.

Fixes: bdb5c57f209c ("Input: add sur40 driver for Samsung SUR40 (aka MS Surface 2.0/Pixelsense)")
Signed-off-by: Johan Hovold <johan@kernel.org>
Acked-by: Vladis Dronov <vdronov@redhat.com>
Link: https://lore.kernel.org/r/20191210113737.4016-8-johan@kernel.org
Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
drivers/input/touchscreen/sur40.c

index 1dd47dd..34d31c7 100644 (file)
@@ -661,7 +661,7 @@ static int sur40_probe(struct usb_interface *interface,
        int error;
 
        /* Check if we really have the right interface. */
-       iface_desc = &interface->altsetting[0];
+       iface_desc = interface->cur_altsetting;
        if (iface_desc->desc.bInterfaceClass != 0xFF)
                return -ENODEV;