pstore/ram: Fix failure-path memory leak in ramoops_init
PATCH 1/1 pstore/ram: Fix failure-path memory leak in ramoops_init
As reported by nixiaoming, with some minor clarifications:
1) memory leak in ramoops_register_dummy():
dummy_data = kzalloc(sizeof(*dummy_data), GFP_KERNEL); but no kfree() if platform_device_register_data() fails.
2) memory leak in ramoops_init():
Missing platform_device_unregister(dummy) and kfree(dummy_data) if platform_driver_register(&ramoops_driver) fails.
I've clarified the purpose of ramoops_register_dummy(), and added a common cleanup routine for all three failure paths to call.
Reported-by nixiaoming <[email protected]>
Cc Anton Vorontsov <[email protected]>
Cc Colin Cross <[email protected]>
Cc Tony Luck <[email protected]>
Cc Joel Fernandes <[email protected]>
Cc Geliang Tang <[email protected]>
Signed-off-by Kees Cook <[email protected]>
---
After my local testing I'll send this via the regular pstore tree.
--- fs/pstore/ram.c | 29 +++++++++++++++++++++++++---- 1 file changed, 25 insertions(+), 4 deletions(-)
fs/pstore/ram.c +25 -4
@@ -898,8 +898,22 @@ static struct platform_driver ramoops_driver = { }, }; -static void ramoops_register_dummy (void ) +static inline void ramoops_unregister_dummy (void ) { +platform_device_unregister (dummy); + dummy =NULL ; + +kfree (dummy_data); + dummy_data =NULL ; +} + +static void __init ramoops_register_dummy (void ) +{ +/* +* Prepare a dummy platform data structure to carry the module +* parameters. If mem_size isn't set, then there are no module +* parameters, and we can skip this. +*/ if (!mem_size)return ;
@@ -932,21 +946,28 @@ static void ramoops_register_dummy(void)if (IS_ERR (dummy)) {pr_info ("could not create platform device: %ld\n" ,PTR_ERR (dummy)); + dummy =NULL ; +ramoops_unregister_dummy (); } }static int __init ramoops_init (void ) { +int ret; +ramoops_register_dummy (); -return platform_driver_register (&ramoops_driver); + ret =platform_driver_register (&ramoops_driver); +if (ret !=0 ) +ramoops_unregister_dummy (); + +return ret; }late_initcall (ramoops_init); static void __exit ramoops_exit(void) {platform_driver_unregister (&ramoops_driver); -platform_device_unregister (dummy); -kfree (dummy_data); +ramoops_unregister_dummy (); }module_exit (ramoops_exit);
Signature · 6 lines
2.17.1 -- Kees Cook Pixel Security