firmware_class_init() leaves the firmware PM operations and reboot
notifier registered when register_sysfs_loader() fails. In addition, the
sysfs loader can leave the firmware class registered if its sysctl setup
fails.

Unwind the reboot notifier and firmware PM operations when sysfs loader
registration fails. Make register_sysfs_loader() transactional by
unregistering the firmware class if its sysctl registration fails.

Fixes: 6bb9cf3aa3ed ("firmware: provide helpers for registering the syfs loader")
Fixes: 6aad36d421d8 ("firmware_loader: move firmware sysctl to its own files")
Signed-off-by: Yuho Choi <dbgh9129@gmail.com>
---
 drivers/base/firmware_loader/main.c  | 8 +++++++-
 drivers/base/firmware_loader/sysfs.c | 7 ++++++-
 2 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/drivers/base/firmware_loader/main.c b/drivers/base/firmware_loader/main.c
index 24213a0ea831..c2f7825dfc4a 100644
--- a/drivers/base/firmware_loader/main.c
+++ b/drivers/base/firmware_loader/main.c
@@ -1727,8 +1727,14 @@ static int __init firmware_class_init(void)
 	if (ret)
 		goto out;
 
-	return register_sysfs_loader();
+	ret = register_sysfs_loader();
+	if (ret)
+		goto out_reboot;
+
+	return 0;
 
+out_reboot:
+	unregister_reboot_notifier(&fw_shutdown_nb);
 out:
 	unregister_fw_pm_ops();
 	return ret;
diff --git a/drivers/base/firmware_loader/sysfs.c b/drivers/base/firmware_loader/sysfs.c
index 29a10d2ad537..d9deb0804f55 100644
--- a/drivers/base/firmware_loader/sysfs.c
+++ b/drivers/base/firmware_loader/sysfs.c
@@ -117,7 +117,12 @@ int register_sysfs_loader(void)
 
 	if (ret != 0)
 		return ret;
-	return register_firmware_config_sysctl();
+
+	ret = register_firmware_config_sysctl();
+	if (ret)
+		class_unregister(&firmware_class);
+
+	return ret;
 }
 
 void unregister_sysfs_loader(void)
-- 
2.43.0

On Mon Aug 3, 2026 at 3:29 AM CEST, Yuho Choi wrote:
> firmware_class_init() leaves the firmware PM operations and reboot
> notifier registered when register_sysfs_loader() fails. In addition, the
> sysfs loader can leave the firmware class registered if its sysctl setup
> fails.

Those are two separate issues, so it should also be two separate patches.

On Thu, 6 Aug 2026 at 17:46, Danilo Krummrich <dakr@kernel.org> wrote:
>
> Those are two separate issues, so it should also be two separate patches.

I appreciate your time reviewing this. I'll send two separate patches.

Thanks,
Yuho