Re: [PATCH] pinctrl: zynqmp: Ensure function names are NUL terminated

From: David Laight

Date: Tue Nov 17 2026 - 08:16:24 EST


On Tue, 17 Nov 2026 13:09:47 +0530
Sai Krishna Potthuri <sai.krishna.potthuri@xxxxxxx> wrote:

> PM_QID_PINCTRL_GET_FUNCTION_NAME returns the function name in a fixed
> 16-byte field and does not guarantee NUL termination. A 16-character
> name fills the entire field.
> The driver copies this field into a 16-byte buffer and subsequently
> uses it as a C string. For a non-NUL-terminated name, string operations
> can read past the end of the buffer into the adjacent groups pointer.
>
> Reserve an extra byte for the NUL terminator and explicitly terminate
> the copied function name.
>
> Signed-off-by: Sai Krishna Potthuri <sai.krishna.potthuri@xxxxxxx>
> ---
> drivers/pinctrl/pinctrl-zynqmp.c | 7 ++++++-
> 1 file changed, 6 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/pinctrl/pinctrl-zynqmp.c b/drivers/pinctrl/pinctrl-zynqmp.c
> index aba129ead04c..c778133fadc2 100644
> --- a/drivers/pinctrl/pinctrl-zynqmp.c
> +++ b/drivers/pinctrl/pinctrl-zynqmp.c
> @@ -29,7 +29,11 @@
>
> #define ZYNQMP_PIN_PREFIX "MIO"
> #define PINCTRL_GET_FUNC_NAME_RESP_LEN 16
> -#define MAX_FUNC_NAME_LEN 16
> +/*
> + * Firmware returns the name in a fixed-size field and does not guarantee a
> + * NUL terminator. Keep one extra byte for the NUL terminator.
> + */
> +#define MAX_FUNC_NAME_LEN (PINCTRL_GET_FUNC_NAME_RESP_LEN + 1)
> #define MAX_GROUP_PIN 50
> #define MAX_PIN_GROUPS 50
> #define END_OF_FUNCTIONS "END_OF_FUNCTIONS"
> @@ -650,6 +654,7 @@ static void zynqmp_pinctrl_get_function_name(u32 fid, char *name)
> */
> zynqmp_pm_query_data(qdata, payload);
> memcpy(name, payload, PINCTRL_GET_FUNC_NAME_RESP_LEN);
> + name[PINCTRL_GET_FUNC_NAME_RESP_LEN] = '\0';

Too many constants....
You might want to try embedding 'name' in a structure.

Then, at least, you can use sizeof().

David


> }
>
> static int zynqmp_pinctrl_get_num_functions(unsigned int *nfuncs)