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

!5889 [sync] PR-5832: CVE-2023-52467 

Merge Pull Request from: @openeuler-sync-bot 
 

Origin pull request: 
https://gitee.com/openeuler/kernel/pulls/5832 
 
PR sync from: Chen Ridong <chenridong@huawei.com>
https://mailweb.openeuler.org/hyperkitty/list/kernel@openeuler.org/message/UITGCIO5IAKMSP3ALGP7S6Z7WLSBGDY4/ 
*** BLURB HERE ***

Kunwu Chan (1):
  mfd: syscon: Fix null pointer dereference in of_syscon_register()


-- 
2.34.1
 
https://gitee.com/src-openeuler/kernel/issues/I93L7E 
 
Link:https://gitee.com/openeuler/kernel/pulls/5889

 

Reviewed-by: default avatarJialin Zhang <zhangjialin11@huawei.com>
Signed-off-by: default avatarJialin Zhang <zhangjialin11@huawei.com>
parents d905c2e5 6af94677

drivers/mfd/syscon.c

+4 −0
Original line number Diff line number Diff line
@@ -103,6 +103,10 @@ static struct syscon *of_syscon_register(struct device_node *np, bool check_clk) 


	syscon_config.name = kasprintf(GFP_KERNEL, "%pOFn@%llx", np,

				       (u64)res.start);

	if (!syscon_config.name) {

		ret = -ENOMEM;

		goto err_regmap;

	}

	syscon_config.reg_stride = reg_io_width;

	syscon_config.val_bits = reg_io_width * 8;

	syscon_config.max_register = resource_size(&res) - reg_io_width;