pinctrl: mediatek: eint: Fix invalid pointer dereference for v1 platforms

Commit 3ef9f710efcb ("pinctrl: mediatek: Add EINT support for multiple
addresses") introduced an access to the 'soc' field of struct
mtk_pinctrl in mtk_eint_do_init() and for that an include of
pinctrl-mtk-common-v2.h.

However, pinctrl drivers relying on the v1 common driver include
pinctrl-mtk-common.h instead, which provides another definition of
struct mtk_pinctrl that does not contain an 'soc' field.

Since mtk_eint_do_init() can be called both by v1 and v2 drivers, it
will now try to dereference an invalid pointer when called on v1
platforms. This has been observed on Genio 350 EVK (MT8365), which
crashes very early in boot (the kernel trace can only be seen with
earlycon).

In order to fix this, since 'struct mtk_pinctrl' was only needed to get
a 'struct mtk_eint_pin', make 'struct mtk_eint_pin' a parameter
of mtk_eint_do_init() so that callers need to supply it, removing
mtk_eint_do_init()'s dependency on any particular 'struct mtk_pinctrl'.

Fixes: 3ef9f710efcb ("pinctrl: mediatek: Add EINT support for multiple addresses")
Suggested-by: AngeloGioacchino Del Regno <angelogioacchino.delregno@collabora.com>
Signed-off-by: Nícolas F. R. A. Prado <nfraprado@collabora.com>
Link: https://lore.kernel.org/20250520-genio-350-eint-null-ptr-deref-fix-v2-1-6a3ca966a7ba@collabora.com
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>

diff --git a/drivers/pinctrl/mediatek/mtk-eint.c b/drivers/pinctrl/mediatek/mtk-eint.c
index 557dec75fa03187ccc2e4492c8edcebfd19262ee..c2e452c699cfadac82a93651e49871570e0272db 100644 (file)
--- a/drivers/pinctrl/mediatek/mtk-eint.c
+++ b/drivers/pinctrl/mediatek/mtk-eint.c
@@ -22,7 +22,6 @@
 #include <linux/platform_device.h>
 
 #include "mtk-eint.h"
-#include "pinctrl-mtk-common-v2.h"
 
 #define MTK_EINT_EDGE_SENSITIVE           0
 #define MTK_EINT_LEVEL_SENSITIVE          1
@@ -505,10 +504,9 @@ int mtk_eint_find_irq(struct mtk_eint *eint, unsigned long eint_n)
 }
 EXPORT_SYMBOL_GPL(mtk_eint_find_irq);
 
