Skip to content

Commit c3758b9

Browse files
author
Desnes Nunes
committed
USB: make to_usb_driver() use container_of_const()
JIRA: https://issues.redhat.com/browse/RHEL-78828 Conflicts: * Avoiding commit <d69d80484598> ("driver core: have match() callback in struct bus_type take a const *") commit 2f3aab7 Author: Greg Kroah-Hartman <gregkh@linuxfoundation.org> Date: Wed, 13 Nov 2024 15:04:40 +0100 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 <johan@kernel.org> Cc: Alan Stern <stern@rowland.harvard.edu> Cc: Grant Grundler <grundler@chromium.org> Cc: Yajun Deng <yajun.deng@linux.dev> Cc: Oliver Neukum <oneukum@suse.com> Cc: Douglas Anderson <dianders@chromium.org> Cc: linux-usb@vger.kernel.org Link: https://lore.kernel.org/r/2024111339-shaky-goldsmith-b233@gregkh Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> Signed-off-by: Desnes Nunes <desnesn@redhat.com>
1 parent 47245f6 commit c3758b9

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

drivers/usb/core/driver.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -228,7 +228,7 @@ static void usb_free_dynids(struct usb_driver *usb_drv)
228228
}
229229

230230
static const struct usb_device_id *usb_match_dynamic_id(struct usb_interface *intf,
231-
struct usb_driver *drv)
231+
const struct usb_driver *drv)
232232
{
233233
struct usb_dynid *dynid;
234234

@@ -890,7 +890,7 @@ static int usb_device_match(struct device *dev, struct device_driver *drv)
890890

891891
} else if (is_usb_interface(dev)) {
892892
struct usb_interface *intf;
893-
struct usb_driver *usb_drv;
893+
const struct usb_driver *usb_drv;
894894
const struct usb_device_id *id;
895895

896896
/* device drivers never match interfaces */

include/linux/usb.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1243,7 +1243,7 @@ struct usb_driver {
12431243
unsigned int disable_hub_initiated_lpm:1;
12441244
unsigned int soft_unbind:1;
12451245
};
1246-
#define to_usb_driver(d) container_of(d, struct usb_driver, driver)
1246+
#define to_usb_driver(d) container_of_const(d, struct usb_driver, driver)
12471247

12481248
/**
12491249
* struct usb_device_driver - identifies USB device driver to usbcore

0 commit comments

Comments
 (0)