summaryrefslogtreecommitdiffstats
path: root/drivers/input
diff options
context:
space:
mode:
authorJohan Hovold2017-03-16 19:36:13 +0100
committerDmitry Torokhov2017-03-16 21:56:51 +0100
commit1916d319271664241b7aa0cd2b05e32bdb310ce9 (patch)
treed7bee9832221492a16fe367ef9b804c53172981a /drivers/input
parentInput: cm109 - validate number of endpoints before using them (diff)
downloadkernel-qcow2-linux-1916d319271664241b7aa0cd2b05e32bdb310ce9.tar.gz
kernel-qcow2-linux-1916d319271664241b7aa0cd2b05e32bdb310ce9.tar.xz
kernel-qcow2-linux-1916d319271664241b7aa0cd2b05e32bdb310ce9.zip
Input: ims-pcu - validate number of endpoints before using them
Make sure to check the number of endpoints to avoid dereferencing a NULL-pointer should a malicious device lack control-interface endpoints. Fixes: 628329d52474 ("Input: add IMS Passenger Control Unit driver") Signed-off-by: Johan Hovold <johan@kernel.org> Cc: stable@vger.kernel.org # 3.10 Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
Diffstat (limited to 'drivers/input')
-rw-r--r--drivers/input/misc/ims-pcu.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/input/misc/ims-pcu.c b/drivers/input/misc/ims-pcu.c
index 9c0ea36913b4..f4e8fbec6a94 100644
--- a/drivers/input/misc/ims-pcu.c
+++ b/drivers/input/misc/ims-pcu.c
@@ -1667,6 +1667,10 @@ static int ims_pcu_parse_cdc_data(struct usb_interface *intf, struct ims_pcu *pc
return -EINVAL;
alt = pcu->ctrl_intf->cur_altsetting;
+
+ if (alt->desc.bNumEndpoints < 1)
+ return -ENODEV;
+
pcu->ep_ctrl = &alt->endpoint[0].desc;
pcu->max_ctrl_size = usb_endpoint_maxp(pcu->ep_ctrl);