| Message ID | 20200913231557.2063071-1-drew@beagleboard.org |
|---|---|
| State | New |
| Headers | show |
| Series | [v2] pinctrl: single: check pinctrl_spec.args_count > 3 | expand |
* Drew Fustini <drew@beagleboard.org> [200913 23:18]: > pinctrl_spec.args_count can either be 2 when #pinctrl-cells = 1 or > 3 when #pinctrl-cells = 2. > > There is currently only a check to make sure that it is 2 or greater. > This patch adds a check to make sure it is not greater than 3. > > 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: > - this is a fix to my prior email where I referred to #pinctrl-cells > exceeding 3 which is incorrect. It is pinctrl_spec.args_count which > must be greater than 2 (when #pinctrl-cells = 1) and less than 3 (when > #pinctrl-cells = 2) Acked-by: Tony Lindgren <tony@atomide.com> > https://lore.kernel.org/linux-omap/20200913210825.2022552-1-drew@beagleboard.org/ > > > 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 >
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;
pinctrl_spec.args_count can either be 2 when #pinctrl-cells = 1 or 3 when #pinctrl-cells = 2. There is currently only a check to make sure that it is 2 or greater. This patch adds a check to make sure it is not greater than 3. 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: - this is a fix to my prior email where I referred to #pinctrl-cells exceeding 3 which is incorrect. It is pinctrl_spec.args_count which must be greater than 2 (when #pinctrl-cells = 1) and less than 3 (when #pinctrl-cells = 2) https://lore.kernel.org/linux-omap/20200913210825.2022552-1-drew@beagleboard.org/ drivers/pinctrl/pinctrl-single.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)