2022-09-19 03:45:15

by Dongliang Mu

Subject: [PATCH v2] gpio: tqmx86: fix uninitialized variable girq

From: Dongliang Mu <[email protected]>

The commit 924610607f19 ("gpio: tpmx86: Move PM device over to
irq domain") adds a dereference of girq that may be uninitialized.

Fix this by moving irq_domain_set_pm_device into if true branch
as suggested by Marc Zyngier.

Fixes: 924610607f19 ("gpio: tpmx86: Move PM device over to irq domain")
Suggested-by: Marc Zyngier <[email protected]>
Signed-off-by: Dongliang Mu <[email protected]>
---
v1->v2: modify fix method to moving irq_domain_set_pm_device into
if true branch as suggested by Marc Zyngier
drivers/gpio/gpio-tqmx86.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/gpio/gpio-tqmx86.c b/drivers/gpio/gpio-tqmx86.c
index fa4bc7481f9a..e739dcea61b2 100644
--- a/drivers/gpio/gpio-tqmx86.c
+++ b/drivers/gpio/gpio-tqmx86.c
@@ -307,6 +307,8 @@ static int tqmx86_gpio_probe(struct platform_device *pdev)
girq->default_type = IRQ_TYPE_NONE;
girq->handler = handle_simple_irq;
girq->init_valid_mask = tqmx86_init_irq_valid_mask;
+
+ irq_domain_set_pm_device(girq->domain, dev);
}

ret = devm_gpiochip_add_data(dev, chip, gpio);
@@ -315,8 +317,6 @@ static int tqmx86_gpio_probe(struct platform_device *pdev)
goto out_pm_dis;
}

- irq_domain_set_pm_device(girq->domain, dev);
-
dev_info(dev, "GPIO functionality initialized with %d pins\n",
chip->ngpio);

--
2.35.1

2022-09-19 10:18:02

by Marc Zyngier

Subject: Re: [PATCH v2] gpio: tqmx86: fix uninitialized variable girq

On Mon, 19 Sep 2022 04:12:49 +0100,
Dongliang Mu <[email protected]> wrote:
>
> From: Dongliang Mu <[email protected]>
>
> The commit 924610607f19 ("gpio: tpmx86: Move PM device over to
> irq domain") adds a dereference of girq that may be uninitialized.
>
> Fix this by moving irq_domain_set_pm_device into if true branch
> as suggested by Marc Zyngier.
>
> Fixes: 924610607f19 ("gpio: tpmx86: Move PM device over to irq domain")
> Suggested-by: Marc Zyngier <[email protected]>
> Signed-off-by: Dongliang Mu <[email protected]>
> ---
> v1->v2: modify fix method to moving irq_domain_set_pm_device into
> if true branch as suggested by Marc Zyngier
> drivers/gpio/gpio-tqmx86.c | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)

Acked-by: Marc Zyngier <[email protected]>

M.

--
Without deviation from the norm, progress is not possible.

2022-09-21 08:00:33

by Bartosz Golaszewski

Subject: Re: [PATCH v2] gpio: tqmx86: fix uninitialized variable girq

On Mon, Sep 19, 2022 at 5:14 AM Dongliang Mu <[email protected]> wrote:
>
> From: Dongliang Mu <[email protected]>
>
> The commit 924610607f19 ("gpio: tpmx86: Move PM device over to
> irq domain") adds a dereference of girq that may be uninitialized.
>
> Fix this by moving irq_domain_set_pm_device into if true branch
> as suggested by Marc Zyngier.
>
> Fixes: 924610607f19 ("gpio: tpmx86: Move PM device over to irq domain")
> Suggested-by: Marc Zyngier <[email protected]>
> Signed-off-by: Dongliang Mu <[email protected]>
> ---
> v1->v2: modify fix method to moving irq_domain_set_pm_device into
> if true branch as suggested by Marc Zyngier
> drivers/gpio/gpio-tqmx86.c | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/gpio/gpio-tqmx86.c b/drivers/gpio/gpio-tqmx86.c
> index fa4bc7481f9a..e739dcea61b2 100644
> --- a/drivers/gpio/gpio-tqmx86.c
> +++ b/drivers/gpio/gpio-tqmx86.c
> @@ -307,6 +307,8 @@ static int tqmx86_gpio_probe(struct platform_device *pdev)
> girq->default_type = IRQ_TYPE_NONE;
> girq->handler = handle_simple_irq;
> girq->init_valid_mask = tqmx86_init_irq_valid_mask;
> +
> + irq_domain_set_pm_device(girq->domain, dev);
> }
>
> ret = devm_gpiochip_add_data(dev, chip, gpio);
> @@ -315,8 +317,6 @@ static int tqmx86_gpio_probe(struct platform_device *pdev)
> goto out_pm_dis;
> }
>
> - irq_domain_set_pm_device(girq->domain, dev);
> -
> dev_info(dev, "GPIO functionality initialized with %d pins\n",
> chip->ngpio);
>
> --
> 2.35.1
>

Applied, thanks!

Bart