Revert "usb: interface authorization: Use a flag for the default device authorization" (a1b93ab7) · Commits · 戴 / test

drivers/usb/core/hcd.c

+10 −21

Original line number	Diff line number	Diff line
		@@ -854,10 +854,10 @@ static ssize_t authorized_default_show(struct device *dev,
		{
		struct usb_device *rh_usb_dev = to_usb_device(dev);
		struct usb_bus *usb_bus = rh_usb_dev->bus;
		struct usb_hcd *hcd;
		struct usb_hcd *usb_hcd;

		hcd = bus_to_hcd(usb_bus);
		return snprintf(buf, PAGE_SIZE, "%u\n", !!HCD_DEV_AUTHORIZED(hcd));
		usb_hcd = bus_to_hcd(usb_bus);
		return snprintf(buf, PAGE_SIZE, "%u\n", usb_hcd->authorized_default);
		}

		static ssize_t authorized_default_store(struct device *dev,
		@@ -868,16 +868,12 @@ static ssize_t authorized_default_store(struct device *dev,
		unsigned val;
		struct usb_device *rh_usb_dev = to_usb_device(dev);
		struct usb_bus *usb_bus = rh_usb_dev->bus;
		struct usb_hcd *hcd;
		struct usb_hcd *usb_hcd;

		hcd = bus_to_hcd(usb_bus);
		usb_hcd = bus_to_hcd(usb_bus);
		result = sscanf(buf, "%u\n", &val);
		if (result == 1) {
		if (val)
		set_bit(HCD_FLAG_DEV_AUTHORIZED, &hcd->flags);
		else
		clear_bit(HCD_FLAG_DEV_AUTHORIZED, &hcd->flags);

		usb_hcd->authorized_default = val ? 1 : 0;
		result = size;
		} else {
		result = -EINVAL;
		@@ -2724,17 +2720,10 @@ int usb_add_hcd(struct usb_hcd *hcd,
		dev_info(hcd->self.controller, "%s\n", hcd->product_desc);

		/* Keep old behaviour if authorized_default is not in [0, 1]. */
		if (authorized_default < 0 \|\| authorized_default > 1) {
		if (hcd->wireless)
		clear_bit(HCD_FLAG_DEV_AUTHORIZED, &hcd->flags);
		else
		set_bit(HCD_FLAG_DEV_AUTHORIZED, &hcd->flags);
		} else {
		if (authorized_default)
		set_bit(HCD_FLAG_DEV_AUTHORIZED, &hcd->flags);
		if (authorized_default < 0 \|\| authorized_default > 1)
		hcd->authorized_default = hcd->wireless ? 0 : 1;
		else
		clear_bit(HCD_FLAG_DEV_AUTHORIZED, &hcd->flags);
		}
		hcd->authorized_default = authorized_default;
		set_bit(HCD_FLAG_HW_ACCESSIBLE, &hcd->flags);

		/* per default all interfaces are authorized */

drivers/usb/core/usb.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -510,7 +510,7 @@ struct usb_device usb_alloc_dev(struct usb_device parent,
		if (root_hub) /* Root hub always ok [and always wired] */
		dev->authorized = 1;
		else {
		dev->authorized = !!HCD_DEV_AUTHORIZED(usb_hcd);
		dev->authorized = usb_hcd->authorized_default;
		dev->wusb = usb_bus_is_wusb(bus) ? 1 : 0;
		}
		return dev;

include/linux/usb/hcd.h

+7 −9

Original line number	Diff line number	Diff line
		@@ -58,6 +58,12 @@
		*
		* Since "struct usb_bus" is so thin, you can't share much code in it.
		* This framework is a layer over that, and should be more sharable.
		*
		* @authorized_default: Specifies if new devices are authorized to
		* connect by default or they require explicit
		* user space authorization; this bit is settable
		* through /sys/class/usb_host/X/authorized_default.
		* For the rest is RO, so we don't lock to r/w it.
		*/

		/-------------------------------------------------------------------------/
		@@ -115,7 +121,6 @@ struct usb_hcd {
		#define HCD_FLAG_RH_RUNNING 5 /* root hub is running? */
		#define HCD_FLAG_DEAD 6 /* controller has died? */
		#define HCD_FLAG_INTF_AUTHORIZED 7 /* authorize interfaces? */
		#define HCD_FLAG_DEV_AUTHORIZED 8 /* authorize devices? */

		/* The flags can be tested using these macros; they are likely to
		* be slightly faster than test_bit().
		@@ -135,14 +140,6 @@ struct usb_hcd {
		#define HCD_INTF_AUTHORIZED(hcd) \
		((hcd)->flags & (1U << HCD_FLAG_INTF_AUTHORIZED))

		/*
		* Specifies if devices are authorized by default
		* or they require explicit user space authorization; this bit is
		* settable through /sys/class/usb_host/X/authorized_default
		*/
		#define HCD_DEV_AUTHORIZED(hcd) \
		((hcd)->flags & (1U << HCD_FLAG_DEV_AUTHORIZED))

		/* Flags that get set only during HCD registration or removal. */
		unsigned rh_registered:1;/* is root hub registered? */
		unsigned rh_pollable:1; /* may we poll the root hub? */
		@@ -153,6 +150,7 @@ struct usb_hcd {
		* support the new root-hub polling mechanism. */
		unsigned uses_new_polling:1;
		unsigned wireless:1; /* Wireless USB HCD */
		unsigned authorized_default:1;
		unsigned has_tt:1; /* Integrated TT in root hub */
		unsigned amd_resume_bug:1; /* AMD remote wakeup quirk */
		unsigned can_do_streams:1; /* HC supports streams */

Admin message