Hi,
On 29/11/23 12:00 am, Harshit Mogalapalli wrote:
In edac_device_register_sysfs_main_kobj(), when dev_root is NULL, kobject_init_and_add() is not called.
if (err) { // err = -ENODEV edac_dbg(1, "Failed to register '.../edac/%s'\n", edac_dev->name); goto err_kobj_reg; // This calls kobj_put() }
This will cause a runtime warning in kobject_put() if the above happens. Warning: "kobject: '%s' (%p): is not initialized, yet kobject_put() is being called."
Fix the error handling to avoid the above possible situation.
Cc: stable@vger.kernel.org Fixes: cb4a0bec0bb9 ("EDAC/sysfs: move to use bus_get_dev_root()") Signed-off-by: Harshit Mogalapalli harshit.m.mogalapalli@oracle.com
Ping on this two patch series:
Lore url: https://lore.kernel.org/all/20231128183037.3395755-1-harshit.m.mogalapalli@o...
Thanks, Harshit
This is based on static analysis and only compile tested. v1->v2: Resend as a patchset as they are two similar bugs.
drivers/edac/edac_device_sysfs.c | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-)
diff --git a/drivers/edac/edac_device_sysfs.c b/drivers/edac/edac_device_sysfs.c index 010c26be5846..4cac14cbdb60 100644 --- a/drivers/edac/edac_device_sysfs.c +++ b/drivers/edac/edac_device_sysfs.c @@ -253,11 +253,13 @@ int edac_device_register_sysfs_main_kobj(struct edac_device_ctl_info *edac_dev) /* register */ dev_root = bus_get_dev_root(edac_subsys);
- if (dev_root) {
err = kobject_init_and_add(&edac_dev->kobj, &ktype_device_ctrl,&dev_root->kobj, "%s", edac_dev->name);put_device(dev_root);- }
- if (!dev_root)
goto module_put;- err = kobject_init_and_add(&edac_dev->kobj, &ktype_device_ctrl,
&dev_root->kobj, "%s", edac_dev->name);- put_device(dev_root);
- if (err) { edac_dbg(1, "Failed to register '.../edac/%s'\n", edac_dev->name);
@@ -276,8 +278,8 @@ int edac_device_register_sysfs_main_kobj(struct edac_device_ctl_info *edac_dev) /* Error exit stack */ err_kobj_reg: kobject_put(&edac_dev->kobj); +module_put: module_put(edac_dev->owner);
- err_out: return err; }