| Message ID | 2024061448-manly-universal-00ad@gregkh (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | [1/4] USB: make to_usb_driver() use container_of_const() | expand |
On Fri, Jun 14, 2024 at 02:11:49PM +0200, Greg Kroah-Hartman wrote: > 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 > Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> > --- > drivers/usb/core/driver.c | 4 ++-- > include/linux/usb.h | 2 +- > 2 files changed, 3 insertions(+), 3 deletions(-) > > diff --git a/drivers/usb/core/driver.c b/drivers/usb/core/driver.c > index 8e9bafcd62c6..c985a272e552 100644 > --- a/drivers/usb/core/driver.c > +++ b/drivers/usb/core/driver.c > @@ -229,7 +229,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) Oops, this requires a patch that I have not sent out yet that changes the signature of all match() callbacks for busses, that is still winding it's way through the build systems. So I'll hold off on applying any of this until that is accepted, but at least it's good to get this out for review now to see if anyone objects to this series. Also, I've tested this locally and all seems to work properly, but finding good "unit tests" for adding new device ids is hard... thanks, greg k-h
diff --git a/drivers/usb/core/driver.c b/drivers/usb/core/driver.c index 8e9bafcd62c6..c985a272e552 100644 --- a/drivers/usb/core/driver.c +++ b/drivers/usb/core/driver.c @@ -229,7 +229,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; @@ -880,7 +880,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 */ diff --git a/include/linux/usb.h b/include/linux/usb.h index 1913a13833f2..4390426973f4 100644 --- a/include/linux/usb.h +++ b/include/linux/usb.h @@ -1232,7 +1232,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
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 Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> --- drivers/usb/core/driver.c | 4 ++-- include/linux/usb.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-)