Skip to content

Commit

Permalink
USB: make to_usb_driver() use container_of_const()
Browse files Browse the repository at this point in the history
Turns out that we have some const pointers being passed to
to_usb_driver() but were not catching this.  Change the macro to
properly propagate the const-ness of the pointer so that we will notice
when we try to write to memory that we shouldn't be writing to.

This requires fixing up the usb_match_dynamic_id() function as well,
because it can handle a const * to struct usb_driver.

Cc: Johan Hovold <[email protected]>
Cc: Alan Stern <[email protected]>
Cc: Grant Grundler <[email protected]>
Cc: Yajun Deng <[email protected]>
Cc: Oliver Neukum <[email protected]>
Cc: Douglas Anderson <[email protected]>
Cc: [email protected]
Link: https://lore.kernel.org/r/2024111339-shaky-goldsmith-b233@gregkh
Signed-off-by: Greg Kroah-Hartman <[email protected]>
  • Loading branch information
gregkh committed Nov 14, 2024
1 parent 81f5c72 commit 2f3aab7
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
4 changes: 2 additions & 2 deletions drivers/usb/core/driver.c
Original file line number Diff line number Diff line change
Expand Up @@ -228,7 +228,7 @@ static void usb_free_dynids(struct usb_driver *usb_drv)
}

static const struct usb_device_id *usb_match_dynamic_id(struct usb_interface *intf,
struct usb_driver *drv)
const struct usb_driver *drv)
{
struct usb_dynid *dynid;

Expand Down Expand Up @@ -890,7 +890,7 @@ static int usb_device_match(struct device *dev, const struct device_driver *drv)

} else if (is_usb_interface(dev)) {
struct usb_interface *intf;
struct usb_driver *usb_drv;
const struct usb_driver *usb_drv;
const struct usb_device_id *id;

/* device drivers never match interfaces */
Expand Down
2 changes: 1 addition & 1 deletion include/linux/usb.h
Original file line number Diff line number Diff line change
Expand Up @@ -1243,7 +1243,7 @@ struct usb_driver {
unsigned int disable_hub_initiated_lpm:1;
unsigned int soft_unbind:1;
};
#define to_usb_driver(d) container_of(d, struct usb_driver, driver)
#define to_usb_driver(d) container_of_const(d, struct usb_driver, driver)

/**
* struct usb_device_driver - identifies USB device driver to usbcore
Expand Down

0 comments on commit 2f3aab7

Please sign in to comment.