Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 08b3af00 authored by Oliver Neukum's avatar Oliver Neukum Committed by Greg Kroah-Hartman
Browse files

Input: kbtab - sanity check for endpoint type 



commit c88090dfc84254fa149174eb3e6a8458de1912c4 upstream.

The driver should check whether the endpoint it uses has the correct
type.

Reported-by: default avatar <syzbot+c7df50363aaff50aa363@syzkaller.appspotmail.com>
Signed-off-by: default avatarOliver Neukum <oneukum@suse.com>
Signed-off-by: default avatarDmitry Torokhov <dmitry.torokhov@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent b545dc9d

drivers/input/tablet/kbtab.c

+4 −2
Original line number Original line Diff line number Diff line
@@ -116,6 +116,10 @@ static int kbtab_probe(struct usb_interface *intf, const struct usb_device_id *i 
	if (intf->cur_altsetting->desc.bNumEndpoints < 1)

	if (intf->cur_altsetting->desc.bNumEndpoints < 1)

		return -ENODEV;

		return -ENODEV;





	endpoint = &intf->cur_altsetting->endpoint[0].desc;

	if (!usb_endpoint_is_int_in(endpoint))

		return -ENODEV;



	kbtab = kzalloc(sizeof(struct kbtab), GFP_KERNEL);

	kbtab = kzalloc(sizeof(struct kbtab), GFP_KERNEL);

	input_dev = input_allocate_device();

	input_dev = input_allocate_device();

	if (!kbtab || !input_dev)

	if (!kbtab || !input_dev)
@@ -154,8 +158,6 @@ static int kbtab_probe(struct usb_interface *intf, const struct usb_device_id *i 
	input_set_abs_params(input_dev, ABS_Y, 0, 0x1750, 4, 0);

	input_set_abs_params(input_dev, ABS_Y, 0, 0x1750, 4, 0);

	input_set_abs_params(input_dev, ABS_PRESSURE, 0, 0xff, 0, 0);

	input_set_abs_params(input_dev, ABS_PRESSURE, 0, 0xff, 0, 0);





	endpoint = &intf->cur_altsetting->endpoint[0].desc;



	usb_fill_int_urb(kbtab->irq, dev,

	usb_fill_int_urb(kbtab->irq, dev,

			 usb_rcvintpipe(dev, endpoint->bEndpointAddress),

			 usb_rcvintpipe(dev, endpoint->bEndpointAddress),

			 kbtab->data, 8,

			 kbtab->data, 8,