| From foo@baz Wed Aug 22 09:42:09 CEST 2018 |
| From: Dan Carpenter <dan.carpenter@oracle.com> |
| Date: Tue, 3 Jul 2018 15:04:25 +0300 |
| Subject: pinctrl: nsp: off by ones in nsp_pinmux_enable() |
| |
| From: Dan Carpenter <dan.carpenter@oracle.com> |
| |
| [ Upstream commit f90a21c898db58eaea14b8ad7e9af3b9e15e5f8a ] |
| |
| The > comparisons should be >= or else we read beyond the end of the |
| pinctrl->functions[] array. |
| |
| Fixes: cc4fa83f66e9 ("pinctrl: nsp: add pinmux driver support for Broadcom NSP SoC") |
| Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com> |
| Reviewed-by: Ray Jui <ray.jui@broadcom.com> |
| Signed-off-by: Linus Walleij <linus.walleij@linaro.org> |
| Signed-off-by: Sasha Levin <alexander.levin@microsoft.com> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| --- |
| drivers/pinctrl/bcm/pinctrl-nsp-mux.c | 4 ++-- |
| 1 file changed, 2 insertions(+), 2 deletions(-) |
| |
| --- a/drivers/pinctrl/bcm/pinctrl-nsp-mux.c |
| +++ b/drivers/pinctrl/bcm/pinctrl-nsp-mux.c |
| @@ -460,8 +460,8 @@ static int nsp_pinmux_enable(struct pinc |
| const struct nsp_pin_function *func; |
| const struct nsp_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]; |
