2017-12-13 08:56:29

by Quentin Schulz

Subject: [PATCH] pinctrl: axp209: dereference pointer after it's been set

The number of GPIOs is gotten from a field within the structure
referenced in the of_device.data but it was actually read before it was
retrieved, thus it was dereferencing a null pointer.

Set the number of GPIOs after retrieving of_device.data.

Fixes: e1190083b89b ("pinctrl: axp209: add support for AXP813 GPIOs")

Signed-off-by: Quentin Schulz <[email protected]>
Reported-by: Mylène Josserand <[email protected]>
---
drivers/pinctrl/pinctrl-axp209.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/drivers/pinctrl/pinctrl-axp209.c b/drivers/pinctrl/pinctrl-axp209.c
index 22d3bb0bf927..510a2821e910 100644
--- a/drivers/pinctrl/pinctrl-axp209.c
+++ b/drivers/pinctrl/pinctrl-axp209.c
@@ -413,9 +413,11 @@ static int axp20x_pctl_probe(struct platform_device *pdev)
pctl->chip.set = axp20x_gpio_set;
pctl->chip.direction_input = axp20x_gpio_input;
pctl->chip.direction_output = axp20x_gpio_output;
- pctl->chip.ngpio = pctl->desc->npins;

pctl->desc = (struct axp20x_pctrl_desc *)of_device_get_match_data(dev);
+
+ pctl->chip.ngpio = pctl->desc->npins;
+
pctl->regmap = axp20x->regmap;
pctl->dev = &pdev->dev;

--
2.14.1

2017-12-13 09:20:58

by Mylène Josserand

Subject: Re: [PATCH] pinctrl: axp209: dereference pointer after it's been set

Hello Quentin,

Le Wed, 13 Dec 2017 09:55:03 +0100,
Quentin Schulz <[email protected]> a écrit :

> The number of GPIOs is gotten from a field within the structure
> referenced in the of_device.data but it was actually read before it was
> retrieved, thus it was dereferencing a null pointer.
>
> Set the number of GPIOs after retrieving of_device.data.
>
> Fixes: e1190083b89b ("pinctrl: axp209: add support for AXP813 GPIOs")
>
> Signed-off-by: Quentin Schulz <[email protected]>
> Reported-by: Mylène Josserand <[email protected]>

Tested-by: Mylène Josserand <[email protected]>

Thanks,

Mylène

> ---
> drivers/pinctrl/pinctrl-axp209.c | 4 +++-
> 1 file changed, 3 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/pinctrl/pinctrl-axp209.c b/drivers/pinctrl/pinctrl-axp209.c
> index 22d3bb0bf927..510a2821e910 100644
> --- a/drivers/pinctrl/pinctrl-axp209.c
> +++ b/drivers/pinctrl/pinctrl-axp209.c
> @@ -413,9 +413,11 @@ static int axp20x_pctl_probe(struct platform_device *pdev)
> pctl->chip.set = axp20x_gpio_set;
> pctl->chip.direction_input = axp20x_gpio_input;
> pctl->chip.direction_output = axp20x_gpio_output;
> - pctl->chip.ngpio = pctl->desc->npins;
>
> pctl->desc = (struct axp20x_pctrl_desc *)of_device_get_match_data(dev);
> +
> + pctl->chip.ngpio = pctl->desc->npins;
> +
> pctl->regmap = axp20x->regmap;
> pctl->dev = &pdev->dev;
>

--
Mylène Josserand, Free Electrons
Embedded Linux and Kernel engineering
http://free-electrons.com

2017-12-14 03:05:43

by Chen-Yu Tsai

Subject: Re: [PATCH] pinctrl: axp209: dereference pointer after it's been set

On Wed, Dec 13, 2017 at 5:20 PM, Mylene JOSSERAND
<[email protected]> wrote:
> Hello Quentin,
>
> Le Wed, 13 Dec 2017 09:55:03 +0100,
> Quentin Schulz <[email protected]> a écrit :
>
>> The number of GPIOs is gotten from a field within the structure
>> referenced in the of_device.data but it was actually read before it was
>> retrieved, thus it was dereferencing a null pointer.
>>
>> Set the number of GPIOs after retrieving of_device.data.
>>
>> Fixes: e1190083b89b ("pinctrl: axp209: add support for AXP813 GPIOs")
>>
>> Signed-off-by: Quentin Schulz <[email protected]>
>> Reported-by: Mylène Josserand <[email protected]>
>
> Tested-by: Mylène Josserand <[email protected]>

Acked-by: Chen-Yu Tsai <[email protected]>

2017-12-20 08:07:39

by Linus Walleij

Subject: Re: [PATCH] pinctrl: axp209: dereference pointer after it's been set

On Wed, Dec 13, 2017 at 9:55 AM, Quentin Schulz
<[email protected]> wrote:

> The number of GPIOs is gotten from a field within the structure
> referenced in the of_device.data but it was actually read before it was
> retrieved, thus it was dereferencing a null pointer.
>
> Set the number of GPIOs after retrieving of_device.data.
>
> Fixes: e1190083b89b ("pinctrl: axp209: add support for AXP813 GPIOs")
>
> Signed-off-by: Quentin Schulz <[email protected]>
> Reported-by: Mylène Josserand <[email protected]>

Patch applied with the tags for test and ACK.

Yours,
Linus Walleij