From nobody Fri Dec 19 11:15:22 2025 Received: from bali.collaboradmins.com (bali.collaboradmins.com [148.251.105.195]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id B53C221772B; Tue, 20 May 2025 21:16:09 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=148.251.105.195 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1747775772; cv=none; b=GDFTKIyaHRUwRrB94p7aZL3f7win/DJFXttKx5TdiyvlAyEv3XFWUK/HtsArsx1ezox2lqaMSRUhmOEobAt0GX2/h45XiMV2DSOFdFHMgXa8tE59t4yLn74HpjcrpOy92MRxlUPuSeTJgHtbPRrs00zaJkuGMEMwHcjm6PjDKls= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1747775772; c=relaxed/simple; bh=8CteB6p8zUb1LKQ6PaOVnAOUgbNw2GtdCnfzZooLa/I=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:To:Cc; b=MLzCQuvXQ2ioe7KZelkbblVTWKnKXfibtUJnFTDAu8zXl4tGAYXnQaHyMgM6fWec2Fe/UTD/Ma/J8VUvfi4XnZdOX1//4QF1N87aCjobHNFDbHsvPY13hcLy6qzCEGiWYcO10KcUCUdxg2Y9eUEz3pX0j9gDYMIFlaBBK+s24Zg= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=collabora.com; spf=pass smtp.mailfrom=collabora.com; dkim=pass (2048-bit key) header.d=collabora.com header.i=@collabora.com header.b=QV65h/1F; arc=none smtp.client-ip=148.251.105.195 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=collabora.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=collabora.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=collabora.com header.i=@collabora.com header.b="QV65h/1F" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=collabora.com; s=mail; t=1747775767; bh=8CteB6p8zUb1LKQ6PaOVnAOUgbNw2GtdCnfzZooLa/I=; h=From:Date:Subject:To:Cc:From; b=QV65h/1FtwxUZuwlMTUNurcfKob+MktS0xOomWwHNFl0RFWjnK8hpu5iC0245zjt/ l8NKnwotzs/tlSLdl7OsesMPYEFVrkpoehJGLUbC+C3ULIYISZ8Qx6aQrWayeoS/1r Ne+98lSueF+4LjtEPdQDHq6oYV4OJQ32figLR+z5PPVqgXp30BKhDoIXAb6RdGF0zX Nf/07Hi58xML+D50+kO/oBMj1aJy+4EPRTidvBTVdmua9hO8UmbIPKELv5uik3P+uZ 3uRPB3A7/vubjP9BVX5q/FKkj6S1qBmbT/IauivCJ/+rlc618BxUicfAgrn5kPJnAL MdC2EGcvsVzFA== Received: from [192.168.1.63] (unknown [IPv6:2600:4041:5b1a:9400:99d:464c:62e0:2118]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) (Authenticated sender: nfraprado) by bali.collaboradmins.com (Postfix) with ESMTPSA id F226017E0FD3; Tue, 20 May 2025 23:16:04 +0200 (CEST) From: =?utf-8?q?N=C3=ADcolas_F=2E_R=2E_A=2E_Prado?= Date: Tue, 20 May 2025 17:15:58 -0400 Subject: [PATCH v2] pinctrl: mediatek: eint: Fix invalid pointer dereference for v1 platforms Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20250520-genio-350-eint-null-ptr-deref-fix-v2-1-6a3ca966a7ba@collabora.com> X-B4-Tracking: v=1; b=H4sIAA3xLGgC/5WNQQ6DIBBFr2JYdxpAsbWr3qNxQWHUSSgYsMbGc PdSb9Dl+z95b2cJI2Fit2pnEVdKFHwBeaqYmbQfEcgWZpJLxZXoYERPAWrFAckv4N/OwbxEsBh xgIE2EFq0tdadtteGFc9cDtqOxqMvPFFaQvwcyVX81n/sqwAB/NI0yrZWSlPfTXBOP0PUZxNer M85fwHWIO4H1gAAAA== X-Change-ID: 20250519-genio-350-eint-null-ptr-deref-fix-1a163aa9ad84 To: Sean Wang , Linus Walleij , Matthias Brugger , AngeloGioacchino Del Regno , Hao Chang , Qingliang Li Cc: kernel@collabora.com, linux-mediatek@lists.infradead.org, linux-gpio@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, =?utf-8?q?Uwe_Kleine-K=C3=B6nig?= , Chen-Yu Tsai , =?utf-8?q?N=C3=ADcolas_F=2E_R=2E_A=2E_Prado?= X-Mailer: b4 0.14.2 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 addr= esses") Suggested-by: AngeloGioacchino Del Regno Signed-off-by: N=C3=ADcolas F. R. A. Prado Reviewed-by: AngeloGioacchino Del Regno --- Changes in v2: - Completely changed approach to make mtk_eint_pin a parameter of mtk_eint_do_init() as suggested by Angelo - Link to v1: https://lore.kernel.org/r/20250519-genio-350-eint-null-ptr-de= ref-fix-v1-1-07445d6d22c3@collabora.com --- drivers/pinctrl/mediatek/mtk-eint.c | 26 ++++++++++----------= ---- drivers/pinctrl/mediatek/mtk-eint.h | 5 +++-- drivers/pinctrl/mediatek/pinctrl-mtk-common-v2.c | 2 +- drivers/pinctrl/mediatek/pinctrl-mtk-common.c | 2 +- 4 files changed, 16 insertions(+), 19 deletions(-) diff --git a/drivers/pinctrl/mediatek/mtk-eint.c b/drivers/pinctrl/mediatek= /mtk-eint.c index 16af6a47028e67bb53db4041a37ebbbb8b9a1e43..d906a5e4101fb10968035fc48e9= cf4a444d063a9 100644 --- a/drivers/pinctrl/mediatek/mtk-eint.c +++ b/drivers/pinctrl/mediatek/mtk-eint.c @@ -22,7 +22,6 @@ #include =20 #include "mtk-eint.h" -#include "pinctrl-mtk-common-v2.h" =20 #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); =20 -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 =3D 0; - struct mtk_pinctrl *hw =3D (struct mtk_pinctrl *)eint->pctl; =20 /* 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; =20 - if (eint->nbase =3D=3D 1) { + if (eint_pin) { + eint->pins =3D eint_pin; + for (i =3D 0; i < eint->hw->ap_num; i++) { + inst =3D eint->pins[i].instance; + if (inst >=3D eint->nbase) + continue; + eint->base_pin_num[inst]++; + } + } else { size =3D eint->hw->ap_num * sizeof(struct mtk_eint_pin); eint->pins =3D devm_kmalloc(eint->dev, size, GFP_KERNEL); if (!eint->pins) @@ -533,16 +539,6 @@ int mtk_eint_do_init(struct mtk_eint *eint) } } =20 - if (hw && hw->soc && hw->soc->eint_pin) { - eint->pins =3D hw->soc->eint_pin; - for (i =3D 0; i < eint->hw->ap_num; i++) { - inst =3D eint->pins[i].instance; - if (inst >=3D eint->nbase) - continue; - eint->base_pin_num[inst]++; - } - } - eint->pin_list =3D devm_kmalloc(eint->dev, eint->nbase * sizeof(u16 *), G= FP_KERNEL); if (!eint->pin_list) goto err_pin_list; @@ -609,7 +605,7 @@ int mtk_eint_do_init(struct mtk_eint *eint) err_wake_mask: devm_kfree(eint->dev, eint->pin_list); err_pin_list: - if (eint->nbase =3D=3D 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..fc31a4c0c77bf28b106943e9292= d0dcc425c4922 100644 --- a/drivers/pinctrl/mediatek/mtk-eint.h +++ b/drivers/pinctrl/mediatek/mtk-eint.h @@ -88,7 +88,7 @@ struct mtk_eint { }; =20 #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); =20 #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/pin= ctrl/mediatek/pinctrl-mtk-common-v2.c index 0884c0700b3ee463c4571f2ac5b0254b5583b54a..4918d38abfc29de1f27ee75bc6a= 51c32b3ca1ac5 100644 --- 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 platf= orm_device *pdev) hw->eint->pctl =3D hw; hw->eint->gpio_xlate =3D &mtk_eint_xt; =20 - ret =3D mtk_eint_do_init(hw->eint); + ret =3D mtk_eint_do_init(hw->eint, hw->soc->eint_pin); if (ret) goto err_free_eint; =20 diff --git a/drivers/pinctrl/mediatek/pinctrl-mtk-common.c b/drivers/pinctr= l/mediatek/pinctrl-mtk-common.c index de7bebb9a6cd98cbe7d77982698073f9c8974e3b..a4cb6d511fcdb36f67f30548636= a0d64c5278840 100644 --- a/drivers/pinctrl/mediatek/pinctrl-mtk-common.c +++ b/drivers/pinctrl/mediatek/pinctrl-mtk-common.c @@ -1044,7 +1044,7 @@ static int mtk_eint_init(struct mtk_pinctrl *pctl, st= ruct platform_device *pdev) pctl->eint->pctl =3D pctl; pctl->eint->gpio_xlate =3D &mtk_eint_xt; =20 - return mtk_eint_do_init(pctl->eint); + return mtk_eint_do_init(pctl->eint, NULL); } =20 /* This is used as a common probe function */ --- base-commit: 8566fc3b96539e3235909d6bdda198e1282beaed change-id: 20250519-genio-350-eint-null-ptr-deref-fix-1a163aa9ad84 Best regards, --=20 N=C3=ADcolas F. R. A. Prado