Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0f167c14 authored by Krzysztof Kozlowski's avatar Krzysztof Kozlowski Committed by Greg Kroah-Hartman
Browse files

soc: versatile: realview: fix memory leak during device remove 



[ Upstream commit 1c4f26a41f9d052f334f6ae629e01f598ed93508 ]

If device is unbound, the memory allocated for soc_dev_attr should be
freed to prevent leaks.

Signed-off-by: default avatarKrzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
Link: https://lore.kernel.org/20240825-soc-dev-fixes-v1-2-ff4b35abed83@linaro.org


Signed-off-by: default avatarLinus Walleij <linus.walleij@linaro.org>
Stable-dep-of: c774f2564c00 ("soc: versatile: realview: fix soc_dev leak during device remove")
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent 893e8314

drivers/soc/versatile/soc-realview.c

+3 −4
Original line number Diff line number Diff line
@@ -91,7 +91,7 @@ static int realview_soc_probe(struct platform_device *pdev) 
	if (IS_ERR(syscon_regmap))

		return PTR_ERR(syscon_regmap);



	soc_dev_attr = kzalloc(sizeof(*soc_dev_attr), GFP_KERNEL);

	soc_dev_attr = devm_kzalloc(&pdev->dev, sizeof(*soc_dev_attr), GFP_KERNEL);

	if (!soc_dev_attr)

		return -ENOMEM;
@@ -103,10 +103,9 @@ static int realview_soc_probe(struct platform_device *pdev) 
	soc_dev_attr->machine = "RealView";

	soc_dev_attr->family = "Versatile";

	soc_dev = soc_device_register(soc_dev_attr);

	if (IS_ERR(soc_dev)) {

		kfree(soc_dev_attr);

	if (IS_ERR(soc_dev))

		return -ENODEV;

	}



	ret = regmap_read(syscon_regmap, REALVIEW_SYS_ID_OFFSET,

			  &realview_coreid);

	if (ret)