Merge tag 'input-for-v6.3-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input

Pull input fixes from Dmitry Torokhov:

- a check in pegasus-notetaker driver to validate the type of pipe when
probing a new device

- a fix for Cypress touch controller to correctly parse maximum number
of touches.

* tag 'input-for-v6.3-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input:
Input: cyttsp5 - fix sensing configuration data structure
Input: pegasus-notetaker - check pipe type when probing

+7
+6
drivers/input/tablet/pegasus_notetaker.c
··· 296 pegasus->intf = intf; 297 298 pipe = usb_rcvintpipe(dev, endpoint->bEndpointAddress); 299 pegasus->data_len = usb_maxpacket(dev, pipe); 300 301 pegasus->data = usb_alloc_coherent(dev, pegasus->data_len, GFP_KERNEL,
··· 296 pegasus->intf = intf; 297 298 pipe = usb_rcvintpipe(dev, endpoint->bEndpointAddress); 299 + /* Sanity check that pipe's type matches endpoint's type */ 300 + if (usb_pipe_type_check(dev, pipe)) { 301 + error = -EINVAL; 302 + goto err_free_mem; 303 + } 304 + 305 pegasus->data_len = usb_maxpacket(dev, pipe); 306 307 pegasus->data = usb_alloc_coherent(dev, pegasus->data_len, GFP_KERNEL,
+1
drivers/input/touchscreen/cyttsp5.c
··· 111 __le16 max_z; 112 u8 origin_x; 113 u8 origin_y; 114 u8 btn; 115 u8 scan_mode; 116 u8 max_num_of_tch_per_refresh_cycle;
··· 111 __le16 max_z; 112 u8 origin_x; 113 u8 origin_y; 114 + u8 panel_id; 115 u8 btn; 116 u8 scan_mode; 117 u8 max_num_of_tch_per_refresh_cycle;