Commit fd4420ab authored by Alexey Khoroshilov's avatar Alexey Khoroshilov Committed by Jiri Slaby

EDAC: Properly unwind on failure path in edac_init()

commit c6b97bcf upstream.

edac_init() does not deallocate already allocated resources on failure
path.

Found by Linux Driver Verification project (linuxtesting.org).

 [ Boris: The unwind path functions have __exit annotation but are being
   used in an __init function, leading to section mismatches. Drop the
   section annotation and make them normal functions. ]
Signed-off-by: default avatarAlexey Khoroshilov <khoroshilov@ispras.ru>
Link: http://lkml.kernel.org/r/1423203162-26368-1-git-send-email-khoroshilov@ispras.ruSigned-off-by: default avatarBorislav Petkov <bp@suse.de>
Signed-off-by: default avatarJiri Slaby <jslaby@suse.cz>
parent 5d557c9c
...@@ -911,7 +911,7 @@ int __init edac_debugfs_init(void) ...@@ -911,7 +911,7 @@ int __init edac_debugfs_init(void)
return 0; return 0;
} }
void __exit edac_debugfs_exit(void) void edac_debugfs_exit(void)
{ {
debugfs_remove(edac_debugfs); debugfs_remove(edac_debugfs);
} }
...@@ -1165,7 +1165,7 @@ int __init edac_mc_sysfs_init(void) ...@@ -1165,7 +1165,7 @@ int __init edac_mc_sysfs_init(void)
return err; return err;
} }
void __exit edac_mc_sysfs_exit(void) void edac_mc_sysfs_exit(void)
{ {
device_unregister(mci_pdev); device_unregister(mci_pdev);
edac_put_sysfs_subsys(); edac_put_sysfs_subsys();
......
...@@ -112,20 +112,23 @@ static int __init edac_init(void) ...@@ -112,20 +112,23 @@ static int __init edac_init(void)
err = edac_mc_sysfs_init(); err = edac_mc_sysfs_init();
if (err) if (err)
goto error; goto err_sysfs;
edac_debugfs_init(); edac_debugfs_init();
/* Setup/Initialize the workq for this core */
err = edac_workqueue_setup(); err = edac_workqueue_setup();
if (err) { if (err) {
edac_printk(KERN_ERR, EDAC_MC, "init WorkQueue failure\n"); edac_printk(KERN_ERR, EDAC_MC, "Failure initializing workqueue\n");
goto error; goto err_wq;
} }
return 0; return 0;
error: err_wq:
edac_debugfs_exit();
edac_mc_sysfs_exit();
err_sysfs:
return err; return err;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment