Commit 3385ab72 authored by Dan Carpenter's avatar Dan Carpenter Committed by Linus Walleij
Browse files

pinctrl: mediatek: Fix some off by one bugs 



These comparisons should be >= instead of > to prevent accessing one
element beyond the end of the hw->soc->pins[] array.

Fixes: 3de7deef ("pinctrl: mediatek: Check gpio pin number and use binary search in mtk_hw_pin_field_lookup()")
Fixes: 184d8e13 ("pinctrl: mediatek: Add support for pin configuration dump via debugfs.")
Signed-off-by: default avatarDan Carpenter <dan.carpenter@oracle.com>
Link: https://lore.kernel.org/r/20200218055247.74s2xa7veqx2do34@kili.mountain


Reviewed-by: default avatarMatthias Brugger <matthias.bgg@gmail.com>
Signed-off-by: default avatarLinus Walleij <linus.walleij@linaro.org>
parent d6d43a92

drivers/pinctrl/mediatek/pinctrl-paris.c

+7 −7
Original line number Diff line number Diff line
@@ -544,7 +544,7 @@ static int mtk_hw_get_value_wrap(struct mtk_pinctrl *hw, unsigned int gpio, int 
	const struct mtk_pin_desc *desc;

	int value, err;



	if (gpio > hw->soc->npins)

	if (gpio >= hw->soc->npins)

		return -EINVAL;



	desc = (const struct mtk_pin_desc *)&hw->soc->pins[gpio];
@@ -583,7 +583,7 @@ ssize_t mtk_pctrl_show_one_pin(struct mtk_pinctrl *hw, 
	int pinmux, pullup, pullen, len = 0, r1 = -1, r0 = -1;

	const struct mtk_pin_desc *desc;



	if (gpio > hw->soc->npins)

	if (gpio >= hw->soc->npins)

		return -EINVAL;



	desc = (const struct mtk_pin_desc *)&hw->soc->pins[gpio];
@@ -766,7 +766,7 @@ static int mtk_gpio_get_direction(struct gpio_chip *chip, unsigned int gpio) 
	const struct mtk_pin_desc *desc;

	int value, err;



	if (gpio > hw->soc->npins)

	if (gpio >= hw->soc->npins)

		return -EINVAL;



	desc = (const struct mtk_pin_desc *)&hw->soc->pins[gpio];
@@ -787,7 +787,7 @@ static int mtk_gpio_get(struct gpio_chip *chip, unsigned int gpio) 
	const struct mtk_pin_desc *desc;

	int value, err;



	if (gpio > hw->soc->npins)

	if (gpio >= hw->soc->npins)

		return -EINVAL;



	desc = (const struct mtk_pin_desc *)&hw->soc->pins[gpio];
@@ -804,7 +804,7 @@ static void mtk_gpio_set(struct gpio_chip *chip, unsigned int gpio, int value) 
	struct mtk_pinctrl *hw = gpiochip_get_data(chip);

	const struct mtk_pin_desc *desc;



	if (gpio > hw->soc->npins)

	if (gpio >= hw->soc->npins)

		return;



	desc = (const struct mtk_pin_desc *)&hw->soc->pins[gpio];
@@ -816,7 +816,7 @@ static int mtk_gpio_direction_input(struct gpio_chip *chip, unsigned int gpio) 
{

	struct mtk_pinctrl *hw = gpiochip_get_data(chip);



	if (gpio > hw->soc->npins)

	if (gpio >= hw->soc->npins)

		return -EINVAL;



	return pinctrl_gpio_direction_input(chip->base + gpio);
@@ -827,7 +827,7 @@ static int mtk_gpio_direction_output(struct gpio_chip *chip, unsigned int gpio, 
{

	struct mtk_pinctrl *hw = gpiochip_get_data(chip);



	if (gpio > hw->soc->npins)

	if (gpio >= hw->soc->npins)

		return -EINVAL;



	mtk_gpio_set(chip, gpio, value);

CRA Git | Maintained and supported by SUSTech CRA and CCSE