* [PATCH v2] pinctrl: single: fix pinctrl_spec.args_count bounds check
@ 2020-09-30 17:48 Drew Fustini
2020-10-01 7:31 ` Tony Lindgren
2020-10-01 8:03 ` Linus Walleij
0 siblings, 2 replies; 3+ messages in thread
From: Drew Fustini @ 2020-09-30 17:48 UTC (permalink / raw)
To: Tony Lindgren, Rob Herring, Linus Walleij, Jason Kridner,
Robert Nelson, Trent Piepho, Christina Quast, linux-omap,
linux-kernel, devicetree, linux-gpio
Cc: Drew Fustini
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 <tpiepho@gmail.com>
Link: https://lore.kernel.org/linux-omap/3139716.CMS8C0sQ7x@zen.local/
Signed-off-by: Drew Fustini <drew@beagleboard.org>
---
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
^ permalink raw reply related [flat|nested] 3+ messages in thread* Re: [PATCH v2] pinctrl: single: fix pinctrl_spec.args_count bounds check
2020-09-30 17:48 [PATCH v2] pinctrl: single: fix pinctrl_spec.args_count bounds check Drew Fustini
@ 2020-10-01 7:31 ` Tony Lindgren
2020-10-01 8:03 ` Linus Walleij
1 sibling, 0 replies; 3+ messages in thread
From: Tony Lindgren @ 2020-10-01 7:31 UTC (permalink / raw)
To: Drew Fustini
Cc: Rob Herring, Linus Walleij, Jason Kridner, Robert Nelson,
Trent Piepho, Christina Quast, linux-omap, linux-kernel,
devicetree, linux-gpio
* Drew Fustini <drew@beagleboard.org> [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 <tpiepho@gmail.com>
> Link: https://lore.kernel.org/linux-omap/3139716.CMS8C0sQ7x@zen.local/
> Signed-off-by: Drew Fustini <drew@beagleboard.org>
> ---
> 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 <tony@atomide.com>
> 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
>
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: [PATCH v2] pinctrl: single: fix pinctrl_spec.args_count bounds check
2020-09-30 17:48 [PATCH v2] pinctrl: single: fix pinctrl_spec.args_count bounds check Drew Fustini
2020-10-01 7:31 ` Tony Lindgren
@ 2020-10-01 8:03 ` Linus Walleij
1 sibling, 0 replies; 3+ messages in thread
From: Linus Walleij @ 2020-10-01 8:03 UTC (permalink / raw)
To: Drew Fustini
Cc: Tony Lindgren, Rob Herring, Jason Kridner, Robert Nelson,
Trent Piepho, Christina Quast, Linux-OMAP, linux-kernel,
open list:OPEN FIRMWARE AND FLATTENED DEVICE TREE BINDINGS,
open list:GPIO SUBSYSTEM
On Wed, Sep 30, 2020 at 7:51 PM Drew Fustini <drew@beagleboard.org> 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 <tpiepho@gmail.com>
> Link: https://lore.kernel.org/linux-omap/3139716.CMS8C0sQ7x@zen.local/
> Signed-off-by: Drew Fustini <drew@beagleboard.org>
> ---
> 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
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2020-10-01 8:03 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-09-30 17:48 [PATCH v2] pinctrl: single: fix pinctrl_spec.args_count bounds check Drew Fustini
2020-10-01 7:31 ` Tony Lindgren
2020-10-01 8:03 ` Linus Walleij
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).