lkml.org 
[lkml]   [2020]   [Oct]   [27]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.9 358/757] pinctrl: single: fix pinctrl_spec.args_count bounds check
    Date
    From: Drew Fustini <drew@beagleboard.org>

    [ Upstream commit 9b9448f39e83d8e6fdfed006c5db8c304a98c2cd ]

    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>
    Signed-off-by: Drew Fustini <drew@beagleboard.org>
    Acked-by: Tony Lindgren <tony@atomide.com>
    Link: https://lore.kernel.org/linux-omap/3139716.CMS8C0sQ7x@zen.local/
    Link: https://lore.kernel.org/r/20200930174839.1308344-1-drew@beagleboard.org
    Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
    Signed-off-by: Sasha Levin <sashal@kernel.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 efe41abc5d472..5cbf0e55087c6 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


    \
     
     \ /
      Last update: 2020-10-27 18:09    [W:2.850 / U:0.072 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site