-int mtk_eint_do_init(struct mtk_eint *eint)
+int mtk_eint_do_init(struct mtk_eint *eint, struct mtk_eint_pin *eint_pin)
 {
        unsigned int size, i, port, virq, inst = 0;
-       struct mtk_pinctrl *hw = (struct mtk_pinctrl *)eint->pctl;
 
        /* If clients don't assign a specific regs, let's use generic one */
        if (!eint->regs)
@@ -519,7 +517,15 @@ int mtk_eint_do_init(struct mtk_eint *eint)
        if (!eint->base_pin_num)
                return -ENOMEM;
 
-       if (eint->nbase == 1) {
+       if (eint_pin) {
+               eint->pins = eint_pin;
+               for (i = 0; i < eint->hw->ap_num; i++) {
+                       inst = eint->pins[i].instance;
+                       if (inst >= eint->nbase)
+                               continue;
+                       eint->base_pin_num[inst]++;
+               }
+       } else {
                size = eint->hw->ap_num * sizeof(struct mtk_eint_pin);
                eint->pins = devm_kmalloc(eint->dev, size, GFP_KERNEL);
                if (!eint->pins)
@@ -533,16 +539,6 @@ int mtk_eint_do_init(struct mtk_eint *eint)
                }
        }
 
-       if (hw && hw->soc && hw->soc->eint_pin) {
-               eint->pins = hw->soc->eint_pin;
-               for (i = 0; i < eint->hw->ap_num; i++) {
-                       inst = eint->pins[i].instance;
-                       if (inst >= eint->nbase)
-                               continue;
-                       eint->base_pin_num[inst]++;
-               }
-       }
-
        eint->pin_list = devm_kmalloc(eint->dev, eint->nbase * sizeof(u16 *), GFP_KERNEL);
        if (!eint->pin_list)
                goto err_pin_list;
@@ -610,7 +606,7 @@ err_cur_mask:
 err_wake_mask:
        devm_kfree(eint->dev, eint->pin_list);
 err_pin_list:
-       if (eint->nbase == 1)
+       if (!eint_pin)
                devm_kfree(eint->dev, eint->pins);
 err_pins:
        devm_kfree(eint->dev, eint->base_pin_num);

diff --git a/drivers/pinctrl/mediatek/mtk-eint.h b/drivers/pinctrl/mediatek/mtk-eint.h
index 0c6bf7cbdc3a4f16e35d576535c6cef102962356..fc31a4c0c77bf28b106943e9292d0dcc425c4922 100644 (file)
--- a/drivers/pinctrl/mediatek/mtk-eint.h
+++ b/drivers/pinctrl/mediatek/mtk-eint.h
@@ -88,7 +88,7 @@ struct mtk_eint {
 };
 
 #if IS_ENABLED(CONFIG_EINT_MTK)
-int mtk_eint_do_init(struct mtk_eint *eint);
+int mtk_eint_do_init(struct mtk_eint *eint, struct mtk_eint_pin *eint_pin);
 int mtk_eint_do_suspend(struct mtk_eint *eint);
 int mtk_eint_do_resume(struct mtk_eint *eint);
 int mtk_eint_set_debounce(struct mtk_eint *eint, unsigned long eint_n,
@@ -96,7 +96,8 @@ int mtk_eint_set_debounce(struct mtk_eint *eint, unsigned long eint_n,
 int mtk_eint_find_irq(struct mtk_eint *eint, unsigned long eint_n);
 
 #else
-static inline int mtk_eint_do_init(struct mtk_eint *eint)
+static inline int mtk_eint_do_init(struct mtk_eint *eint,
+                                  struct mtk_eint_pin *eint_pin)
 {
        return -EOPNOTSUPP;
 }

diff --git a/drivers/pinctrl/mediatek/pinctrl-mtk-common-v2.c b/drivers/pinctrl/mediatek/pinctrl-mtk-common-v2.c
index 0884c0700b3ee463c4571f2ac5b0254b5583b54a..4918d38abfc29de1f27ee75bc6a51c32b3ca1ac5 100644 (file)
--- a/drivers/pinctrl/mediatek/pinctrl-mtk-common-v2.c
+++ b/drivers/pinctrl/mediatek/pinctrl-mtk-common-v2.c
@@ -419,7 +419,7 @@ int mtk_build_eint(struct mtk_pinctrl *hw, struct platform_device *pdev)
        hw->eint->pctl = hw;
        hw->eint->gpio_xlate = &mtk_eint_xt;
 
-       ret = mtk_eint_do_init(hw->eint);
+       ret = mtk_eint_do_init(hw->eint, hw->soc->eint_pin);
        if (ret)
                goto err_free_eint;
 

diff --git a/drivers/pinctrl/mediatek/pinctrl-mtk-common.c b/drivers/pinctrl/mediatek/pinctrl-mtk-common.c
index 7f22adcca904bd1b9792ed710e728987a8d817f3..28ccafdada33ebccce7614b28f0789b486053619 100644 (file)
--- a/drivers/pinctrl/mediatek/pinctrl-mtk-common.c
+++ b/drivers/pinctrl/mediatek/pinctrl-mtk-common.c
@@ -1038,7 +1038,7 @@ static int mtk_eint_init(struct mtk_pinctrl *pctl, struct platform_device *pdev)
        pctl->eint->pctl = pctl;
        pctl->eint->gpio_xlate = &mtk_eint_xt;
 
-       return mtk_eint_do_init(pctl->eint);
+       return mtk_eint_do_init(pctl->eint, NULL);
 }
 
 /* This is used as a common probe function */