Commit 36965bd8 authored by Kunwu Chan's avatar Kunwu Chan Committed by Cheng Yu
Browse files

pmdomain: ti: Add a null pointer check to the omap_prm_domain_init 

mainline inclusion
from mainline-v6.9-rc1
commit 5d7f58ee08434a33340f75ac7ac5071eea9673b3
category: bugfix
bugzilla: https://gitee.com/src-openeuler/kernel/issues/I9QGK5
CVE: CVE-2024-35943

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=5d7f58ee08434a33340f75ac7ac5071eea9673b3



--------------------------------

devm_kasprintf() returns a pointer to dynamically allocated memory
which can be NULL upon failure. Ensure the allocation was successful
by checking the pointer validity.

Signed-off-by: default avatarKunwu Chan <chentao@kylinos.cn>
Link: https://lore.kernel.org/r/20240118054257.200814-1-chentao@kylinos.cn


Signed-off-by: default avatarUlf Hansson <ulf.hansson@linaro.org>
Conflicts:
        drivers/soc/ti/omap_prm.c
        drivers/pmdomain/ti/omap_prm.c
[This is a conflict caused by commit e2ad626f("pmdomain: Rename the
genpd subsystem to pmdomain") which is not merged.]
Signed-off-by: default avatarCheng Yu <serein.chengyu@huawei.com>
parent 414ed346

drivers/soc/ti/omap_prm.c

+2 −0
Original line number Diff line number Diff line
@@ -381,6 +381,8 @@ static int omap_prm_domain_init(struct device *dev, struct omap_prm *prm) 
	data = prm->data;

	name = devm_kasprintf(dev, GFP_KERNEL, "prm_%s",

			      data->name);

	if (!name)

		return -ENOMEM;



	prmd->dev = dev;

	prmd->prm = prm;