On Thu, Mar 17, 2016 at 03:10:47PM +0100, Oliver Neukum wrote:
> A malicious device missing interface can make the driver oops.
> Add sanity checking.
>
> Signed-off-by: Oliver Neukum <ONeukum@xxxxxxxx>
> CC: stable@xxxxxxxxxxxxxxx
Applied, thank you.
> ---
> 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
> index ac1fa5f..9c0ea36 100644
> --- 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) {
> --
> 2.1.4
>
--
Dmitry
--
To unsubscribe from this list: send the line "unsubscribe stable" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html