scsi: core: Store owner from modules with scsi_register_driver()
authorKrzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
Thu, 28 Mar 2024 20:45:45 +0000 (21:45 +0100)
committerMartin K. Petersen <martin.petersen@oracle.com>
Sat, 6 Apr 2024 00:58:25 +0000 (20:58 -0400)
Modules registering driver with scsi_driver_register() might forget to set
.owner field.  The field is used by some of other kernel parts for
reference counting (try_module_get()), so it is expected that drivers will
set it.

Solve the problem by moving this task away from the drivers to the core
scsi code, just like we did for platform_driver in commit 9447057eaff8
("platform_device: use a macro instead of platform_driver_register").

Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
Link: https://lore.kernel.org/r/20240328-b4-module-owner-scsi-v1-1-c86cb4f6e91c@linaro.org
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
drivers/scsi/scsi_sysfs.c
include/scsi/scsi_driver.h

index 775df00021e4d5591044d8e3272bb435a11cfa6a..b5aae4e8ae33f7316007dcde580d80db792bba58 100644 (file)
@@ -1609,13 +1609,14 @@ restart:
 }
 EXPORT_SYMBOL(scsi_remove_target);
 
-int scsi_register_driver(struct device_driver *drv)
+int __scsi_register_driver(struct device_driver *drv, struct module *owner)
 {
        drv->bus = &scsi_bus_type;
+       drv->owner = owner;
 
        return driver_register(drv);
 }
-EXPORT_SYMBOL(scsi_register_driver);
+EXPORT_SYMBOL(__scsi_register_driver);
 
 int scsi_register_interface(struct class_interface *intf)
 {
index 4ce1988b2ba01c6a92a09f998346ea4c0ea29b19..5c6724322112ab3f2124ba9b396561e6d6ce5e59 100644 (file)
@@ -22,7 +22,9 @@ struct scsi_driver {
 #define to_scsi_driver(drv) \
        container_of((drv), struct scsi_driver, gendrv)
 
-extern int scsi_register_driver(struct device_driver *);
+#define scsi_register_driver(drv) \
+       __scsi_register_driver(drv, THIS_MODULE)
+int __scsi_register_driver(struct device_driver *, struct module *);
 #define scsi_unregister_driver(drv) \
        driver_unregister(drv);