2017-10-29 22:14:37 -04:00
|
|
|
From 7ca573e32c0a6634d679540314a80d235f224bfb Mon Sep 17 00:00:00 2001
|
2017-10-29 01:48:53 -04:00
|
|
|
From: Oliver Neukum <oneukum@suse.com>
|
|
|
|
|
Date: Thu, 17 Mar 2016 14:00:17 -0700
|
2017-10-29 22:14:37 -04:00
|
|
|
Subject: [PATCH] Input: ims-pcu - sanity check against missing interfaces
|
|
|
|
|
|
|
|
|
|
[ Upstream commit a0ad220c96692eda76b2e3fd7279f3dcd1d8a8ff ]
|
2017-10-29 01:48:53 -04:00
|
|
|
|
|
|
|
|
A malicious device missing interface can make the driver oops.
|
|
|
|
|
Add sanity checking.
|
|
|
|
|
|
|
|
|
|
Signed-off-by: Oliver Neukum <ONeukum@suse.com>
|
|
|
|
|
CC: stable@vger.kernel.org
|
|
|
|
|
Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
|
2017-10-29 22:14:37 -04:00
|
|
|
Signed-off-by: Sasha Levin <sasha.levin@oracle.com>
|
2017-10-29 01:48:53 -04:00
|
|
|
---
|
|
|
|
|
drivers/input/misc/ims-pcu.c | 4 ++++
|
|
|
|
|
1 file changed, 4 insertions(+)
|
|
|
|
|
|
|
|
|
|
diff --git a/drivers/input/misc/ims-pcu.c b/drivers/input/misc/ims-pcu.c
|
2017-10-29 22:14:37 -04:00
|
|
|
index afed8e2b2f944..41ef29b516f35 100644
|
2017-10-29 01:48:53 -04:00
|
|
|
--- a/drivers/input/misc/ims-pcu.c
|
|
|
|
|
+++ b/drivers/input/misc/ims-pcu.c
|
|
|
|
|
@@ -1663,6 +1663,8 @@ static int ims_pcu_parse_cdc_data(struct usb_interface *intf, struct ims_pcu *pc
|
|
|
|
|
|
|
|
|
|
pcu->ctrl_intf = usb_ifnum_to_if(pcu->udev,
|
|
|
|
|
union_desc->bMasterInterface0);
|
|
|
|
|
+ if (!pcu->ctrl_intf)
|
|
|
|
|
+ return -EINVAL;
|
|
|
|
|
|
|
|
|
|
alt = pcu->ctrl_intf->cur_altsetting;
|
|
|
|
|
pcu->ep_ctrl = &alt->endpoint[0].desc;
|
|
|
|
|
@@ -1670,6 +1672,8 @@ static int ims_pcu_parse_cdc_data(struct usb_interface *intf, struct ims_pcu *pc
|
|
|
|
|
|
|
|
|
|
pcu->data_intf = usb_ifnum_to_if(pcu->udev,
|
|
|
|
|
union_desc->bSlaveInterface0);
|
|
|
|
|
+ if (!pcu->data_intf)
|
|
|
|
|
+ return -EINVAL;
|
|
|
|
|
|
|
|
|
|
alt = pcu->data_intf->cur_altsetting;
|
|
|
|
|
if (alt->desc.bNumEndpoints != 2) {
|
