| From 07d5b7e267b5c57be2a75f62b3ac1a85a709dc8e Mon Sep 17 00:00:00 2001 |
| From: Sasha Levin <sashal@kernel.org> |
| Date: Sun, 25 Aug 2024 20:05:23 +0200 |
| Subject: soc: versatile: realview: fix memory leak during device remove |
| |
| From: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org> |
| |
| [ Upstream commit 1c4f26a41f9d052f334f6ae629e01f598ed93508 ] |
| |
| If device is unbound, the memory allocated for soc_dev_attr should be |
| freed to prevent leaks. |
| |
| Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org> |
| Link: https://lore.kernel.org/20240825-soc-dev-fixes-v1-2-ff4b35abed83@linaro.org |
| Signed-off-by: Linus Walleij <linus.walleij@linaro.org> |
| Stable-dep-of: c774f2564c00 ("soc: versatile: realview: fix soc_dev leak during device remove") |
| Signed-off-by: Sasha Levin <sashal@kernel.org> |
| --- |
| drivers/soc/versatile/soc-realview.c | 7 +++---- |
| 1 file changed, 3 insertions(+), 4 deletions(-) |
| |
| diff --git a/drivers/soc/versatile/soc-realview.c b/drivers/soc/versatile/soc-realview.c |
| index c6876d232d8fd..d304ee69287af 100644 |
| --- a/drivers/soc/versatile/soc-realview.c |
| +++ b/drivers/soc/versatile/soc-realview.c |
| @@ -93,7 +93,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; |
| |
| @@ -106,10 +106,9 @@ static int realview_soc_probe(struct platform_device *pdev) |
| soc_dev_attr->family = "Versatile"; |
| soc_dev_attr->custom_attr_group = realview_groups[0]; |
| 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) |
| -- |
| 2.43.0 |
| |
