Unverified Commit 9b487350 authored by openeuler-ci-bot's avatar openeuler-ci-bot Committed by Gitee
Browse files

!11318 efi: fix NULL-deref in init error path 

Merge Pull Request from: @ci-robot 
 
PR sync from: Gu Bowen <gubowen5@huawei.com>
https://mailweb.openeuler.org/hyperkitty/list/kernel@openeuler.org/message/H5GFN6T6HRLUQCJQNTIXDHYH2KBINJP3/ 
 
https://gitee.com/src-openeuler/kernel/issues/IALIAT 
 
Link:https://gitee.com/openeuler/kernel/pulls/11318

 

Reviewed-by: default avatarYang Yingliang <yangyingliang@huawei.com>
Signed-off-by: default avatarYang Yingliang <yangyingliang@huawei.com>
parents 78ea7964 fa1d3557

drivers/firmware/efi/efi.c

+6 −3
Original line number Diff line number Diff line
@@ -386,8 +386,8 @@ 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;

		error = -ENOMEM;

		goto err_destroy_wq;

	}



	if (efi_rt_services_supported(EFI_RT_SUPPORTED_GET_VARIABLE |
@@ -430,7 +430,10 @@ static int __init efisubsys_init(void) 
		generic_ops_unregister();

err_put:

	kobject_put(efi_kobj);

err_destroy_wq:

	if (efi_rts_wq)

		destroy_workqueue(efi_rts_wq);



	return error;

}