Skip to contentSkip to conversation

media: platform: exynos4-is: Fix error handling in fimc_md_init()

PATCH New Yuan Can 1 participant 1 message Nov 11, 2022

Subsystems (3)
lore
Share & tools
lore

Yuan Can

author
#0 lore raw

PATCH 1/1 media: platform: exynos4-is: Fix error handling in fimc_md_init()

A problem about modprobe s5p_fimc failed is triggered with the following log given:

 [  272.075275] Error: Driver 'exynos4-fimc' is already registered, aborting...
 modprobe: ERROR: could not insert 's5p_fimc': Device or resource busy

The reason is that fimc_md_init() returns platform_driver_register() directly without checking its return value, if platform_driver_register() failed, it returns without unregister fimc_driver, resulting the s5p_fimc can never be installed later.
A simple call graph is shown as below:

fimc_md_init()
fimc_register_driver() # register fimc_driver
platform_driver_register()
platform_driver_register()
driver_register()
bus_add_driver()
dev = kzalloc(...) # OOM happened

   # return without unregister fimc_driver

Fix by unregister fimc_driver when platform_driver_register() returns error.

Fixes d3953223b090 ("[media] s5p-fimc: Add the media device driver")
---
 drivers/media/platform/samsung/exynos4-is/fimc-core.c | 2 +-
 drivers/media/platform/samsung/exynos4-is/media-dev.c | 6 +++++-
 2 files changed, 6 insertions(+), 2 deletions(-)
drivers/media/platform/samsung/exynos4-is/fimc-core.c +1 -1
index 91cc8d58a663..1791100b6935 100644
@@ -1173,7 +1173,7 @@ int __init fimc_register_driver(void)
 	return platform_driver_register(&fimc_driver);
 }
 
-void __exit fimc_unregister_driver(void)
+void fimc_unregister_driver(void)
 {
 	platform_driver_unregister(&fimc_driver);
 }
drivers/media/platform/samsung/exynos4-is/media-dev.c +5 -1
index a0367f8cb9ec..0ccd877338aa 100644
@@ -1586,7 +1586,11 @@ static int __init fimc_md_init(void)
 	if (ret)
 		return ret;
 
-	return platform_driver_register(&fimc_md_driver);
+	ret = platform_driver_register(&fimc_md_driver);
+	if (ret)
+		fimc_unregister_driver();
+
+	return ret;
 }
 
 static void __exit fimc_md_exit(void)
Signature · 1 line
2.17.1