module: don't ignore sysfs_create_link() failures
PATCH v3 1/1 module: don't ignore sysfs_create_link() failures
From: Arnd Bergmann <[email protected]>
The sysfs_create_link() return code is marked as __must_check, but the module_add_driver() function tries hard to not care, by assigning the return code to a variable. When building with 'make W=1', gcc still warns because this variable is only assigned but not used:
drivers/base/module.c: In function 'module_add_driver':drivers/base/module.c:36:6: warning: variable 'no_warn' set but not used [-Wunused-but-set-variable]
Rework the code to properly unwind and return the error code to the caller. My reading of the original code was that it tries to not fail when the links already exist, so keep ignoring -EEXIST errors.
See-also: 4a7fb6363f2d ("add __must_check to device management code")
---
v3: make error handling stricter, add unwinding,
fix build fail with CONFIG_MODULES=n
v2: rework to actually handle the error. I have not tested the
error handling beyond build testing, so please review carefully.
--- drivers/base/base.h | 9 ++++++--- drivers/base/bus.c | 9 ++++++++- drivers/base/module.c | 42 +++++++++++++++++++++++++++++++----------- 3 files changed, 45 insertions(+), 15 deletions(-)
drivers/base/base.h +6 -3
@@ -192,11 +192,14 @@ extern struct kset *devices_kset;void devices_kset_move_last (struct device *dev);#if defined(CONFIG_MODULES ) && defined(CONFIG_SYSFS ) -void module_add_driver (struct module *mod,struct device_driver *drv); +int module_add_driver (struct module *mod,struct device_driver *drv);void module_remove_driver (struct device_driver *drv);#else -static inline void module_add_driver (struct module *mod, -struct device_driver *drv) { } +static inline int module_add_driver (struct module *mod, +struct device_driver *drv) +{ +return 0 ; +}static inline void module_remove_driver (struct device_driver *drv) { }#endif
drivers/base/bus.c +8 -1
@@ -674,7 +674,12 @@ int bus_add_driver(struct device_driver *drv)if (error) goto out_del_list; } -module_add_driver (drv->owner, drv); + error =module_add_driver (drv->owner, drv); +if (error) { +printk (KERN_ERR "%s: failed to create module links for %s\n" , + __func__, drv->name); + goto out_detach; + } error =driver_create_file (drv, &driver_attr_uevent);if (error) {
@@ -699,6 +704,8 @@ int bus_add_driver(struct device_driver *drv)return 0 ; +out_detach: +driver_detach (drv); out_del_list:klist_del (&priv->knode_bus); out_unregister:
drivers/base/module.c +31 -11
62 lines not on this page · raw message
Signature · 1 line
2.39.2
Quoted 15 lines · Arnd Bergmann
From: Arnd Bergmann <[email protected]>
The
sysfs_create_link()return code is marked as__must_check, but themodule_add_driver()function tries hard to not care, by assigning the return code to a variable. When building with 'make W=1', gcc still warns because this variable is only assigned but not used:
drivers/base/module.c: In function 'module_add_driver':drivers/base/module.c:36:6: warning: variable 'no_warn' set but not used [-Wunused-but-set-variable]Rework the code to properly unwind and return the error code to the caller. My reading of the original code was that it tries to not fail when the links already exist, so keep ignoring
-EEXISTerrors.
Quoted 4 lines
Cc Luis Chamberlain <[email protected]>Cc Greg Kroah-Hartman <[email protected]>Cc "Rafael J. Wysocki" <[email protected]>
Wondering if you can move these to be after --- to avoid polluting commit message. This will have the same effect and be archived on lore. But on pros side it will unload the commit message(s) from unneeded noise.
...
drivers/base/bus.c int bus_add_driver(struct device_driver *drv) · line 680
Quoted 4 lines
drivers/base/bus.c +4
-0+ error =module_add_driver (drv->owner, drv); +if (error) { +printk (KERN_ERR "%s: failed to create module links for %s\n" , + __func__, drv->name);
What's wrong with pr_err()? Even if it's not a style used, in a new pieces of code this can be improved beforehand. So, we will reduce a technical debt, and not adding to it.
Quoted 2 lines
drivers/base/bus.c +2
-0+ goto out_detach; + }
...
drivers/base/module.c static void module_create_drivers_dir(struct module_kobject *mk) · line 36
Quoted 5 lines
drivers/base/module.c +2
-1+int module_add_driver (struct module *mod,struct device_driver *drv) {char *driver_name; -int no_warn; +int ret;
I would move it...
Quoted 1 line
struct
module_kobject*mk = NULL;
...to be here.
Signature · 2 lines
With Best Regards, Andy Shevchenko
Quoted 16 lines · Andy Shevchenko
Quoted 14 lines · Arnd Bergmann
From: Arnd Bergmann <[email protected]>
The
sysfs_create_link()return code is marked as__must_check, but themodule_add_driver()function tries hard to not care, by assigning the return code to a variable. When building with 'make W=1', gcc still warns because this variable is only assigned but not used:
drivers/base/module.c: In function 'module_add_driver':drivers/base/module.c:36:6: warning: variable 'no_warn' set but not used [-Wunused-but-set-variable]Rework the code to properly unwind and return the error code to the caller. My reading of the original code was that it tries to not fail when the links already exist, so keep ignoring
-EEXISTerrors.
Quoted 8 lines
Quoted 4 lines
Cc Luis Chamberlain <[email protected]>Cc Greg Kroah-Hartman <[email protected]>Cc "Rafael J. Wysocki" <[email protected]>Wondering if you can move these to be after --- to avoid polluting commit message. This will have the same effect and be archived on lore. But on pros side it will unload the commit message(s) from unneeded noise.
Done
Quoted 9 lines
drivers/base/bus.c int bus_add_driver(struct device_driver *drv) · line 680
Quoted 5 lines
drivers/base/bus.c +4
-0+ error =module_add_driver (drv->owner, drv); +if (error) { +printk (KERN_ERR "%s: failed to create module links for %s\n" , + __func__, drv->name);What's wrong with
pr_err()? Even if it's not a style used, in a new pieces of code this can be improved beforehand. So, we will reduce a technical debt, and not adding to it.
I think that would be more confusing, and would rather keep the style consistent. There is no practical difference here.
Quoted 11 lines
drivers/base/module.c static void module_create_drivers_dir(struct module_kobject *mk) · line 36
Quoted 5 lines
drivers/base/module.c +2
-1+int module_add_driver (struct module *mod,struct device_driver *drv) {char *driver_name; -int no_warn; +int ret;I would move it...
Quoted 1 line
struct
module_kobject*mk = NULL;...to be here.
Done
Arnd
Quoted 27 lines · Arnd Bergmann
From: Arnd Bergmann <[email protected]>
The
sysfs_create_link()return code is marked as__must_check, but themodule_add_driver()function tries hard to not care, by assigning the return code to a variable. When building with 'make W=1', gcc still warns because this variable is only assigned but not used:
drivers/base/module.c: In function 'module_add_driver':drivers/base/module.c:36:6: warning: variable 'no_warn' set but not used [-Wunused-but-set-variable]Rework the code to properly unwind and return the error code to the caller. My reading of the original code was that it tries to not fail when the links already exist, so keep ignoring
-EEXISTerrors.Cc Luis Chamberlain <[email protected]>Cc Greg Kroah-Hartman <[email protected]>Cc "Rafael J. Wysocki" <[email protected]>Fixes e17e0f51aeea ("Driver core: show drivers in /sys/module/")See-also:
4a7fb6363f2d("add__must_checkto device management code")Signed-off-by Arnd Bergmann <[email protected]>---
v3: make error handling stricter, add unwinding,
fix build fail withCONFIG_MODULES=n
v2: rework to actually handle the error. I have not tested the
error handling beyond build testing, so please review carefully.
Quoted 5 lines
--- drivers/base/base.h | 9 ++++++--- drivers/base/bus.c | 9 ++++++++- drivers/base/module.c | 42 +++++++++++++++++++++++++++++++----------- 3 files changed, 45 insertions(+), 15 deletions(-)