Commit bbf6d1bc authored Nov 17, 2022 by Zheng Yongjun Committed by Greg Kroah-Hartman Dec 08, 2022

ARM: mxs: fix memory leak in mxs_machine_init()



[ Upstream commit f31e3c204d1844b8680a442a48868af5ac3d5481 ]

If of_property_read_string() failed, 'soc_dev_attr' should be
freed before return. Otherwise there is a memory leak.

Fixes: 2046338d ("ARM: mxs: Use soc bus infrastructure")
Signed-off-by: Zheng Yongjun <zhengyongjun3@huawei.com>
Reviewed-by: Marco Felsch <m.felsch@pengutronix.de>
Signed-off-by: Shawn Guo <shawnguo@kernel.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>

parent 3afa8644

arch/arm/mach-mxs/mach-mxs.c

+3 −1

Original line number	Diff line number	Diff line
		@@ -387,8 +387,10 @@ static void __init mxs_machine_init(void)

		root = of_find_node_by_path("/");
		ret = of_property_read_string(root, "model", &soc_dev_attr->machine);
		if (ret)
		if (ret) {
		kfree(soc_dev_attr);
		return;
		}

		soc_dev_attr->family = "Freescale MXS Family";
		soc_dev_attr->soc_id = mxs_get_soc_id();