xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

soc: fsl: guts: Add a missing memory allocation failure check

Browse Source 
[ Upstream commit b9abe942cda43a1d46a0fd96efb54f1aa909f757 ]

If 'devm_kstrdup()' fails, we should return -ENOMEM.

While at it, move the 'of_node_put()' call in the error handling path and
after the 'machine' has been copied.
Better safe than sorry.

Fixes: a6fc3b6981 ("soc: fsl: add GUTS driver for QorIQ platforms")
Depends-on: fddacc7ff4dd ("soc: fsl: guts: Revert commit 3c0d64e867ed")
Suggested-by: Tyrel Datwyler <tyreld@linux.ibm.com>
Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr>
Signed-off-by: Li Yang <leoyang.li@nxp.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
Christophe JAILLET
2021-11-03 21:00:33 +01:00
committed by Greg Kroah-Hartman
parent 3afe488d5c
commit 2824f6939e
1 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
drivers/soc/fsl/guts.c
View File

@@ -160,9 +160,14 @@ static int fsl_guts_probe(struct platform_device *pdev)
root = of_find_node_by_path("/"); root = of_find_node_by_path("/");
if (of_property_read_string(root, "model", &machine)) if (of_property_read_string(root, "model", &machine))
of_property_read_string_index(root, "compatible", 0, &machine); of_property_read_string_index(root, "compatible", 0, &machine);
of_node_put(root); if (machine) {
if (machine)
soc_dev_attr.machine = devm_kstrdup(dev, machine, GFP_KERNEL); soc_dev_attr.machine = devm_kstrdup(dev, machine, GFP_KERNEL);
if (!soc_dev_attr.machine) {
of_node_put(root);
return -ENOMEM;
}
}
of_node_put(root);
svr = fsl_guts_get_svr(); svr = fsl_guts_get_svr();
soc_die = fsl_soc_die_match(svr, fsl_soc_die); soc_die = fsl_soc_die_match(svr, fsl_soc_die);