evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

USB: cdc-wdm: fix wdm_find_device* return value

Browse source 
A logic error made the wdm_find_device* functions
return a bogus pointer into static data instead of
the intended NULL no matching device was found.

Cc: stable <stable@vger.kernel.org> # v3.4+
Cc: Oliver Neukum <oliver@neukum.org>
Signed-off-by: Bjørn Mork <bjorn@mork.no>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Bjørn Mork 2012-09-10 22:17:34 +02:00 • committed by Greg Kroah-Hartman
parent f08dea7348
commit 6a44886899
1 changed files with 8 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
drivers/usb/class/cdc-wdm.c
View file

@ -109,12 +109,14 @@ static struct usb_driver wdm_driver;
/* return intfdata if we own the interface, else look up intf in the list */ /* return intfdata if we own the interface, else look up intf in the list */
static struct wdm_device *wdm_find_device(struct usb_interface *intf) static struct wdm_device *wdm_find_device(struct usb_interface *intf)
{ {
struct wdm_device *desc = NULL; struct wdm_device *desc;
spin_lock(&wdm_device_list_lock); spin_lock(&wdm_device_list_lock);
list_for_each_entry(desc, &wdm_device_list, device_list) list_for_each_entry(desc, &wdm_device_list, device_list)
if (desc->intf == intf) if (desc->intf == intf)
break; goto found;
desc = NULL;
found:
spin_unlock(&wdm_device_list_lock); spin_unlock(&wdm_device_list_lock);
return desc; return desc;
@ -122,12 +124,14 @@ static struct wdm_device *wdm_find_device(struct usb_interface *intf)
static struct wdm_device *wdm_find_device_by_minor(int minor) static struct wdm_device *wdm_find_device_by_minor(int minor)
{ {
struct wdm_device *desc = NULL; struct wdm_device *desc;
spin_lock(&wdm_device_list_lock); spin_lock(&wdm_device_list_lock);
list_for_each_entry(desc, &wdm_device_list, device_list) list_for_each_entry(desc, &wdm_device_list, device_list)
if (desc->intf->minor == minor) if (desc->intf->minor == minor)
break; goto found;
desc = NULL;
found:
spin_unlock(&wdm_device_list_lock); spin_unlock(&wdm_device_list_lock);
return desc; return desc;