| Message ID | 20230313182918.1312597-36-gregkh@linuxfoundation.org (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 9d11b13402d1b80f7f3ca5061d75f15cf8002555 |
| Headers | show |
| Series | None | expand |
On Mon, Mar 13, 2023 at 07:29:18PM +0100, Greg Kroah-Hartman wrote: > Now that the driver core can properly handle constant struct bus_type, > move all of the USB subsystem struct bus_type structures as const, > placing them into read-only memory which can not be modified at runtime. > > Cc: Heikki Krogerus <heikki.krogerus@linux.intel.com> > Cc: Johan Hovold <johan@kernel.org> > Cc: Evan Green <evgreen@chromium.org> > Cc: Alan Stern <stern@rowland.harvard.edu> > Cc: linux-usb@vger.kernel.org > Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> Acked-by: Heikki Krogerus <heikki.krogerus@linux.intel.com> > --- > drivers/usb/common/ulpi.c | 2 +- > drivers/usb/core/driver.c | 2 +- > drivers/usb/core/usb.h | 2 +- > drivers/usb/gadget/udc/core.c | 4 ++-- > drivers/usb/serial/bus.c | 2 +- > drivers/usb/typec/bus.c | 2 +- > drivers/usb/typec/bus.h | 2 +- > include/linux/usb/serial.h | 2 +- > 8 files changed, 9 insertions(+), 9 deletions(-) > > diff --git a/drivers/usb/common/ulpi.c b/drivers/usb/common/ulpi.c > index a98b2108376a..8305a5dfb910 100644 > --- a/drivers/usb/common/ulpi.c > +++ b/drivers/usb/common/ulpi.c > @@ -90,7 +90,7 @@ static void ulpi_remove(struct device *dev) > drv->remove(to_ulpi_dev(dev)); > } > > -static struct bus_type ulpi_bus = { > +static const struct bus_type ulpi_bus = { > .name = "ulpi", > .match = ulpi_match, > .uevent = ulpi_uevent, > diff --git a/drivers/usb/core/driver.c b/drivers/usb/core/driver.c > index a0e076c6f3a4..f58a0299fb3b 100644 > --- a/drivers/usb/core/driver.c > +++ b/drivers/usb/core/driver.c > @@ -2025,7 +2025,7 @@ int usb_disable_usb2_hardware_lpm(struct usb_device *udev) > > #endif /* CONFIG_PM */ > > -struct bus_type usb_bus_type = { > +const struct bus_type usb_bus_type = { > .name = "usb", > .match = usb_device_match, > .uevent = usb_uevent, > diff --git a/drivers/usb/core/usb.h b/drivers/usb/core/usb.h > index 0eac7d4285d1..cd434af259c3 100644 > --- a/drivers/usb/core/usb.h > +++ b/drivers/usb/core/usb.h > @@ -140,7 +140,7 @@ static inline int usb_disable_usb2_hardware_lpm(struct usb_device *udev) > > #endif > > -extern struct bus_type usb_bus_type; > +extern const struct bus_type usb_bus_type; > extern struct mutex usb_port_peer_mutex; > extern struct device_type usb_device_type; > extern struct device_type usb_if_device_type; > diff --git a/drivers/usb/gadget/udc/core.c b/drivers/usb/gadget/udc/core.c > index 23b0629a8774..61a9c231deb9 100644 > --- a/drivers/usb/gadget/udc/core.c > +++ b/drivers/usb/gadget/udc/core.c > @@ -26,7 +26,7 @@ > > static DEFINE_IDA(gadget_id_numbers); > > -static struct bus_type gadget_bus_type; > +static const struct bus_type gadget_bus_type; > > /** > * struct usb_udc - describes one usb device controller > @@ -1747,7 +1747,7 @@ static int usb_udc_uevent(const struct device *dev, struct kobj_uevent_env *env) > return 0; > } > > -static struct bus_type gadget_bus_type = { > +static const struct bus_type gadget_bus_type = { > .name = "gadget", > .probe = gadget_bind_driver, > .remove = gadget_unbind_driver, > diff --git a/drivers/usb/serial/bus.c b/drivers/usb/serial/bus.c > index 9e38142acd38..3eb8dc3a1a8f 100644 > --- a/drivers/usb/serial/bus.c > +++ b/drivers/usb/serial/bus.c > @@ -144,7 +144,7 @@ static void free_dynids(struct usb_serial_driver *drv) > spin_unlock(&drv->dynids.lock); > } > > -struct bus_type usb_serial_bus_type = { > +const struct bus_type usb_serial_bus_type = { > .name = "usb-serial", > .match = usb_serial_device_match, > .probe = usb_serial_device_probe, > diff --git a/drivers/usb/typec/bus.c b/drivers/usb/typec/bus.c > index 098f0efaa58d..fe5b9a2e61f5 100644 > --- a/drivers/usb/typec/bus.c > +++ b/drivers/usb/typec/bus.c > @@ -431,7 +431,7 @@ static void typec_remove(struct device *dev) > adev->ops = NULL; > } > > -struct bus_type typec_bus = { > +const struct bus_type typec_bus = { > .name = "typec", > .dev_groups = typec_groups, > .match = typec_match, > diff --git a/drivers/usb/typec/bus.h b/drivers/usb/typec/bus.h > index c89168857417..643b8c81786d 100644 > --- a/drivers/usb/typec/bus.h > +++ b/drivers/usb/typec/bus.h > @@ -28,7 +28,7 @@ struct altmode { > > #define to_altmode(d) container_of(d, struct altmode, adev) > > -extern struct bus_type typec_bus; > +extern const struct bus_type typec_bus; > extern const struct device_type typec_altmode_dev_type; > > #define is_typec_altmode(_dev_) (_dev_->type == &typec_altmode_dev_type) > diff --git a/include/linux/usb/serial.h b/include/linux/usb/serial.h > index f7bfedb740f5..7eeb5f9c4f0d 100644 > --- a/include/linux/usb/serial.h > +++ b/include/linux/usb/serial.h > @@ -378,7 +378,7 @@ void usb_serial_handle_dcd_change(struct usb_serial_port *usb_port, > int usb_serial_bus_register(struct usb_serial_driver *device); > void usb_serial_bus_deregister(struct usb_serial_driver *device); > > -extern struct bus_type usb_serial_bus_type; > +extern const struct bus_type usb_serial_bus_type; > extern struct tty_driver *usb_serial_tty_driver; > > static inline void usb_serial_debug_data(struct device *dev, > -- > 2.39.2
diff --git a/drivers/usb/common/ulpi.c b/drivers/usb/common/ulpi.c index a98b2108376a..8305a5dfb910 100644 --- a/drivers/usb/common/ulpi.c +++ b/drivers/usb/common/ulpi.c @@ -90,7 +90,7 @@ static void ulpi_remove(struct device *dev) drv->remove(to_ulpi_dev(dev)); } -static struct bus_type ulpi_bus = { +static const struct bus_type ulpi_bus = { .name = "ulpi", .match = ulpi_match, .uevent = ulpi_uevent, diff --git a/drivers/usb/core/driver.c b/drivers/usb/core/driver.c index a0e076c6f3a4..f58a0299fb3b 100644 --- a/drivers/usb/core/driver.c +++ b/drivers/usb/core/driver.c @@ -2025,7 +2025,7 @@ int usb_disable_usb2_hardware_lpm(struct usb_device *udev) #endif /* CONFIG_PM */ -struct bus_type usb_bus_type = { +const struct bus_type usb_bus_type = { .name = "usb", .match = usb_device_match, .uevent = usb_uevent, diff --git a/drivers/usb/core/usb.h b/drivers/usb/core/usb.h index 0eac7d4285d1..cd434af259c3 100644 --- a/drivers/usb/core/usb.h +++ b/drivers/usb/core/usb.h @@ -140,7 +140,7 @@ static inline int usb_disable_usb2_hardware_lpm(struct usb_device *udev) #endif -extern struct bus_type usb_bus_type; +extern const struct bus_type usb_bus_type; extern struct mutex usb_port_peer_mutex; extern struct device_type usb_device_type; extern struct device_type usb_if_device_type; diff --git a/drivers/usb/gadget/udc/core.c b/drivers/usb/gadget/udc/core.c index 23b0629a8774..61a9c231deb9 100644 --- a/drivers/usb/gadget/udc/core.c +++ b/drivers/usb/gadget/udc/core.c @@ -26,7 +26,7 @@ static DEFINE_IDA(gadget_id_numbers); -static struct bus_type gadget_bus_type; +static const struct bus_type gadget_bus_type; /** * struct usb_udc - describes one usb device controller @@ -1747,7 +1747,7 @@ static int usb_udc_uevent(const struct device *dev, struct kobj_uevent_env *env) return 0; } -static struct bus_type gadget_bus_type = { +static const struct bus_type gadget_bus_type = { .name = "gadget", .probe = gadget_bind_driver, .remove = gadget_unbind_driver, diff --git a/drivers/usb/serial/bus.c b/drivers/usb/serial/bus.c index 9e38142acd38..3eb8dc3a1a8f 100644 --- a/drivers/usb/serial/bus.c +++ b/drivers/usb/serial/bus.c @@ -144,7 +144,7 @@ static void free_dynids(struct usb_serial_driver *drv) spin_unlock(&drv->dynids.lock); } -struct bus_type usb_serial_bus_type = { +const struct bus_type usb_serial_bus_type = { .name = "usb-serial", .match = usb_serial_device_match, .probe = usb_serial_device_probe, diff --git a/drivers/usb/typec/bus.c b/drivers/usb/typec/bus.c index 098f0efaa58d..fe5b9a2e61f5 100644 --- a/drivers/usb/typec/bus.c +++ b/drivers/usb/typec/bus.c @@ -431,7 +431,7 @@ static void typec_remove(struct device *dev) adev->ops = NULL; } -struct bus_type typec_bus = { +const struct bus_type typec_bus = { .name = "typec", .dev_groups = typec_groups, .match = typec_match, diff --git a/drivers/usb/typec/bus.h b/drivers/usb/typec/bus.h index c89168857417..643b8c81786d 100644 --- a/drivers/usb/typec/bus.h +++ b/drivers/usb/typec/bus.h @@ -28,7 +28,7 @@ struct altmode { #define to_altmode(d) container_of(d, struct altmode, adev) -extern struct bus_type typec_bus; +extern const struct bus_type typec_bus; extern const struct device_type typec_altmode_dev_type; #define is_typec_altmode(_dev_) (_dev_->type == &typec_altmode_dev_type) diff --git a/include/linux/usb/serial.h b/include/linux/usb/serial.h index f7bfedb740f5..7eeb5f9c4f0d 100644 --- a/include/linux/usb/serial.h +++ b/include/linux/usb/serial.h @@ -378,7 +378,7 @@ void usb_serial_handle_dcd_change(struct usb_serial_port *usb_port, int usb_serial_bus_register(struct usb_serial_driver *device); void usb_serial_bus_deregister(struct usb_serial_driver *device); -extern struct bus_type usb_serial_bus_type; +extern const struct bus_type usb_serial_bus_type; extern struct tty_driver *usb_serial_tty_driver; static inline void usb_serial_debug_data(struct device *dev,
Now that the driver core can properly handle constant struct bus_type, move all of the USB subsystem struct bus_type structures as const, placing them into read-only memory which can not be modified at runtime. Cc: Heikki Krogerus <heikki.krogerus@linux.intel.com> Cc: Johan Hovold <johan@kernel.org> Cc: Evan Green <evgreen@chromium.org> Cc: Alan Stern <stern@rowland.harvard.edu> Cc: linux-usb@vger.kernel.org Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> --- drivers/usb/common/ulpi.c | 2 +- drivers/usb/core/driver.c | 2 +- drivers/usb/core/usb.h | 2 +- drivers/usb/gadget/udc/core.c | 4 ++-- drivers/usb/serial/bus.c | 2 +- drivers/usb/typec/bus.c | 2 +- drivers/usb/typec/bus.h | 2 +- include/linux/usb/serial.h | 2 +- 8 files changed, 9 insertions(+), 9 deletions(-)