From mboxrd@z Thu Jan 1 00:00:00 1970 From: Dmitry Torokhov Subject: Re: [PATCH] ims-pcu: sanity check against missing interfaces Date: Thu, 17 Mar 2016 14:01:55 -0700 Message-ID: <20160317210155.GA21461@dtor-ws> References: <1458223847-9878-1-git-send-email-oneukum@suse.com> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Return-path: Received: from mail-pf0-f176.google.com ([209.85.192.176]:34329 "EHLO mail-pf0-f176.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1030437AbcCQVB6 (ORCPT ); Thu, 17 Mar 2016 17:01:58 -0400 Content-Disposition: inline In-Reply-To: <1458223847-9878-1-git-send-email-oneukum@suse.com> Sender: linux-input-owner@vger.kernel.org List-Id: linux-input@vger.kernel.org To: Oliver Neukum Cc: linux-usb@vger.kernel.org, linux-input@vger.kernel.org, stable@vger.kernel.org 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 > CC: stable@vger.kernel.org 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