diff mbox series

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

Message ID 20200930174839.1308344-1-drew@beagleboard.org
State Superseded
Headers show
Series [v2] pinctrl: single: fix pinctrl_spec.args_count bounds check | expand

Commit Message

Drew Fustini Sept. 30, 2020, 5:48 p.m. UTC
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(-)

Comments

Tony Lindgren Oct. 1, 2020, 7:31 a.m. UTC | #1
* 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
>
Linus Walleij Oct. 1, 2020, 8:03 a.m. UTC | #2
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
diff mbox series

Patch

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;