Unverified Commit 627f77ce authored by openeuler-ci-bot's avatar openeuler-ci-bot Committed by Gitee
Browse files

!15713 CVE-2022-49370 

Merge Pull Request from: @ci-robot 
 
PR sync from: Xia Fukun <xiafukun@huawei.com>
https://mailweb.openeuler.org/archives/list/kernel@openeuler.org/message/IWKB7GEH2HHDCMGNQZTSQDRUZT6NJ5EM/ 
Fix CVE-2022-49370.

Chen Zhongjin (1):
  firmware: dmi-sysfs: Fix null-ptr-deref in dmi_sysfs_register_handle

Miaoqian Lin (1):
  firmware: dmi-sysfs: Fix memory leak in dmi_sysfs_register_handle

 
https://gitee.com/src-openeuler/kernel/issues/IBP6BN 
 
Link:https://gitee.com/openeuler/kernel/pulls/15713

 

Reviewed-by: default avatarZucheng Zheng <zhengzucheng@huawei.com>
Reviewed-by: default avatarYuan Can <yuancan@huawei.com>
Signed-off-by: default avatarYuan Can <yuancan@huawei.com>
parents 1408cff1 08e3a3a3

drivers/firmware/dmi-sysfs.c

+5 −5
Original line number Diff line number Diff line
@@ -601,16 +601,16 @@ static void __init dmi_sysfs_register_handle(const struct dmi_header *dh, 
	*ret = kobject_init_and_add(&entry->kobj, &dmi_sysfs_entry_ktype, NULL,

				    "%d-%d", dh->type, entry->instance);



	if (*ret) {

		kfree(entry);

		return;

	}



	/* Thread on the global list for cleanup */

	spin_lock(&entry_list_lock);

	list_add_tail(&entry->list, &entry_list);

	spin_unlock(&entry_list_lock);



	if (*ret) {

		kobject_put(&entry->kobj);

		return;

	}



	/* Handle specializations by type */

	switch (dh->type) {

	case DMI_ENTRY_SYSTEM_EVENT_LOG: