[PATCH 02/15] firmware: xilinx: Call va_start after pm feature check

From: Gregory Williams

Date: Wed Nov 18 2026 - 18:32:54 EST


From: Senthil Nathan Thangaraj <senthilnathan.thangaraj@xxxxxxx>

zynqmp_pm_invoke_fw_fn() and zynqmp_pm_invoke_fn() call va_start() before
checking whether the PM API is supported. If the feature check fails, the
function returns early without a matching va_end().

Per the C standard, every va_start() must be paired with va_end() on every
exit path; calling va_start() and returning without va_end() is undefined
behavior.

Move va_start() to after the feature check so it is only invoked when the
va_list will actually be consumed.

Fixes: f922b16aa5fa ("firmware: xilinx: Update firmware call interface to support additional args")
Fixes: 92fb71333d57 ("firmware: xilinx: add support for new SMC call format")
Signed-off-by: Michal Simek <michal.simek@xxxxxxx>
Signed-off-by: Senthil Nathan Thangaraj <senthilnathan.thangaraj@xxxxxxx>
---
drivers/firmware/xilinx/zynqmp.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/drivers/firmware/xilinx/zynqmp.c b/drivers/firmware/xilinx/zynqmp.c
index 940306079a78..e264a1914f06 100644
--- a/drivers/firmware/xilinx/zynqmp.c
+++ b/drivers/firmware/xilinx/zynqmp.c
@@ -457,13 +457,13 @@ int zynqmp_pm_invoke_fw_fn(u32 pm_api_id, u32 *ret_payload, u32 num_args, ...)
if (num_args > SMC_ARG_CNT_32)
return -EINVAL;

- va_start(arg_list, num_args);
-
/* Check if feature is supported or not */
ret = zynqmp_pm_feature(pm_api_id);
if (ret < 0)
return ret;

+ va_start(arg_list, num_args);
+
for (i = 0; i < num_args; i++)
args[i] = va_arg(arg_list, u32);

@@ -520,13 +520,13 @@ int zynqmp_pm_invoke_fn(u32 pm_api_id, u32 *ret_payload, u32 num_args, ...)
if (num_args > 14)
return -EINVAL;

- va_start(arg_list, num_args);
-
/* Check if feature is supported or not */
ret = zynqmp_pm_feature(pm_api_id);
if (ret < 0)
return ret;

+ va_start(arg_list, num_args);
+
for (i = 0; i < num_args; i++)
args[i] = va_arg(arg_list, u32);

--
2.34.1