Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit fa812e30 authored by Dan Carpenter's avatar Dan Carpenter Committed by Greg Kroah-Hartman
Browse files

pinctrl: mediatek: Fix some off by one bugs 



commit 3385ab72d995fc0b876818a36203bf2429445686 upstream.

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

Fixes: 3de7deefce69 ("pinctrl: mediatek: Check gpio pin number and use binary search in mtk_hw_pin_field_lookup()")
Fixes: 184d8e13f9b1 ("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>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 1c86f75d

drivers/pinctrl/mediatek/pinctrl-paris.c

+5 −5
Original line number Diff line number Diff line
@@ -610,7 +610,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];
@@ -628,7 +628,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];
@@ -645,7 +645,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];
@@ -657,7 +657,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);
@@ -668,7 +668,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);