2020-09-30 17:53:27

by Drew Fustini

Subject: [PATCH v2] pinctrl: single: fix pinctrl_spec.args_count bounds check

The property #pinctrl-cells can either be 1 or 2:

- if #pinctrl-cells = <1>, then pinctrl_spec.args_count = 2
- if #pinctrl-cells = <2>, then pinctrl_spec.args_count = 3

All other values of pinctrl_spec.args_count are incorrect. This fix
checks the upper bound instead of just the lower bound.

Fixes: a13395418888 ("pinctrl: single: parse #pinctrl-cells = 2")
Reported-by: Trent Piepho <[email protected]>
Link: https://lore.kernel.org/linux-omap/[email protected]/
Signed-off-by: Drew Fustini <[email protected]>
---
v2 change:
- correct the description as I had previously been mistakenly using the
term #pinctrl-cells instead of pinctrl_spec.args_count

drivers/pinctrl/pinctrl-single.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/pinctrl/pinctrl-single.c b/drivers/pinctrl/pinctrl-single.c
index efe41abc5d47..5cbf0e55087c 100644
--- a/drivers/pinctrl/pinctrl-single.c
+++ b/drivers/pinctrl/pinctrl-single.c
@@ -1014,7 +1014,7 @@ static int pcs_parse_one_pinctrl_entry(struct pcs_device *pcs,
if (res)
return res;

- if (pinctrl_spec.args_count < 2) {
+ if (pinctrl_spec.args_count < 2 || pinctrl_spec.args_count > 3) {
dev_err(pcs->dev, "invalid args_count for spec: %i\n",
pinctrl_spec.args_count);
break;
--
2.25.1

2020-10-01 07:33:33

by Tony Lindgren

Subject: Re: [PATCH v2] pinctrl: single: fix pinctrl_spec.args_count bounds check

* Drew Fustini <[email protected]> [200930 17:51]:
> The property #pinctrl-cells can either be 1 or 2:
>
> - if #pinctrl-cells = <1>, then pinctrl_spec.args_count = 2
> - if #pinctrl-cells = <2>, then pinctrl_spec.args_count = 3
>
> All other values of pinctrl_spec.args_count are incorrect. This fix
> checks the upper bound instead of just the lower bound.
>
> Fixes: a13395418888 ("pinctrl: single: parse #pinctrl-cells = 2")
> Reported-by: Trent Piepho <[email protected]>
> Link: https://lore.kernel.org/linux-omap/[email protected]/
> Signed-off-by: Drew Fustini <[email protected]>
> ---
> v2 change:
> - correct the description as I had previously been mistakenly using the
> term #pinctrl-cells instead of pinctrl_spec.args_count

Acked-by: Tony Lindgren <[email protected]>

> drivers/pinctrl/pinctrl-single.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/pinctrl/pinctrl-single.c b/drivers/pinctrl/pinctrl-single.c
> index efe41abc5d47..5cbf0e55087c 100644
> --- a/drivers/pinctrl/pinctrl-single.c
> +++ b/drivers/pinctrl/pinctrl-single.c
> @@ -1014,7 +1014,7 @@ static int pcs_parse_one_pinctrl_entry(struct pcs_device *pcs,
> if (res)
> return res;
>
> - if (pinctrl_spec.args_count < 2) {
> + if (pinctrl_spec.args_count < 2 || pinctrl_spec.args_count > 3) {
> dev_err(pcs->dev, "invalid args_count for spec: %i\n",
> pinctrl_spec.args_count);
> break;
> --
> 2.25.1
>

2020-10-01 08:05:10

by Linus Walleij

Subject: Re: [PATCH v2] pinctrl: single: fix pinctrl_spec.args_count bounds check

On Wed, Sep 30, 2020 at 7:51 PM Drew Fustini <[email protected]> wrote:

> The property #pinctrl-cells can either be 1 or 2:
>
> - if #pinctrl-cells = <1>, then pinctrl_spec.args_count = 2
> - if #pinctrl-cells = <2>, then pinctrl_spec.args_count = 3
>
> All other values of pinctrl_spec.args_count are incorrect. This fix
> checks the upper bound instead of just the lower bound.
>
> Fixes: a13395418888 ("pinctrl: single: parse #pinctrl-cells = 2")
> Reported-by: Trent Piepho <[email protected]>
> Link: https://lore.kernel.org/linux-omap/[email protected]/
> Signed-off-by: Drew Fustini <[email protected]>
> ---
> v2 change:
> - correct the description as I had previously been mistakenly using the
> term #pinctrl-cells instead of pinctrl_spec.args_count

Patch applied!

Yours,
Linus Walleij