The driver iterates over its devicetree children with for_each_child_of_node() and stores for later found node pointer. This has to be put in error paths to avoid leak during re-probing.
Fixes: ab663789d697 ("pinctrl: samsung: Match pin banks with their device nodes") Cc: stable@vger.kernel.org Signed-off-by: Krzysztof Kozlowski krzysztof.kozlowski@canonical.com --- drivers/pinctrl/samsung/pinctrl-samsung.c | 30 +++++++++++++++++------ 1 file changed, 23 insertions(+), 7 deletions(-)
diff --git a/drivers/pinctrl/samsung/pinctrl-samsung.c b/drivers/pinctrl/samsung/pinctrl-samsung.c index 8941f658e7f1..b19ebc43d886 100644 --- a/drivers/pinctrl/samsung/pinctrl-samsung.c +++ b/drivers/pinctrl/samsung/pinctrl-samsung.c @@ -1002,6 +1002,16 @@ samsung_pinctrl_get_soc_data_for_of_alias(struct platform_device *pdev) return &(of_data->ctrl[id]); }
+static void samsung_banks_of_node_put(struct samsung_pinctrl_drv_data *d) +{ + struct samsung_pin_bank *bank; + unsigned int i; + + bank = d->pin_banks; + for (i = 0; i < d->nr_banks; ++i, ++bank) + of_node_put(bank->of_node); +} + /* retrieve the soc specific data */ static const struct samsung_pin_ctrl * samsung_pinctrl_get_soc_data(struct samsung_pinctrl_drv_data *d, @@ -1116,19 +1126,19 @@ static int samsung_pinctrl_probe(struct platform_device *pdev) if (ctrl->retention_data) { drvdata->retention_ctrl = ctrl->retention_data->init(drvdata, ctrl->retention_data); - if (IS_ERR(drvdata->retention_ctrl)) - return PTR_ERR(drvdata->retention_ctrl); + if (IS_ERR(drvdata->retention_ctrl)) { + ret = PTR_ERR(drvdata->retention_ctrl); + goto err_put_banks; + } }
ret = samsung_pinctrl_register(pdev, drvdata); if (ret) - return ret; + goto err_put_banks;
ret = samsung_gpiolib_register(pdev, drvdata); - if (ret) { - samsung_pinctrl_unregister(pdev, drvdata); - return ret; - } + if (ret) + goto err_unregister;
if (ctrl->eint_gpio_init) ctrl->eint_gpio_init(drvdata); @@ -1138,6 +1148,12 @@ static int samsung_pinctrl_probe(struct platform_device *pdev) platform_set_drvdata(pdev, drvdata);
return 0; + +err_unregister: + samsung_pinctrl_unregister(pdev, drvdata); +err_put_banks: + samsung_banks_of_node_put(drvdata); + return ret; }
/*
-----Original Message----- From: Krzysztof Kozlowski krzysztof.kozlowski@canonical.com Sent: Wednesday, January 12, 2022 5:14 AM To: Tomasz Figa tomasz.figa@gmail.com; Krzysztof Kozlowski krzysztof.kozlowski@canonical.com; Sylwester Nawrocki s.nawrocki@samsung.com; Linus Walleij linus.walleij@linaro.org; Rob Herring robh+dt@kernel.org; linux-arm-kernel@lists.infradead.org; linux- samsung-soc@vger.kernel.org; linux-gpio@vger.kernel.org; devicetree@vger.kernel.org; linux-kernel@vger.kernel.org Cc: Marek Szyprowski m.szyprowski@samsung.com; Sam Protsenko semen.protsenko@linaro.org; Chanho Park chanho61.park@samsung.com; Alim Akhtar alim.akhtar@gmail.com; stable@vger.kernel.org Subject: [PATCH v2 01/28] pinctrl: samsung: drop pin banks references on error paths
The driver iterates over its devicetree children with for_each_child_of_node() and stores for later found node pointer. This has to be put in error paths to avoid leak during re-probing.
Fixes: ab663789d697 ("pinctrl: samsung: Match pin banks with their device nodes") Cc: stable@vger.kernel.org Signed-off-by: Krzysztof Kozlowski krzysztof.kozlowski@canonical.com
Reviewed-by: Chanho Park chanho61.park@samsung.com
Best Regards, Chanho Park
On Tue, 11 Jan 2022 at 22:15, Krzysztof Kozlowski krzysztof.kozlowski@canonical.com wrote:
The driver iterates over its devicetree children with for_each_child_of_node() and stores for later found node pointer. This has to be put in error paths to avoid leak during re-probing.
Fixes: ab663789d697 ("pinctrl: samsung: Match pin banks with their device nodes") Cc: stable@vger.kernel.org Signed-off-by: Krzysztof Kozlowski krzysztof.kozlowski@canonical.com
Reviewed-by: Sam Protsenko semen.protsenko@linaro.org
drivers/pinctrl/samsung/pinctrl-samsung.c | 30 +++++++++++++++++------ 1 file changed, 23 insertions(+), 7 deletions(-)
diff --git a/drivers/pinctrl/samsung/pinctrl-samsung.c b/drivers/pinctrl/samsung/pinctrl-samsung.c index 8941f658e7f1..b19ebc43d886 100644 --- a/drivers/pinctrl/samsung/pinctrl-samsung.c +++ b/drivers/pinctrl/samsung/pinctrl-samsung.c @@ -1002,6 +1002,16 @@ samsung_pinctrl_get_soc_data_for_of_alias(struct platform_device *pdev) return &(of_data->ctrl[id]); }
+static void samsung_banks_of_node_put(struct samsung_pinctrl_drv_data *d) +{
struct samsung_pin_bank *bank;unsigned int i;bank = d->pin_banks;for (i = 0; i < d->nr_banks; ++i, ++bank)of_node_put(bank->of_node);+}
/* retrieve the soc specific data */ static const struct samsung_pin_ctrl * samsung_pinctrl_get_soc_data(struct samsung_pinctrl_drv_data *d, @@ -1116,19 +1126,19 @@ static int samsung_pinctrl_probe(struct platform_device *pdev) if (ctrl->retention_data) { drvdata->retention_ctrl = ctrl->retention_data->init(drvdata, ctrl->retention_data);
if (IS_ERR(drvdata->retention_ctrl))return PTR_ERR(drvdata->retention_ctrl);
if (IS_ERR(drvdata->retention_ctrl)) {ret = PTR_ERR(drvdata->retention_ctrl);goto err_put_banks;} } ret = samsung_pinctrl_register(pdev, drvdata); if (ret)
return ret;
goto err_put_banks; ret = samsung_gpiolib_register(pdev, drvdata);
if (ret) {samsung_pinctrl_unregister(pdev, drvdata);return ret;}
if (ret)goto err_unregister; if (ctrl->eint_gpio_init) ctrl->eint_gpio_init(drvdata);@@ -1138,6 +1148,12 @@ static int samsung_pinctrl_probe(struct platform_device *pdev) platform_set_drvdata(pdev, drvdata);
return 0;
+err_unregister:
samsung_pinctrl_unregister(pdev, drvdata);+err_put_banks:
samsung_banks_of_node_put(drvdata);return ret;}
/*
2.32.0
linux-stable-mirror@lists.linaro.org
-
Chanho Park -
Krzysztof Kozlowski -
Sam Protsenko