]> www.infradead.org Git - users/willy/xarray.git/commitdiff
pinctrl: mediatek: fix global-out-of-bounds issue
authorGuodong Liu <guodong.liu@mediatek.corp-partner.google.com>
Wed, 10 Nov 2021 07:19:00 +0000 (15:19 +0800)
committerLinus Walleij <linus.walleij@linaro.org>
Wed, 24 Nov 2021 08:38:44 +0000 (09:38 +0100)
When eint virtual eint number is greater than gpio number,
it maybe produce 'desc[eint_n]' size globle-out-of-bounds issue.

Signed-off-by: Guodong Liu <guodong.liu@mediatek.corp-partner.google.com>
Signed-off-by: Zhiyong Tao <zhiyong.tao@mediatek.com>
Reviewed-by: Chen-Yu Tsai <wenst@chromium.org>
Link: https://lore.kernel.org/r/20211110071900.4490-2-zhiyong.tao@mediatek.com
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
drivers/pinctrl/mediatek/pinctrl-mtk-common-v2.c

index 91553b2fc1605f1a8db9c3db02f738485db57d45..53779822348da7cf6fdfe9c225647ecb11d82c8f 100644 (file)
@@ -285,8 +285,12 @@ static int mtk_xt_get_gpio_n(void *data, unsigned long eint_n,
        desc = (const struct mtk_pin_desc *)hw->soc->pins;
        *gpio_chip = &hw->chip;
 
-       /* Be greedy to guess first gpio_n is equal to eint_n */
-       if (desc[eint_n].eint.eint_n == eint_n)
+       /*
+        * Be greedy to guess first gpio_n is equal to eint_n.
+        * Only eint virtual eint number is greater than gpio number.
+        */
+       if (hw->soc->npins > eint_n &&
+           desc[eint_n].eint.eint_n == eint_n)
                *gpio_n = eint_n;
        else
                *gpio_n = mtk_xt_find_eint_num(hw, eint_n);