Commit 16bbab29 authored by Inaky Perez-Gonzalez's avatar Inaky Perez-Gonzalez Committed by Greg Kroah-Hartman
Browse files

usb: usb_set_configuration() obeys authorization 



Will refuse to configure a non-authorized device.

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

Signed-off-by: default avatarInaky Perez-Gonzalez <inaky@linux.intel.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent d7d07255

drivers/usb/core/message.c

+4 −1
Original line number Diff line number Diff line
@@ -1483,6 +1483,9 @@ static struct usb_interface_assoc_descriptor *find_iad(struct usb_device *dev, 
 * channels are available independently; and choosing between open

 * 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,

 * associated with interfaces.  That configurability is accessed using

 * usb_set_interface().
@@ -1504,7 +1507,7 @@ int usb_set_configuration(struct usb_device *dev, int configuration) 
	struct usb_interface **new_interfaces = NULL;

	int n, nintf;



	if (configuration == -1)

	if (dev->authorized == 0 || configuration == -1)

		configuration = 0;

	else {

		for (i = 0; i < dev->descriptor.bNumConfigurations; i++) {