diff options
author | Sumit Semwal <sumit.semwal@linaro.org> | 2017-11-20 20:10:11 +0530 |
---|---|---|
committer | Sumit Semwal <sumit.semwal@linaro.org> | 2017-11-20 20:10:11 +0530 |
commit | f0ce6d71bb1b0929f1a10cbe5a089ceaa16b3205 (patch) | |
tree | 51b7b71e10d5ef615c39dc93039a7304912f2d89 /drivers/input | |
parent | d0fee18fa88f1272386663260703db45d1ab6628 (diff) | |
parent | 0cbac004e67307949714c176c8a7af9c1da980b9 (diff) |
Merge remote-tracking branch 'stable/linux-4.4.y' into lts-4.4.y-hikey4.4.99-hikey
Diffstat (limited to 'drivers/input')
-rw-r--r-- | drivers/input/misc/ims-pcu.c | 16 |
1 files changed, 14 insertions, 2 deletions
diff --git a/drivers/input/misc/ims-pcu.c b/drivers/input/misc/ims-pcu.c index f4e8fbec6a94..b5304e264881 100644 --- a/drivers/input/misc/ims-pcu.c +++ b/drivers/input/misc/ims-pcu.c @@ -1635,13 +1635,25 @@ ims_pcu_get_cdc_union_desc(struct usb_interface *intf) return NULL; } - while (buflen > 0) { + while (buflen >= sizeof(*union_desc)) { union_desc = (struct usb_cdc_union_desc *)buf; + if (union_desc->bLength > buflen) { + dev_err(&intf->dev, "Too large descriptor\n"); + return NULL; + } + if (union_desc->bDescriptorType == USB_DT_CS_INTERFACE && union_desc->bDescriptorSubType == USB_CDC_UNION_TYPE) { dev_dbg(&intf->dev, "Found union header\n"); - return union_desc; + + if (union_desc->bLength >= sizeof(*union_desc)) + return union_desc; + + dev_err(&intf->dev, + "Union descriptor to short (%d vs %zd\n)", + union_desc->bLength, sizeof(*union_desc)); + return NULL; } buflen -= union_desc->bLength; |