]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
pinctrl: mediatek: Fix some off by one bugs
authorDan Carpenter <dan.carpenter@oracle.com>
Tue, 18 Feb 2020 05:52:47 +0000 (08:52 +0300)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Fri, 17 May 2024 09:43:55 +0000 (11:43 +0200)
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: Dan Carpenter <dan.carpenter@oracle.com>
Link: https://lore.kernel.org/r/20200218055247.74s2xa7veqx2do34@kili.mountain
Reviewed-by: Matthias Brugger <matthias.bgg@gmail.com>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/pinctrl/mediatek/pinctrl-paris.c

index 31a4d464211ccafaf6eddad71b1a4436b2b5fead..54fc337f2eb3d4c1be1cce52e383f4b7e53f0b36 100644 (file)
@@ -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);