[tip: efi/urgent] efi: add missed destroy_workqueue when efisubsys_init fails
From: tip-bot2 for Li Heng
Date: Sat Aug 22 2020 - 09:39:30 EST
The following commit has been merged into the efi/urgent branch of tip:
Commit-ID: 98086df8b70c06234a8f4290c46064e44dafa0ed
Gitweb: https://git.kernel.org/tip/98086df8b70c06234a8f4290c46064e44dafa0ed
Author: Li Heng <liheng40@xxxxxxxxxx>
AuthorDate: Mon, 20 Jul 2020 15:22:18 +08:00
Committer: Ard Biesheuvel <ardb@xxxxxxxxxx>
CommitterDate: Thu, 20 Aug 2020 11:18:45 +02:00
efi: add missed destroy_workqueue when efisubsys_init fails
destroy_workqueue() should be called to destroy efi_rts_wq
when efisubsys_init() init resources fails.
Cc: <stable@xxxxxxxxxxxxxxx>
Reported-by: Hulk Robot <hulkci@xxxxxxxxxx>
Signed-off-by: Li Heng <liheng40@xxxxxxxxxx>
Link: https://lore.kernel.org/r/1595229738-10087-1-git-send-email-liheng40@xxxxxxxxxx
Signed-off-by: Ard Biesheuvel <ardb@xxxxxxxxxx>
---
drivers/firmware/efi/efi.c | 2 ++
1 file changed, 2 insertions(+)
diff --git a/drivers/firmware/efi/efi.c b/drivers/firmware/efi/efi.c
index fdd1db0..3aa07c3 100644
--- a/drivers/firmware/efi/efi.c
+++ b/drivers/firmware/efi/efi.c
@@ -381,6 +381,7 @@ static int __init efisubsys_init(void)
efi_kobj = kobject_create_and_add("efi", firmware_kobj);
if (!efi_kobj) {
pr_err("efi: Firmware registration failed.\n");
+ destroy_workqueue(efi_rts_wq);
return -ENOMEM;
}
@@ -424,6 +425,7 @@ err_unregister:
generic_ops_unregister();
err_put:
kobject_put(efi_kobj);
+ destroy_workqueue(efi_rts_wq);
return error;
}