lkml.org 
[lkml]   [2019]   [Nov]   [8]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.3 027/140] pinctrl: ns2: Fix off by one bugs in ns2_pinmux_enable()
    Date
    From: Dan Carpenter <dan.carpenter@oracle.com>

    [ Upstream commit 39b65fbb813089e366b376bd8acc300b6fd646dc ]

    The pinctrl->functions[] array has pinctrl->num_functions elements and
    the pinctrl->groups[] array is the same way. These are set in
    ns2_pinmux_probe(). So the > comparisons should be >= so that we don't
    read one element beyond the end of the array.

    Fixes: b5aa1006e4a9 ("pinctrl: ns2: add pinmux driver support for Broadcom NS2 SoC")
    Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
    Link: https://lore.kernel.org/r/20190926081426.GB2332@mwanda
    Acked-by: Scott Branden <scott.branden@broadcom.com>
    Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/pinctrl/bcm/pinctrl-ns2-mux.c | 4 ++--
    1 file changed, 2 insertions(+), 2 deletions(-)

    diff --git a/drivers/pinctrl/bcm/pinctrl-ns2-mux.c b/drivers/pinctrl/bcm/pinctrl-ns2-mux.c
    index 2bf6af7df7d94..9fabc451550ea 100644
    --- a/drivers/pinctrl/bcm/pinctrl-ns2-mux.c
    +++ b/drivers/pinctrl/bcm/pinctrl-ns2-mux.c
    @@ -640,8 +640,8 @@ static int ns2_pinmux_enable(struct pinctrl_dev *pctrl_dev,
    const struct ns2_pin_function *func;
    const struct ns2_pin_group *grp;

    - if (grp_select > pinctrl->num_groups ||
    - func_select > pinctrl->num_functions)
    + if (grp_select >= pinctrl->num_groups ||
    + func_select >= pinctrl->num_functions)
    return -EINVAL;

    func = &pinctrl->functions[func_select];
    --
    2.20.1


    \
     
     \ /
      Last update: 2019-11-08 20:15    [W:4.691 / U:0.016 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site