* [PATCH v2 1/6] pinctrl: tegra186: Fix out-of-bounds register bank index for AON drive groups [not found] <20261119204748.2558209-1-lee@kernel.org> @ 2026-11-19 20:47 ` Lee Jones 2026-11-19 20:47 ` [PATCH v2 2/6] pinctrl: ingenic: Fix element type of x1600_sfc_funcs array Lee Jones ` (4 subsequent siblings) 5 siblings, 0 replies; 6+ messages in thread From: Lee Jones @ 2026-11-19 20:47 UTC (permalink / raw) To: lee, Linus Walleij, Thierry Reding, Jonathan Hunter, Aaron Kling, linux-gpio, linux-tegra, linux-kernel Cc: stable, Thierry Reding The Tegra186 AON pinmux controller has only a single register bank (nbanks = 1, indexed at 0), and all PINGROUP entries in tegra186_aon_groups accordingly specify bank 0. However, all 51 AON drive_* macro definitions pass drv_bank = 1 as the final argument to DRV_PINGROUP_ENTRY_Y, causing any drive configuration read or write on an AON drive group to index pmx->regs[1] out-of-bounds. Update the AON drive_* macro definitions to use register bank 0. Fixes: 542baf77f092 ("pinctrl: tegra: Add Tegra186 pinmux driver") Closes: https://sashiko.dev/#/bug/linux-a9a7165c-c5eb-463a-b7b1-24a30416b33b Cc: stable@vger.kernel.org Reviewed-by: Thierry Reding <treding@nvidia.com> Signed-off-by: Lee Jones <lee@kernel.org> --- v1 => v2: Collect Thierry's Reviewed-by drivers/pinctrl/tegra/pinctrl-tegra186.c | 102 +++++++++++------------ 1 file changed, 51 insertions(+), 51 deletions(-) diff --git a/drivers/pinctrl/tegra/pinctrl-tegra186.c b/drivers/pinctrl/tegra/pinctrl-tegra186.c index 4a1d6476af9b..3bf1814dbd24 100644 --- a/drivers/pinctrl/tegra/pinctrl-tegra186.c +++ b/drivers/pinctrl/tegra/pinctrl-tegra186.c @@ -1585,57 +1585,57 @@ static const char * const tegra186_functions[] = { #define drive_qspi_comp DRV_PINGROUP_ENTRY_N(no_entry) /* AON drive pin groups */ -#define drive_touch_clk_pee2 DRV_PINGROUP_ENTRY_Y(0x2004, 12, 5, 20, 5, -1, -1, -1, -1, 1) -#define drive_uart3_cts_pw5 DRV_PINGROUP_ENTRY_Y(0x200c, 12, 5, 20, 5, -1, -1, -1, -1, 1) -#define drive_uart3_rts_pw4 DRV_PINGROUP_ENTRY_Y(0x2014, 12, 5, 20, 5, -1, -1, -1, -1, 1) -#define drive_uart3_rx_pw3 DRV_PINGROUP_ENTRY_Y(0x201c, 12, 5, 20, 5, -1, -1, -1, -1, 1) -#define drive_uart3_tx_pw2 DRV_PINGROUP_ENTRY_Y(0x2024, 12, 5, 20, 5, -1, -1, -1, -1, 1) -#define drive_gen8_i2c_sda_pw1 DRV_PINGROUP_ENTRY_Y(0x202c, 12, 5, 20, 5, -1, -1, -1, -1, 1) -#define drive_gen8_i2c_scl_pw0 DRV_PINGROUP_ENTRY_Y(0x2034, 12, 5, 20, 5, -1, -1, -1, -1, 1) -#define drive_uart7_rx_pw7 DRV_PINGROUP_ENTRY_Y(0x203c, 12, 5, 20, 5, -1, -1, -1, -1, 1) -#define drive_uart7_tx_pw6 DRV_PINGROUP_ENTRY_Y(0x2044, 12, 5, 20, 5, -1, -1, -1, -1, 1) -#define drive_gpio_sen0_pv0 DRV_PINGROUP_ENTRY_Y(0x204c, 12, 5, 20, 5, -1, -1, -1, -1, 1) -#define drive_gpio_sen1_pv1 DRV_PINGROUP_ENTRY_Y(0x2054, 12, 5, 20, 5, -1, -1, -1, -1, 1) -#define drive_gpio_sen2_pv2 DRV_PINGROUP_ENTRY_Y(0x205c, 12, 5, 20, 5, -1, -1, -1, -1, 1) -#define drive_gpio_sen3_pv3 DRV_PINGROUP_ENTRY_Y(0x2064, 12, 5, 20, 5, -1, -1, -1, -1, 1) -#define drive_gpio_sen4_pv4 DRV_PINGROUP_ENTRY_Y(0x206c, 12, 5, 20, 5, -1, -1, -1, -1, 1) -#define drive_gpio_sen5_pv5 DRV_PINGROUP_ENTRY_Y(0x2074, 12, 5, 20, 5, -1, -1, -1, -1, 1) -#define drive_gpio_sen6_pv6 DRV_PINGROUP_ENTRY_Y(0x207c, 12, 5, 20, 5, -1, -1, -1, -1, 1) -#define drive_gpio_sen7_pv7 DRV_PINGROUP_ENTRY_Y(0x2084, 12, 5, 20, 5, -1, -1, -1, -1, 1) -#define drive_gpio_sen8_pee0 DRV_PINGROUP_ENTRY_Y(0x208c, 12, 5, 20, 5, -1, -1, -1, -1, 1) -#define drive_gpio_sen9_pee1 DRV_PINGROUP_ENTRY_Y(0x2094, 12, 5, 20, 5, -1, -1, -1, -1, 1) -#define drive_can_gpio7_paa7 DRV_PINGROUP_ENTRY_Y(0x3004, -1, -1, -1, -1, 28, 2, 30, 2, 1) -#define drive_can1_dout_pz0 DRV_PINGROUP_ENTRY_Y(0x300C, -1, -1, -1, -1, 28, 2, 30, 2, 1) -#define drive_can1_din_pz1 DRV_PINGROUP_ENTRY_Y(0x3014, -1, -1, -1, -1, 28, 2, 30, 2, 1) -#define drive_can0_dout_pz2 DRV_PINGROUP_ENTRY_Y(0x301c, -1, -1, -1, -1, 28, 2, 30, 2, 1) -#define drive_can0_din_pz3 DRV_PINGROUP_ENTRY_Y(0x3024, -1, -1, -1, -1, 28, 2, 30, 2, 1) -#define drive_can_gpio0_paa0 DRV_PINGROUP_ENTRY_Y(0x302c, -1, -1, -1, -1, 28, 2, 30, 2, 1) -#define drive_can_gpio1_paa1 DRV_PINGROUP_ENTRY_Y(0x3034, -1, -1, -1, -1, 28, 2, 30, 2, 1) -#define drive_can_gpio2_paa2 DRV_PINGROUP_ENTRY_Y(0x303c, -1, -1, -1, -1, 28, 2, 30, 2, 1) -#define drive_can_gpio3_paa3 DRV_PINGROUP_ENTRY_Y(0x3044, -1, -1, -1, -1, 28, 2, 30, 2, 1) -#define drive_can_gpio4_paa4 DRV_PINGROUP_ENTRY_Y(0x304c, -1, -1, -1, -1, 28, 2, 30, 2, 1) -#define drive_can_gpio5_paa5 DRV_PINGROUP_ENTRY_Y(0x3054, -1, -1, -1, -1, 28, 2, 30, 2, 1) -#define drive_can_gpio6_paa6 DRV_PINGROUP_ENTRY_Y(0x305c, -1, -1, -1, -1, 28, 2, 30, 2, 1) -#define drive_gpio_sw1_pff1 DRV_PINGROUP_ENTRY_Y(0x1004, 12, 5, 20, 5, -1, -1, -1, -1, 1) -#define drive_gpio_sw2_pff2 DRV_PINGROUP_ENTRY_Y(0x100c, 12, 5, 20, 5, -1, -1, -1, -1, 1) -#define drive_gpio_sw3_pff3 DRV_PINGROUP_ENTRY_Y(0x1014, 12, 5, 20, 5, -1, -1, -1, -1, 1) -#define drive_gpio_sw4_pff4 DRV_PINGROUP_ENTRY_Y(0x101c, 12, 5, 20, 5, -1, -1, -1, -1, 1) -#define drive_shutdown DRV_PINGROUP_ENTRY_Y(0x1024, 12, 5, 20, 5, -1, -1, -1, -1, 1) -#define drive_pmu_int DRV_PINGROUP_ENTRY_Y(0x102C, 12, 5, 20, 5, -1, -1, -1, -1, 1) -#define drive_safe_state_ps3 DRV_PINGROUP_ENTRY_Y(0x1034, 12, 5, 20, 5, -1, -1, -1, -1, 1) -#define drive_vcomp_alert_ps4 DRV_PINGROUP_ENTRY_Y(0x103c, 12, 5, 20, 5, -1, -1, -1, -1, 1) -#define drive_soc_pwr_req DRV_PINGROUP_ENTRY_Y(0x1044, 12, 5, 20, 5, -1, -1, -1, -1, 1) -#define drive_batt_oc_ps2 DRV_PINGROUP_ENTRY_Y(0x104c, 12, 5, 20, 5, -1, -1, -1, -1, 1) -#define drive_clk_32k_in DRV_PINGROUP_ENTRY_Y(0x1054, 12, 5, 20, 5, -1, -1, -1, -1, 1) -#define drive_power_on_pff0 DRV_PINGROUP_ENTRY_Y(0x105c, 12, 5, 20, 5, -1, -1, -1, -1, 1) -#define drive_pwr_i2c_scl_ps0 DRV_PINGROUP_ENTRY_Y(0x1064, 12, 5, 20, 5, -1, -1, -1, -1, 1) -#define drive_pwr_i2c_sda_ps1 DRV_PINGROUP_ENTRY_Y(0x106c, 12, 5, 20, 5, -1, -1, -1, -1, 1) -#define drive_gpio_dis0_pu0 DRV_PINGROUP_ENTRY_Y(0x1084, 12, 5, 20, 5, -1, -1, -1, -1, 1) -#define drive_gpio_dis1_pu1 DRV_PINGROUP_ENTRY_Y(0x108c, 12, 5, 20, 5, -1, -1, -1, -1, 1) -#define drive_gpio_dis2_pu2 DRV_PINGROUP_ENTRY_Y(0x1094, 12, 5, 20, 5, -1, -1, -1, -1, 1) -#define drive_gpio_dis3_pu3 DRV_PINGROUP_ENTRY_Y(0x109c, 12, 5, 20, 5, -1, -1, -1, -1, 1) -#define drive_gpio_dis4_pu4 DRV_PINGROUP_ENTRY_Y(0x10a4, 12, 5, 20, 5, -1, -1, -1, -1, 1) -#define drive_gpio_dis5_pu5 DRV_PINGROUP_ENTRY_Y(0x10ac, 12, 5, 20, 5, -1, -1, -1, -1, 1) +#define drive_touch_clk_pee2 DRV_PINGROUP_ENTRY_Y(0x2004, 12, 5, 20, 5, -1, -1, -1, -1, 0) +#define drive_uart3_cts_pw5 DRV_PINGROUP_ENTRY_Y(0x200c, 12, 5, 20, 5, -1, -1, -1, -1, 0) +#define drive_uart3_rts_pw4 DRV_PINGROUP_ENTRY_Y(0x2014, 12, 5, 20, 5, -1, -1, -1, -1, 0) +#define drive_uart3_rx_pw3 DRV_PINGROUP_ENTRY_Y(0x201c, 12, 5, 20, 5, -1, -1, -1, -1, 0) +#define drive_uart3_tx_pw2 DRV_PINGROUP_ENTRY_Y(0x2024, 12, 5, 20, 5, -1, -1, -1, -1, 0) +#define drive_gen8_i2c_sda_pw1 DRV_PINGROUP_ENTRY_Y(0x202c, 12, 5, 20, 5, -1, -1, -1, -1, 0) +#define drive_gen8_i2c_scl_pw0 DRV_PINGROUP_ENTRY_Y(0x2034, 12, 5, 20, 5, -1, -1, -1, -1, 0) +#define drive_uart7_rx_pw7 DRV_PINGROUP_ENTRY_Y(0x203c, 12, 5, 20, 5, -1, -1, -1, -1, 0) +#define drive_uart7_tx_pw6 DRV_PINGROUP_ENTRY_Y(0x2044, 12, 5, 20, 5, -1, -1, -1, -1, 0) +#define drive_gpio_sen0_pv0 DRV_PINGROUP_ENTRY_Y(0x204c, 12, 5, 20, 5, -1, -1, -1, -1, 0) +#define drive_gpio_sen1_pv1 DRV_PINGROUP_ENTRY_Y(0x2054, 12, 5, 20, 5, -1, -1, -1, -1, 0) +#define drive_gpio_sen2_pv2 DRV_PINGROUP_ENTRY_Y(0x205c, 12, 5, 20, 5, -1, -1, -1, -1, 0) +#define drive_gpio_sen3_pv3 DRV_PINGROUP_ENTRY_Y(0x2064, 12, 5, 20, 5, -1, -1, -1, -1, 0) +#define drive_gpio_sen4_pv4 DRV_PINGROUP_ENTRY_Y(0x206c, 12, 5, 20, 5, -1, -1, -1, -1, 0) +#define drive_gpio_sen5_pv5 DRV_PINGROUP_ENTRY_Y(0x2074, 12, 5, 20, 5, -1, -1, -1, -1, 0) +#define drive_gpio_sen6_pv6 DRV_PINGROUP_ENTRY_Y(0x207c, 12, 5, 20, 5, -1, -1, -1, -1, 0) +#define drive_gpio_sen7_pv7 DRV_PINGROUP_ENTRY_Y(0x2084, 12, 5, 20, 5, -1, -1, -1, -1, 0) +#define drive_gpio_sen8_pee0 DRV_PINGROUP_ENTRY_Y(0x208c, 12, 5, 20, 5, -1, -1, -1, -1, 0) +#define drive_gpio_sen9_pee1 DRV_PINGROUP_ENTRY_Y(0x2094, 12, 5, 20, 5, -1, -1, -1, -1, 0) +#define drive_can_gpio7_paa7 DRV_PINGROUP_ENTRY_Y(0x3004, -1, -1, -1, -1, 28, 2, 30, 2, 0) +#define drive_can1_dout_pz0 DRV_PINGROUP_ENTRY_Y(0x300C, -1, -1, -1, -1, 28, 2, 30, 2, 0) +#define drive_can1_din_pz1 DRV_PINGROUP_ENTRY_Y(0x3014, -1, -1, -1, -1, 28, 2, 30, 2, 0) +#define drive_can0_dout_pz2 DRV_PINGROUP_ENTRY_Y(0x301c, -1, -1, -1, -1, 28, 2, 30, 2, 0) +#define drive_can0_din_pz3 DRV_PINGROUP_ENTRY_Y(0x3024, -1, -1, -1, -1, 28, 2, 30, 2, 0) +#define drive_can_gpio0_paa0 DRV_PINGROUP_ENTRY_Y(0x302c, -1, -1, -1, -1, 28, 2, 30, 2, 0) +#define drive_can_gpio1_paa1 DRV_PINGROUP_ENTRY_Y(0x3034, -1, -1, -1, -1, 28, 2, 30, 2, 0) +#define drive_can_gpio2_paa2 DRV_PINGROUP_ENTRY_Y(0x303c, -1, -1, -1, -1, 28, 2, 30, 2, 0) +#define drive_can_gpio3_paa3 DRV_PINGROUP_ENTRY_Y(0x3044, -1, -1, -1, -1, 28, 2, 30, 2, 0) +#define drive_can_gpio4_paa4 DRV_PINGROUP_ENTRY_Y(0x304c, -1, -1, -1, -1, 28, 2, 30, 2, 0) +#define drive_can_gpio5_paa5 DRV_PINGROUP_ENTRY_Y(0x3054, -1, -1, -1, -1, 28, 2, 30, 2, 0) +#define drive_can_gpio6_paa6 DRV_PINGROUP_ENTRY_Y(0x305c, -1, -1, -1, -1, 28, 2, 30, 2, 0) +#define drive_gpio_sw1_pff1 DRV_PINGROUP_ENTRY_Y(0x1004, 12, 5, 20, 5, -1, -1, -1, -1, 0) +#define drive_gpio_sw2_pff2 DRV_PINGROUP_ENTRY_Y(0x100c, 12, 5, 20, 5, -1, -1, -1, -1, 0) +#define drive_gpio_sw3_pff3 DRV_PINGROUP_ENTRY_Y(0x1014, 12, 5, 20, 5, -1, -1, -1, -1, 0) +#define drive_gpio_sw4_pff4 DRV_PINGROUP_ENTRY_Y(0x101c, 12, 5, 20, 5, -1, -1, -1, -1, 0) +#define drive_shutdown DRV_PINGROUP_ENTRY_Y(0x1024, 12, 5, 20, 5, -1, -1, -1, -1, 0) +#define drive_pmu_int DRV_PINGROUP_ENTRY_Y(0x102C, 12, 5, 20, 5, -1, -1, -1, -1, 0) +#define drive_safe_state_ps3 DRV_PINGROUP_ENTRY_Y(0x1034, 12, 5, 20, 5, -1, -1, -1, -1, 0) +#define drive_vcomp_alert_ps4 DRV_PINGROUP_ENTRY_Y(0x103c, 12, 5, 20, 5, -1, -1, -1, -1, 0) +#define drive_soc_pwr_req DRV_PINGROUP_ENTRY_Y(0x1044, 12, 5, 20, 5, -1, -1, -1, -1, 0) +#define drive_batt_oc_ps2 DRV_PINGROUP_ENTRY_Y(0x104c, 12, 5, 20, 5, -1, -1, -1, -1, 0) +#define drive_clk_32k_in DRV_PINGROUP_ENTRY_Y(0x1054, 12, 5, 20, 5, -1, -1, -1, -1, 0) +#define drive_power_on_pff0 DRV_PINGROUP_ENTRY_Y(0x105c, 12, 5, 20, 5, -1, -1, -1, -1, 0) +#define drive_pwr_i2c_scl_ps0 DRV_PINGROUP_ENTRY_Y(0x1064, 12, 5, 20, 5, -1, -1, -1, -1, 0) +#define drive_pwr_i2c_sda_ps1 DRV_PINGROUP_ENTRY_Y(0x106c, 12, 5, 20, 5, -1, -1, -1, -1, 0) +#define drive_gpio_dis0_pu0 DRV_PINGROUP_ENTRY_Y(0x1084, 12, 5, 20, 5, -1, -1, -1, -1, 0) +#define drive_gpio_dis1_pu1 DRV_PINGROUP_ENTRY_Y(0x108c, 12, 5, 20, 5, -1, -1, -1, -1, 0) +#define drive_gpio_dis2_pu2 DRV_PINGROUP_ENTRY_Y(0x1094, 12, 5, 20, 5, -1, -1, -1, -1, 0) +#define drive_gpio_dis3_pu3 DRV_PINGROUP_ENTRY_Y(0x109c, 12, 5, 20, 5, -1, -1, -1, -1, 0) +#define drive_gpio_dis4_pu4 DRV_PINGROUP_ENTRY_Y(0x10a4, 12, 5, 20, 5, -1, -1, -1, -1, 0) +#define drive_gpio_dis5_pu5 DRV_PINGROUP_ENTRY_Y(0x10ac, 12, 5, 20, 5, -1, -1, -1, -1, 0) #define PINGROUP(pg_name, f0, f1, f2, f3, r, bank, pupd, e_io_hv, e_lpbk, e_input, e_lpdr, e_pbias_buf, \ gpio_sfio_sel, e_od, schmitt_b, drvtype, epreemp, io_reset, rfu_in) \ -- 2.56.1.750.gf70dc682cf-goog ^ permalink raw reply related [flat|nested] 6+ messages in thread
* [PATCH v2 2/6] pinctrl: ingenic: Fix element type of x1600_sfc_funcs array [not found] <20261119204748.2558209-1-lee@kernel.org> 2026-11-19 20:47 ` [PATCH v2 1/6] pinctrl: tegra186: Fix out-of-bounds register bank index for AON drive groups Lee Jones @ 2026-11-19 20:47 ` Lee Jones 2026-11-19 20:47 ` [PATCH v2 3/6] pinctrl: mediatek: mt7981: Add missing entries to mt7981_ant_sel_funcs Lee Jones ` (3 subsequent siblings) 5 siblings, 0 replies; 6+ messages in thread From: Lee Jones @ 2026-11-19 20:47 UTC (permalink / raw) To: lee, Paul Cercueil, Linus Walleij, Olivier Louvignes, Paul Boddie, zhouyanjie, H. Nikolaus Schaller, Andreas Kemnade, linux-mips, linux-gpio, linux-kernel Cc: stable ingenic_pinmux_set_mux() treats grp->data as a u8 array of per-pin mux modes (u8 *pin_modes = grp->data), and every other *_funcs array in the Ingenic pinctrl driver is declared as u8[]. Because x1600_sfc_funcs[] was declared as int[], indexing pin_modes[0..6] reads the first seven bytes of the int array (0, 0, 0, 0, 0, 0, 0) instead of reading mode 2 for the seventh pin. Change the element type of x1600_sfc_funcs[] from int to u8. Fixes: 4da56f9c6f14 ("pinctrl: ingenic: add x1600 support") Closes: https://sashiko.dev/#/bug/linux-5dccd0ae-9450-440a-87d0-44cc86d1af45 Cc: stable@vger.kernel.org Signed-off-by: Lee Jones <lee@kernel.org> --- v1 => v2: No changes drivers/pinctrl/pinctrl-ingenic.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/pinctrl/pinctrl-ingenic.c b/drivers/pinctrl/pinctrl-ingenic.c index 4d27ec03f15f..d39bb901aaca 100644 --- a/drivers/pinctrl/pinctrl-ingenic.c +++ b/drivers/pinctrl/pinctrl-ingenic.c @@ -2470,7 +2470,7 @@ static int x1600_mac_pins[] = { 0x33, 0x34, 0x35, 0x36, 0x37, 0x38, 0x39, 0x3a, 0x3b, 0x3c, }; -static int x1600_sfc_funcs[] = { 0, 0, 0, 0, 0, 0, 2, }; +static u8 x1600_sfc_funcs[] = { 0, 0, 0, 0, 0, 0, 2, }; static const struct group_desc x1600_groups[] = { INGENIC_PIN_GROUP("uart0-data", x1600_uart0_data, 0), -- 2.56.1.750.gf70dc682cf-goog ^ permalink raw reply related [flat|nested] 6+ messages in thread
* [PATCH v2 3/6] pinctrl: mediatek: mt7981: Add missing entries to mt7981_ant_sel_funcs [not found] <20261119204748.2558209-1-lee@kernel.org> 2026-11-19 20:47 ` [PATCH v2 1/6] pinctrl: tegra186: Fix out-of-bounds register bank index for AON drive groups Lee Jones 2026-11-19 20:47 ` [PATCH v2 2/6] pinctrl: ingenic: Fix element type of x1600_sfc_funcs array Lee Jones @ 2026-11-19 20:47 ` Lee Jones 2026-11-19 20:47 ` [PATCH v2 4/6] pinctrl: mediatek: Guard against NULL eint in mtk_eint_do_suspend() and mtk_eint_do_resume() Lee Jones ` (2 subsequent siblings) 5 siblings, 0 replies; 6+ messages in thread From: Lee Jones @ 2026-11-19 20:47 UTC (permalink / raw) To: lee, Sean Wang, Linus Walleij, Matthias Brugger, AngeloGioacchino Del Regno, Sam Shih, Daniel Golle, Rob Herring, linux-mediatek, linux-gpio, linux-kernel, linux-arm-kernel Cc: stable mt7981_ant_sel_pins[] defines 14 pins (pins 14..25, 34, and 35), all of which select ANT_SEL at function mux mode 6, but mt7981_ant_sel_funcs[] only contains 12 entries. When mtk_pinmux_set_mux() iterates over grp->grp.npins (14), it reads two int elements past the end of mt7981_ant_sel_funcs[]. Add the two missing mode 6 entries to mt7981_ant_sel_funcs[] so its length matches mt7981_ant_sel_pins[]. Fixes: 6c83b2d94fcc ("pinctrl: add mt7981 pinctrl driver") Closes: https://sashiko.dev/#/bug/linux-6233f285-1487-4d2d-afe3-d4ce3c445054 Cc: stable@vger.kernel.org Signed-off-by: Lee Jones <lee@kernel.org> --- v1 => v2: No changes drivers/pinctrl/mediatek/pinctrl-mt7981.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/pinctrl/mediatek/pinctrl-mt7981.c b/drivers/pinctrl/mediatek/pinctrl-mt7981.c index 2325cc8b9345..62fec909408b 100644 --- a/drivers/pinctrl/mediatek/pinctrl-mt7981.c +++ b/drivers/pinctrl/mediatek/pinctrl-mt7981.c @@ -800,7 +800,7 @@ static int mt7981_mt7531_int_funcs[] = { 1, }; /* ANT_SEL */ static int mt7981_ant_sel_pins[] = { 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 34, 35 }; -static int mt7981_ant_sel_funcs[] = { 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6 }; +static int mt7981_ant_sel_funcs[] = { 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6 }; static const struct group_desc mt7981_groups[] = { /* @GPIO(0,1): WA_AICE(2) */ -- 2.56.1.750.gf70dc682cf-goog ^ permalink raw reply related [flat|nested] 6+ messages in thread
* [PATCH v2 4/6] pinctrl: mediatek: Guard against NULL eint in mtk_eint_do_suspend() and mtk_eint_do_resume() [not found] <20261119204748.2558209-1-lee@kernel.org> ` (2 preceding siblings ...) 2026-11-19 20:47 ` [PATCH v2 3/6] pinctrl: mediatek: mt7981: Add missing entries to mt7981_ant_sel_funcs Lee Jones @ 2026-11-19 20:47 ` Lee Jones 2026-11-19 20:47 ` [PATCH v2 5/6] pinctrl: mediatek: Clean up partially initialised hw->eint on error Lee Jones 2026-11-19 20:47 ` [PATCH v2 6/6] pinctrl: mediatek: Prevent divide-by-zero for pins with fixed drive strength Lee Jones 5 siblings, 0 replies; 6+ messages in thread From: Lee Jones @ 2026-11-19 20:47 UTC (permalink / raw) To: lee, Sean Wang, Linus Walleij, Matthias Brugger, AngeloGioacchino Del Regno, Maoguang Meng, Hao Chang, Qingliang Li, Nicolas Boichat, linux-mediatek, linux-gpio, linux-kernel, linux-arm-kernel Cc: stable mtk_paris_pinctrl_probe() treats mtk_build_eint() failure as non-fatal, logging a warning and completing probe with hw->eint left as NULL whenever EINT initialisation is skipped or fails. However, the system sleep callbacks pass pctl->eint unconditionally to mtk_eint_do_suspend() and mtk_eint_do_resume(), both of which dereference eint without checking for NULL. Return 0 early from mtk_eint_do_suspend() and mtk_eint_do_resume() when eint is NULL. Fixes: 5c0904488a20 ("pinctrl: mediatek: Add pm_ops to pinctrl-paris") Cc: stable@vger.kernel.org Signed-off-by: Lee Jones <lee@kernel.org> --- v1 => v2: - New patch, avoiding a NULL dereference on suspend/resume when EINT setup fails (Sashiko) drivers/pinctrl/mediatek/mtk-eint.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/drivers/pinctrl/mediatek/mtk-eint.c b/drivers/pinctrl/mediatek/mtk-eint.c index 827231dc0d24..ca47a416c666 100644 --- a/drivers/pinctrl/mediatek/mtk-eint.c +++ b/drivers/pinctrl/mediatek/mtk-eint.c @@ -427,6 +427,9 @@ static void mtk_eint_irq_handler(struct irq_desc *desc) int mtk_eint_do_suspend(struct mtk_eint *eint) { + if (!eint) + return 0; + mtk_eint_chip_write_mask(eint, eint->wake_mask); return 0; @@ -435,6 +438,9 @@ EXPORT_SYMBOL_GPL(mtk_eint_do_suspend); int mtk_eint_do_resume(struct mtk_eint *eint) { + if (!eint) + return 0; + mtk_eint_chip_write_mask(eint, eint->cur_mask); return 0; -- 2.56.1.750.gf70dc682cf-goog ^ permalink raw reply related [flat|nested] 6+ messages in thread
* [PATCH v2 5/6] pinctrl: mediatek: Clean up partially initialised hw->eint on error [not found] <20261119204748.2558209-1-lee@kernel.org> ` (3 preceding siblings ...) 2026-11-19 20:47 ` [PATCH v2 4/6] pinctrl: mediatek: Guard against NULL eint in mtk_eint_do_suspend() and mtk_eint_do_resume() Lee Jones @ 2026-11-19 20:47 ` Lee Jones 2026-11-19 20:47 ` [PATCH v2 6/6] pinctrl: mediatek: Prevent divide-by-zero for pins with fixed drive strength Lee Jones 5 siblings, 0 replies; 6+ messages in thread From: Lee Jones @ 2026-11-19 20:47 UTC (permalink / raw) To: lee, Sean Wang, Linus Walleij, Matthias Brugger, AngeloGioacchino Del Regno, Bartosz Golaszewski, Hao Chang, Qingliang Li, linux-mediatek, linux-gpio, linux-kernel, linux-arm-kernel Cc: stable In mtk_build_eint(), if of_property_count_strings() fails or hw->eint->nbase is non-positive, the function returns -EINVAL directly after allocating hw->eint without jumping to err_free_base. Because callers such as mtk_paris_pinctrl_probe() and mtk_moore_pinctrl_probe() log a warning and continue probing when mtk_build_eint() fails, leaving hw->eint non-NULL with hw->eint->domain and hw->eint->hw unset causes mtk_gpio_to_irq() and mtk_gpio_set_config() to pass the half-initialised structure into mtk_eint_find_irq() and mtk_eint_set_debounce(), dereferencing NULL pointers. Jump to err_free_base on both error paths so hw->eint is freed and reset to NULL. Fixes: 3ef9f710efcb ("pinctrl: mediatek: Add EINT support for multiple addresses") Closes: https://sashiko.dev/#/bug/linux-0689c07e-ef74-4bc2-b5de-bd2f361124bd Cc: stable@vger.kernel.org Signed-off-by: Lee Jones <lee@kernel.org> --- v1 => v2: - Clarify the commit message regarding mtk_gpio_to_irq() and mtk_gpio_set_config(), while handling NULL eint on suspend/resume in the preceding patch (Sashiko) drivers/pinctrl/mediatek/pinctrl-mtk-common-v2.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/drivers/pinctrl/mediatek/pinctrl-mtk-common-v2.c b/drivers/pinctrl/mediatek/pinctrl-mtk-common-v2.c index bf9d20b59213..95d0455f7d53 100644 --- a/drivers/pinctrl/mediatek/pinctrl-mtk-common-v2.c +++ b/drivers/pinctrl/mediatek/pinctrl-mtk-common-v2.c @@ -382,12 +382,16 @@ int mtk_build_eint(struct mtk_pinctrl *hw, struct platform_device *pdev) return -ENOMEM; count_reg_names = of_property_count_strings(np, "reg-names"); - if (count_reg_names < 0) - return -EINVAL; + if (count_reg_names < 0) { + ret = -EINVAL; + goto err_free_base; + } hw->eint->nbase = count_reg_names - (int)hw->soc->nbase_names; - if (hw->eint->nbase <= 0) - return -EINVAL; + if (hw->eint->nbase <= 0) { + ret = -EINVAL; + goto err_free_base; + } hw->eint->base = devm_kmalloc_array(&pdev->dev, hw->eint->nbase, sizeof(*hw->eint->base), GFP_KERNEL | __GFP_ZERO); -- 2.56.1.750.gf70dc682cf-goog ^ permalink raw reply related [flat|nested] 6+ messages in thread
* [PATCH v2 6/6] pinctrl: mediatek: Prevent divide-by-zero for pins with fixed drive strength [not found] <20261119204748.2558209-1-lee@kernel.org> ` (4 preceding siblings ...) 2026-11-19 20:47 ` [PATCH v2 5/6] pinctrl: mediatek: Clean up partially initialised hw->eint on error Lee Jones @ 2026-11-19 20:47 ` Lee Jones 5 siblings, 0 replies; 6+ messages in thread From: Lee Jones @ 2026-11-19 20:47 UTC (permalink / raw) To: lee, Sean Wang, Linus Walleij, Matthias Brugger, AngeloGioacchino Del Regno, Ryder.Lee, linux-mediatek, linux-gpio, linux-kernel, linux-arm-kernel Cc: stable mtk_drive[] only defines entries for DRV_GRP0 (1) through DRV_GRP4 (5), leaving mtk_drive[DRV_FIXED] (0) zero-initialised with min = 0, max = 0, step = 0, and scal = 0. If mtk_pinconf_drive_set() or mtk_pinconf_drive_set_rev1() is called with arg = 0 on a pin with drv_n == DRV_FIXED, the range check (0 >= 0 && 0 <= 0) succeeds and !(arg % tb->step) divides by zero. Similarly, mtk_pinconf_drive_get() and mtk_pinconf_drive_get_rev1() divide by tb->scal (0) if the pin has drive register fields defined. Return -ENOTSUPP immediately when desc->drv_n == DRV_FIXED. Fixes: c28321979ba8 ("pinctrl: mediatek: add driving strength related support to pinctrl-mtk-common-v2.c") Closes: https://sashiko.dev/#/bug/linux-d3852d37-6806-4c41-a493-f249dd59d0c6 Cc: stable@vger.kernel.org Signed-off-by: Lee Jones <lee@kernel.org> --- v1 => v2: No changes drivers/pinctrl/mediatek/pinctrl-mtk-common-v2.c | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/drivers/pinctrl/mediatek/pinctrl-mtk-common-v2.c b/drivers/pinctrl/mediatek/pinctrl-mtk-common-v2.c index 95d0455f7d53..d0c2292a1bbf 100644 --- a/drivers/pinctrl/mediatek/pinctrl-mtk-common-v2.c +++ b/drivers/pinctrl/mediatek/pinctrl-mtk-common-v2.c @@ -1040,6 +1040,9 @@ int mtk_pinconf_drive_set(struct mtk_pinctrl *hw, const struct mtk_drive_desc *tb; int err = -ENOTSUPP; + if (desc->drv_n == DRV_FIXED) + return -ENOTSUPP; + tb = &mtk_drive[desc->drv_n]; /* 4mA when (e8, e4) = (0, 0) * 8mA when (e8, e4) = (0, 1) @@ -1069,6 +1072,9 @@ int mtk_pinconf_drive_get(struct mtk_pinctrl *hw, const struct mtk_drive_desc *tb; int err, val1, val2; + if (desc->drv_n == DRV_FIXED) + return -ENOTSUPP; + tb = &mtk_drive[desc->drv_n]; err = mtk_hw_get_value(hw, desc, PINCTRL_PIN_REG_E4, &val1); @@ -1095,6 +1101,9 @@ int mtk_pinconf_drive_set_rev1(struct mtk_pinctrl *hw, const struct mtk_drive_desc *tb; int err = -ENOTSUPP; + if (desc->drv_n == DRV_FIXED) + return -ENOTSUPP; + tb = &mtk_drive[desc->drv_n]; if ((arg >= tb->min && arg <= tb->max) && !(arg % tb->step)) { @@ -1116,6 +1125,9 @@ int mtk_pinconf_drive_get_rev1(struct mtk_pinctrl *hw, const struct mtk_drive_desc *tb; int err, val1; + if (desc->drv_n == DRV_FIXED) + return -ENOTSUPP; + tb = &mtk_drive[desc->drv_n]; err = mtk_hw_get_value(hw, desc, PINCTRL_PIN_REG_DRV, &val1); -- 2.56.1.750.gf70dc682cf-goog ^ permalink raw reply related [flat|nested] 6+ messages in thread
end of thread, other threads:[~2026-11-19 20:48 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
[not found] <20261119204748.2558209-1-lee@kernel.org>
2026-11-19 20:47 ` [PATCH v2 1/6] pinctrl: tegra186: Fix out-of-bounds register bank index for AON drive groups Lee Jones
2026-11-19 20:47 ` [PATCH v2 2/6] pinctrl: ingenic: Fix element type of x1600_sfc_funcs array Lee Jones
2026-11-19 20:47 ` [PATCH v2 3/6] pinctrl: mediatek: mt7981: Add missing entries to mt7981_ant_sel_funcs Lee Jones
2026-11-19 20:47 ` [PATCH v2 4/6] pinctrl: mediatek: Guard against NULL eint in mtk_eint_do_suspend() and mtk_eint_do_resume() Lee Jones
2026-11-19 20:47 ` [PATCH v2 5/6] pinctrl: mediatek: Clean up partially initialised hw->eint on error Lee Jones
2026-11-19 20:47 ` [PATCH v2 6/6] pinctrl: mediatek: Prevent divide-by-zero for pins with fixed drive strength Lee Jones
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox