Re: [PATCH v2 1/4] pinctrl: bcm: Fix off-by-one and out-of-bounds access in fsel_get()
From: Andrea della Porta
Date: Fri Nov 13 2026 - 11:21:09 EST
Hi Wang,
On 05:32 Fri 13 Nov , Xiaolei Wang wrote:
> The FSEL field is a 1-based function number: 0 means GPIO, 1..n_funcs
> map to funcs[0..n_funcs - 1], and n_funcs + 1 and above are rejected.
> brcmstb_pinctrl_fsel_get() indexes funcs[] with the raw value instead
> of subtracting one, so readbacks are shifted by one slot: value 8
> indexes funcs[8], past the array end, while 0 is reported as funcs[0]
> instead of GPIO. The setter programs the mux correctly, so only the
> debugfs readback is affected.
>
> Map 0 and out-of-range values back to GPIO, warn on the latter, and
> index funcs[] with fsel - 1. Tested on Raspberry Pi 5 with KASAN: the
> "alt8" readback no longer splats, and field 0 reports GPIO.
>
> Fixes: 657cbf9b24ba ("pinctrl: bcm: Add STB family pin controller driver")
> Cc: Jonathan Bell <jonathan@xxxxxxxxxxxxxxx>
> Cc: Phil Elwell <phil@xxxxxxxxxxxxxxx>
> Cc: stable@xxxxxxxxxxxxxxx
> Reviewed-by: Florian Fainelli <florian.fainelli@xxxxxxxxxxxx>
> Signed-off-by: Xiaolei Wang <wangxiaolei01@xxxxxxxxxxx>
Reviewed-by: Andrea della Porta <andrea.porta@xxxxxxxx>
Thanks!
Andrea
> ---
> drivers/pinctrl/bcm/pinctrl-brcmstb.c | 11 ++++++++++-
> 1 file changed, 10 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/pinctrl/bcm/pinctrl-brcmstb.c b/drivers/pinctrl/bcm/pinctrl-brcmstb.c
> index f46b27155c3c..2b942ca7196b 100644
> --- a/drivers/pinctrl/bcm/pinctrl-brcmstb.c
> +++ b/drivers/pinctrl/bcm/pinctrl-brcmstb.c
> @@ -66,7 +66,16 @@ static unsigned int brcmstb_pinctrl_fsel_get(struct brcmstb_pinctrl *pc,
>
> val = readl(pc->base + BIT_TO_REG(bit));
> fsel = (val >> BIT_TO_SHIFT(bit)) & pc->pin_funcs[pin].func_mask;
> - func = pc->pin_funcs[pin].funcs[fsel];
> +
> + if (!fsel)
> + return pc->func_gpio;
> +
> + if (fsel > pc->pin_funcs[pin].n_funcs) {
> + dev_warn(pc->dev, "invalid fsel %d for pin %u\n", fsel, pin);
> + return pc->func_gpio;
> + }
> +
> + func = pc->pin_funcs[pin].funcs[fsel - 1];
>
> if (func >= pc->func_count)
> func = fsel;
> --
> 2.34.1
>