On Wed, Sep 29, 2021 at 7:39 PM Kuppuswamy, Sathyanarayanan
[off-list ref] wrote:
On 9/29/21 6:55 PM, Dan Williams wrote:
quoted
quoted
Also, you ignored the usb_[de]authorize_interface() functions and
their friends.
Ugh, yes.
I did not change it because I am not sure about the interface vs device
dependency.
This is was the rationale for has_probe_authorization flag. USB
performs authorization of child devices based on the authorization
state of the parent interface.
quoted hunk
I think following change should work.
diff --git a/drivers/usb/core/driver.c b/drivers/usb/core/driver.c
index f57b5a7a90ca..84969732d09c 100644
--- a/drivers/usb/core/driver.c
+++ b/drivers/usb/core/driver.c
@@ -334,7 +334,7 @@ static int usb_probe_interface(struct device *dev)
if (udev->dev.authorized == false) {
dev_err(&intf->dev, "Device is not authorized for usage\n");
return error;
- } else if (intf->authorized == 0) {
+ } else if (intf->dev.authorized == 0) {
== false.
quoted hunk
dev_err(&intf->dev, "Interface %d is not authorized for usage\n",
intf->altsetting->desc.bInterfaceNumber);
return error;@@ -546,7 +546,7 @@ int usb_driver_claim_interface(struct usb_driver *driver,
return -EBUSY;
/* reject claim if interface is not authorized */
- if (!iface->authorized)
+ if (!iface->dev.authorized)
I'd do == false to keep it consistent with other conversions.
quoted hunk
return -ENODEV;
dev->driver = &driver->drvwrap.driver;diff --git a/drivers/usb/core/message.c b/drivers/usb/core/message.c
index 47548ce1cfb1..ab3c8d1e4db9 100644
--- a/drivers/usb/core/message.c
+++ b/drivers/usb/core/message.c
@@ -1791,9 +1791,9 @@ void usb_deauthorize_interface(struct usb_interface *intf)
device_lock(dev->parent);
- if (intf->authorized) {
+ if (intf->dev.authorized) {
device_lock(dev);
- intf->authorized = 0;
+ intf->dev.authorized = 0;
= false;
quoted hunk
device_unlock(dev);
usb_forced_unbind_intf(intf);@@ -1811,9 +1811,9 @@ void usb_authorize_interface(struct usb_interface *intf)
{
struct device *dev = &intf->dev;
- if (!intf->authorized) {
+ if (!intf->dev.authorized) {
device_lock(dev);
- intf->authorized = 1; /* authorize interface */
+ intf->dev.authorized = 1; /* authorize interface */
= true
...not sure that comment is worth preserving.
_______________________________________________
Virtualization mailing list
Virtualization@lists.linux-foundation.org
https://lists.linuxfoundation.org/mailman/listinfo/virtualization