From: Krzysztof Kozlowski <krzysztof.kozlowski@canonical.com> 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 Date: Tue, 11 Jan 2022 21:13:59 +0100 [thread overview] Message-ID: <20220111201426.326777-2-krzysztof.kozlowski@canonical.com> (raw) In-Reply-To: <20220111201426.326777-1-krzysztof.kozlowski@canonical.com> 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; } /* -- 2.32.0
WARNING: multiple messages have this Message-ID (diff)
From: Krzysztof Kozlowski <krzysztof.kozlowski@canonical.com> 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 Date: Tue, 11 Jan 2022 21:13:59 +0100 [thread overview] Message-ID: <20220111201426.326777-2-krzysztof.kozlowski@canonical.com> (raw) In-Reply-To: <20220111201426.326777-1-krzysztof.kozlowski@canonical.com> 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; } /* -- 2.32.0 _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
next prev parent reply other threads:[~2022-01-11 20:15 UTC|newest] Thread overview: 104+ messages / expand[flat|nested] mbox.gz Atom feed top 2022-01-11 20:13 [PATCH v2 00/28] pinctrl: dt-bindings: samsung: convert to dtschema Krzysztof Kozlowski 2022-01-11 20:13 ` Krzysztof Kozlowski 2022-01-11 20:13 ` Krzysztof Kozlowski [this message] 2022-01-11 20:13 ` [PATCH v2 01/28] pinctrl: samsung: drop pin banks references on error paths Krzysztof Kozlowski 2022-01-12 5:28 ` Chanho Park 2022-01-12 5:28 ` Chanho Park 2022-01-14 16:38 ` Sam Protsenko 2022-01-14 16:38 ` Sam Protsenko 2022-01-11 20:14 ` [PATCH v2 02/28] pinctrl: samsung: accept GPIO bank nodes with a suffix Krzysztof Kozlowski 2022-01-11 20:14 ` Krzysztof Kozlowski 2022-01-14 17:00 ` Sam Protsenko 2022-01-14 17:00 ` Sam Protsenko 2022-01-11 20:14 ` [PATCH v2 03/28] ARM: dts: exynos: drop unused pinctrl defines in Exynos3250 Krzysztof Kozlowski 2022-01-11 20:14 ` Krzysztof Kozlowski 2022-01-11 20:14 ` [PATCH v2 04/28] ARM: dts: exynos: simplify PMIC DVS pin configuration in Odroid XU Krzysztof Kozlowski 2022-01-11 20:14 ` Krzysztof Kozlowski 2022-01-11 20:14 ` [PATCH v2 05/28] ARM: dts: exynos: override pins by label in Peach Pit Krzysztof Kozlowski 2022-01-11 20:14 ` Krzysztof Kozlowski 2022-01-11 20:14 ` [PATCH v2 06/28] ARM: dts: exynos: simplify PMIC DVS pin configuration " Krzysztof Kozlowski 2022-01-11 20:14 ` Krzysztof Kozlowski 2022-01-11 20:17 ` [PATCH v2 07/28] ARM: dts: exynos: override pins by label in Peach Pi Krzysztof Kozlowski 2022-01-11 20:17 ` Krzysztof Kozlowski 2022-01-11 20:17 ` [PATCH v2 08/28] ARM: dts: exynos: simplify PMIC DVS pin configuration " Krzysztof Kozlowski 2022-01-11 20:17 ` Krzysztof Kozlowski 2022-01-11 20:17 ` [PATCH v2 09/28] ARM: dts: s3c64xx: drop unneeded pinctrl wake-up interrupt mapping Krzysztof Kozlowski 2022-01-11 20:17 ` Krzysztof Kozlowski 2022-01-11 20:17 ` [PATCH v2 10/28] ARM: dts: exynos: align pinctrl with dtschema in Exynos3250 Krzysztof Kozlowski 2022-01-11 20:17 ` Krzysztof Kozlowski 2022-01-11 20:17 ` [PATCH v2 11/28] ARM: dts: exynos: align pinctrl with dtschema in Exynos4210 Krzysztof Kozlowski 2022-01-11 20:17 ` Krzysztof Kozlowski 2022-01-11 20:17 ` [PATCH v2 12/28] ARM: dts: exynos: align pinctrl with dtschema in Exynos4412 Krzysztof Kozlowski 2022-01-11 20:17 ` Krzysztof Kozlowski 2022-01-11 20:17 ` [PATCH v2 13/28] ARM: dts: exynos: align pinctrl with dtschema in Exynos5250 Krzysztof Kozlowski 2022-01-11 20:17 ` Krzysztof Kozlowski 2022-01-11 20:17 ` [PATCH v2 14/28] ARM: dts: exynos: align pinctrl with dtschema in Exynos5260 Krzysztof Kozlowski 2022-01-11 20:17 ` Krzysztof Kozlowski 2022-01-11 20:17 ` [PATCH v2 15/28] ARM: dts: exynos: align pinctrl with dtschema in Exynos5410 Krzysztof Kozlowski 2022-01-11 20:17 ` Krzysztof Kozlowski 2022-01-11 20:17 ` [PATCH v2 16/28] ARM: dts: exynos: align pinctrl with dtschema in Exynos542x/5800 Krzysztof Kozlowski 2022-01-11 20:17 ` Krzysztof Kozlowski 2022-01-11 20:17 ` [PATCH v2 17/28] arm64: dts: exynos: align pinctrl with dtschema in Exynos5433 Krzysztof Kozlowski 2022-01-11 20:17 ` Krzysztof Kozlowski 2022-01-11 20:17 ` [PATCH v2 18/28] arm64: dts: exynos: align pinctrl with dtschema in Exynos7 Krzysztof Kozlowski 2022-01-11 20:17 ` Krzysztof Kozlowski 2022-01-16 15:34 ` Alim Akhtar 2022-01-16 15:34 ` Alim Akhtar 2022-01-11 20:17 ` [PATCH v2 19/28] arm64: dts: exynos: align pinctrl with dtschema in Exynos850 Krzysztof Kozlowski 2022-01-11 20:17 ` Krzysztof Kozlowski 2022-01-11 20:17 ` [PATCH v2 20/28] arm64: dts: exynos: align pinctrl with dtschema in ExynosAutov9 Krzysztof Kozlowski 2022-01-11 20:17 ` Krzysztof Kozlowski 2022-01-12 5:21 ` Chanho Park 2022-01-12 5:21 ` Chanho Park 2022-01-14 16:40 ` Sam Protsenko 2022-01-14 16:40 ` Sam Protsenko 2022-01-11 20:17 ` [PATCH v2 21/28] ARM: dts: s3c24xx: align pinctrl with dtschema Krzysztof Kozlowski 2022-01-11 20:17 ` Krzysztof Kozlowski 2022-01-11 20:17 ` [PATCH v2 22/28] ARM: dts: s3c64xx: " Krzysztof Kozlowski 2022-01-11 20:17 ` Krzysztof Kozlowski 2022-01-11 20:17 ` [PATCH v2 23/28] ARM: dts: s5pv210: " Krzysztof Kozlowski 2022-01-11 20:17 ` Krzysztof Kozlowski 2022-01-11 20:17 ` [PATCH v2 24/28] dt-bindings: pinctrl: samsung: convert to dtschema Krzysztof Kozlowski 2022-01-11 20:17 ` Krzysztof Kozlowski 2022-01-16 0:55 ` Linus Walleij 2022-01-16 0:55 ` Linus Walleij 2022-01-16 17:10 ` Krzysztof Kozlowski 2022-01-16 17:10 ` Krzysztof Kozlowski 2022-01-16 21:38 ` Linus Walleij 2022-01-16 21:38 ` Linus Walleij 2022-01-17 7:45 ` Krzysztof Kozlowski 2022-01-17 7:45 ` Krzysztof Kozlowski 2022-01-17 20:26 ` Olof Johansson 2022-01-17 20:26 ` Olof Johansson 2022-01-18 7:52 ` Krzysztof Kozlowski 2022-01-18 7:52 ` Krzysztof Kozlowski 2022-01-11 20:17 ` [PATCH v2 25/28] dt-bindings: pinctrl: samsung: describe Exynos850 and ExynosAutov9 wake-ups Krzysztof Kozlowski 2022-01-11 20:17 ` Krzysztof Kozlowski 2022-01-12 2:26 ` Rob Herring 2022-01-12 2:26 ` Rob Herring 2022-01-14 19:44 ` Sam Protsenko 2022-01-14 19:44 ` Sam Protsenko 2022-01-11 20:17 ` [PATCH v2 26/28] pinctrl: samsung: add support for " Krzysztof Kozlowski 2022-01-11 20:17 ` Krzysztof Kozlowski 2022-01-12 5:21 ` Chanho Park 2022-01-12 5:21 ` Chanho Park 2022-01-14 16:39 ` Sam Protsenko 2022-01-14 16:39 ` Sam Protsenko 2022-01-11 20:17 ` [PATCH v2 27/28] arm64: dts: exynos: use dedicated wake-up pinctrl compatible in Exynos850 Krzysztof Kozlowski 2022-01-11 20:17 ` Krzysztof Kozlowski 2022-01-14 18:34 ` Sam Protsenko 2022-01-14 18:34 ` Sam Protsenko 2022-01-11 20:17 ` [PATCH v2 28/28] arm64: dts: exynos: use dedicated wake-up pinctrl compatible in ExynosAutov9 Krzysztof Kozlowski 2022-01-11 20:17 ` Krzysztof Kozlowski 2022-01-12 5:28 ` Chanho Park 2022-01-12 5:28 ` Chanho Park 2022-01-14 16:31 ` Sam Protsenko 2022-01-14 16:31 ` Sam Protsenko 2022-01-14 18:31 ` [PATCH v2 00/28] pinctrl: dt-bindings: samsung: convert to dtschema Sam Protsenko 2022-01-14 18:31 ` Sam Protsenko 2022-01-15 15:46 ` Krzysztof Kozlowski 2022-01-15 15:46 ` Krzysztof Kozlowski 2022-01-23 11:46 ` Krzysztof Kozlowski 2022-01-23 17:09 ` Krzysztof Kozlowski 2022-01-23 17:09 ` Krzysztof Kozlowski 2022-01-23 11:46 ` Krzysztof Kozlowski
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20220111201426.326777-2-krzysztof.kozlowski@canonical.com \ --to=krzysztof.kozlowski@canonical.com \ --cc=alim.akhtar@gmail.com \ --cc=chanho61.park@samsung.com \ --cc=devicetree@vger.kernel.org \ --cc=linus.walleij@linaro.org \ --cc=linux-arm-kernel@lists.infradead.org \ --cc=linux-gpio@vger.kernel.org \ --cc=linux-kernel@vger.kernel.org \ --cc=linux-samsung-soc@vger.kernel.org \ --cc=m.szyprowski@samsung.com \ --cc=robh+dt@kernel.org \ --cc=s.nawrocki@samsung.com \ --cc=semen.protsenko@linaro.org \ --cc=stable@vger.kernel.org \ --cc=tomasz.figa@gmail.com \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.