Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c6b97bcf authored by Alexey Khoroshilov's avatar Alexey Khoroshilov Committed by Borislav Petkov
Browse files

EDAC: Properly unwind on failure path in edac_init() 



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.ru


Signed-off-by: default avatarBorislav Petkov <bp@suse.de>
parent fc7cc6b7

drivers/edac/edac_mc_sysfs.c

+2 −2
Original line number Diff line number Diff line
@@ -914,7 +914,7 @@ int __init edac_debugfs_init(void) 
	return 0;

}



void __exit edac_debugfs_exit(void)

void edac_debugfs_exit(void)

{

	debugfs_remove(edac_debugfs);

}
@@ -1155,7 +1155,7 @@ int __init edac_mc_sysfs_init(void) 
	return err;

}



void __exit edac_mc_sysfs_exit(void)

void edac_mc_sysfs_exit(void)

{

	device_unregister(mci_pdev);

	edac_put_sysfs_subsys();

drivers/edac/edac_module.c

+8 −5
Original line number Diff line number Diff line
@@ -112,20 +112,23 @@ static int __init edac_init(void) 


	err = edac_mc_sysfs_init();

	if (err)

		goto error;

		goto err_sysfs;



	edac_debugfs_init();



	/* Setup/Initialize the workq for this core */

	err = edac_workqueue_setup();

	if (err) {

		edac_printk(KERN_ERR, EDAC_MC, "init WorkQueue failure\n");

		goto error;

		edac_printk(KERN_ERR, EDAC_MC, "Failure initializing workqueue\n");

		goto err_wq;

	}



	return 0;



error:

err_wq:

	edac_debugfs_exit();

	edac_mc_sysfs_exit();



err_sysfs:

	return err;

}