lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

usb: usb_set_configuration() obeys authorization

Browse Source 
Will refuse to configure a non-authorized device.

Update: simplified if statement--thanks to Ragner Magalhaes for the
heads up.

Signed-off-by: Inaky Perez-Gonzalez <inaky@linux.intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
This commit is contained in:
Inaky Perez-Gonzalez
2007-07-31 20:34:01 -07:00
committed by Greg Kroah-Hartman
parent d7d07255d3
commit 16bbab2966
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
drivers/usb/core/message.c
View File

@@ -1483,6 +1483,9 @@ static struct usb_interface_assoc_descriptor *find_iad(struct usb_device *dev,
* channels are available independently; and choosing between open * channels are available independently; and choosing between open
* standard device protocols (like CDC) or proprietary ones. * standard device protocols (like CDC) or proprietary ones.
* *
* Note that a non-authorized device (dev->authorized == 0) will only
* be put in unconfigured mode.
*
* Note that USB has an additional level of device configurability, * Note that USB has an additional level of device configurability,
* associated with interfaces. That configurability is accessed using * associated with interfaces. That configurability is accessed using
* usb_set_interface(). * usb_set_interface().
@@ -1504,7 +1507,7 @@ int usb_set_configuration(struct usb_device *dev, int configuration)
struct usb_interface **new_interfaces = NULL; struct usb_interface **new_interfaces = NULL;
int n, nintf; int n, nintf;
if (configuration == -1) if (dev->authorized == 0 || configuration == -1)
configuration = 0; configuration = 0;
else { else {
for (i = 0; i < dev->descriptor.bNumConfigurations; i++) { for (i = 0; i < dev->descriptor.bNumConfigurations; i++) {