[PATCH 0/5] fix dfu alt buffer clearing

[PATCH 0/5] fix dfu alt buffer clearing

[Vincent Stehlé]

Hi,

This patch series applies the same fix in five different locations (the
detailed description of the fix is in the patches).

I did validate statically by looking at the assembly before/after for all
five cases, using the following defconfigs:

  stm32mp15_defconfig
  synquacer_developerbox_defconfig
  xilinx_versal_virt_defconfig
  xilinx_zynq_virt_defconfig
  xilinx_zynqmp_kria_defconfig

Best regards,
Vincent.


Vincent Stehlé (5):
  fwu: developerbox: fix dfu alt buffer clearing
  board: st: common: fix dfu alt buffer clearing
  arm64: versal: fix dfu alt buffer clearing
  xilinx: zynq: fix dfu alt buffer clearing
  arm64: zynqmp: fix dfu alt buffer clearing

 board/socionext/developerbox/fwu_plat.c | 2 +-
 board/st/common/stm32mp_dfu.c           | 2 +-
 board/xilinx/versal/board.c             | 2 +-
 board/xilinx/zynq/board.c               | 2 +-
 board/xilinx/zynqmp/zynqmp.c            | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

-- 
2.47.2

[PATCH 1/5] fwu: developerbox: fix dfu alt buffer clearing

[Vincent Stehlé]

The set_dfu_alt_info() function calls the ALLOC_CACHE_ALIGN_BUFFER()
macro to declare a `buf' variable pointer into an array allocated on the
stack. It then calls the memset() function to clear the useable portion
of the array using the idiomatic expression `sizeof(buf)'.

While this would indeed work fine for an array, in the present case we
end up clearing only the size of a pointer.
Fix this by specifying the explicit size `DFU_ALT_BUF_LEN' instead.

Fixes: 6b403ca4dcf4 ("fwu: DeveloperBox: add support for FWU")
Signed-off-by: Vincent Stehlé <vincent.stehle@arm.com>
Cc: Masahisa Kojima <kojima.masahisa@socionext.com>
Cc: Tom Rini <trini@konsulko.com>
Cc: Jassi Brar <jaswinder.singh@linaro.org>
---
 board/socionext/developerbox/fwu_plat.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/board/socionext/developerbox/fwu_plat.c b/board/socionext/developerbox/fwu_plat.c
index 26031795b09..a8b111477ef 100644
--- a/board/socionext/developerbox/fwu_plat.c
+++ b/board/socionext/developerbox/fwu_plat.c
@@ -18,7 +18,7 @@ void set_dfu_alt_info(char *interface, char *devstr)
 	struct mtd_info *mtd;
 	int ret;
 
-	memset(buf, 0, sizeof(buf));
+	memset(buf, 0, DFU_ALT_BUF_LEN);
 
 	mtd_probe_devices();
 
-- 
2.47.2

Re: [PATCH 1/5] fwu: developerbox: fix dfu alt buffer clearing

[Mattijs Korpershoek]

Hi Vincent,

Thank you for the patch.

On lun., avril 07, 2025 at 19:05, Vincent Stehlé <vincent.stehle@arm.com> wrote:

> The set_dfu_alt_info() function calls the ALLOC_CACHE_ALIGN_BUFFER()
> macro to declare a `buf' variable pointer into an array allocated on the
> stack. It then calls the memset() function to clear the useable portion
> of the array using the idiomatic expression `sizeof(buf)'.
>
> While this would indeed work fine for an array, in the present case we
> end up clearing only the size of a pointer.
> Fix this by specifying the explicit size `DFU_ALT_BUF_LEN' instead.
>
> Fixes: 6b403ca4dcf4 ("fwu: DeveloperBox: add support for FWU")
> Signed-off-by: Vincent Stehlé <vincent.stehle@arm.com>
> Cc: Masahisa Kojima <kojima.masahisa@socionext.com>
> Cc: Tom Rini <trini@konsulko.com>
> Cc: Jassi Brar <jaswinder.singh@linaro.org>

Reviewed-by: Mattijs Korpershoek <mkorpershoek@kernel.org>

> ---
>  board/socionext/developerbox/fwu_plat.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/board/socionext/developerbox/fwu_plat.c b/board/socionext/developerbox/fwu_plat.c
> index 26031795b09..a8b111477ef 100644
> --- a/board/socionext/developerbox/fwu_plat.c
> +++ b/board/socionext/developerbox/fwu_plat.c
> @@ -18,7 +18,7 @@ void set_dfu_alt_info(char *interface, char *devstr)
>  	struct mtd_info *mtd;
>  	int ret;
>  
> -	memset(buf, 0, sizeof(buf));
> +	memset(buf, 0, DFU_ALT_BUF_LEN);
>  
>  	mtd_probe_devices();
>  
> -- 
> 2.47.2

[PATCH 2/5] board: st: common: fix dfu alt buffer clearing

[Vincent Stehlé]

The set_dfu_alt_info() function calls the ALLOC_CACHE_ALIGN_BUFFER()
macro to declare a `buf' variable pointer into an array allocated on the
stack. It then calls the memset() function to clear the useable portion
of the array using the idiomatic expression `sizeof(buf)'.

While this would indeed work fine for an array, in the present case we
end up clearing only the size of a pointer.
Fix this by specifying the explicit size `DFU_ALT_BUF_LEN' instead.

Fixes: ec2933e543df ("board: stm32mp1: move set_dfu_alt_info in st common directory")
Signed-off-by: Vincent Stehlé <vincent.stehle@arm.com>
Cc: Patrick Delaunay <patrick.delaunay@foss.st.com>
Cc: Patrice Chotard <patrice.chotard@foss.st.com>
Cc: Tom Rini <trini@konsulko.com>
Cc: Marek Vasut <marex@denx.de>
---
 board/st/common/stm32mp_dfu.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/board/st/common/stm32mp_dfu.c b/board/st/common/stm32mp_dfu.c
index 1db8e45480e..8c1f80b678a 100644
--- a/board/st/common/stm32mp_dfu.c
+++ b/board/st/common/stm32mp_dfu.c
@@ -105,7 +105,7 @@ void set_dfu_alt_info(char *interface, char *devstr)
 	if (env_get("dfu_alt_info"))
 		return;
 
-	memset(buf, 0, sizeof(buf));
+	memset(buf, 0, DFU_ALT_BUF_LEN);
 
 	snprintf(buf, DFU_ALT_BUF_LEN,
 		 "ram 0=%s", CONFIG_DFU_ALT_RAM0);
-- 
2.47.2

Re: [PATCH 2/5] board: st: common: fix dfu alt buffer clearing

[Mattijs Korpershoek]

Hi Vincent,

Thank you for the patch.

On lun., avril 07, 2025 at 19:05, Vincent Stehlé <vincent.stehle@arm.com> wrote:

> The set_dfu_alt_info() function calls the ALLOC_CACHE_ALIGN_BUFFER()
> macro to declare a `buf' variable pointer into an array allocated on the
> stack. It then calls the memset() function to clear the useable portion
> of the array using the idiomatic expression `sizeof(buf)'.
>
> While this would indeed work fine for an array, in the present case we
> end up clearing only the size of a pointer.
> Fix this by specifying the explicit size `DFU_ALT_BUF_LEN' instead.
>
> Fixes: ec2933e543df ("board: stm32mp1: move set_dfu_alt_info in st common directory")
> Signed-off-by: Vincent Stehlé <vincent.stehle@arm.com>
> Cc: Patrick Delaunay <patrick.delaunay@foss.st.com>
> Cc: Patrice Chotard <patrice.chotard@foss.st.com>
> Cc: Tom Rini <trini@konsulko.com>
> Cc: Marek Vasut <marex@denx.de>

Reviewed-by: Mattijs Korpershoek <mkorpershoek@kernel.org>

> ---
>  board/st/common/stm32mp_dfu.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/board/st/common/stm32mp_dfu.c b/board/st/common/stm32mp_dfu.c
> index 1db8e45480e..8c1f80b678a 100644
> --- a/board/st/common/stm32mp_dfu.c
> +++ b/board/st/common/stm32mp_dfu.c
> @@ -105,7 +105,7 @@ void set_dfu_alt_info(char *interface, char *devstr)
>  	if (env_get("dfu_alt_info"))
>  		return;
>  
> -	memset(buf, 0, sizeof(buf));
> +	memset(buf, 0, DFU_ALT_BUF_LEN);
>  
>  	snprintf(buf, DFU_ALT_BUF_LEN,
>  		 "ram 0=%s", CONFIG_DFU_ALT_RAM0);
> -- 
> 2.47.2

Re: [PATCH 2/5] board: st: common: fix dfu alt buffer clearing

[Mattijs Korpershoek]

On lun., avril 14, 2025 at 14:24, Mattijs Korpershoek <mkorpershoek@kernel.org> wrote:

> Hi Vincent,
>
> Thank you for the patch.
>
> On lun., avril 07, 2025 at 19:05, Vincent Stehlé <vincent.stehle@arm.com> wrote:
>
>> The set_dfu_alt_info() function calls the ALLOC_CACHE_ALIGN_BUFFER()
>> macro to declare a `buf' variable pointer into an array allocated on the
>> stack. It then calls the memset() function to clear the useable portion
>> of the array using the idiomatic expression `sizeof(buf)'.
>>
>> While this would indeed work fine for an array, in the present case we
>> end up clearing only the size of a pointer.
>> Fix this by specifying the explicit size `DFU_ALT_BUF_LEN' instead.
>>
>> Fixes: ec2933e543df ("board: stm32mp1: move set_dfu_alt_info in st common directory")
>> Signed-off-by: Vincent Stehlé <vincent.stehle@arm.com>
>> Cc: Patrick Delaunay <patrick.delaunay@foss.st.com>
>> Cc: Patrice Chotard <patrice.chotard@foss.st.com>
>> Cc: Tom Rini <trini@konsulko.com>
>> Cc: Marek Vasut <marex@denx.de>
>
> Reviewed-by: Mattijs Korpershoek <mkorpershoek@kernel.org>

Patrice, Patrick,

This was assigned to me on patchwork. As [3-5] have been applied already
by Michal, could you please pick this up?

I've assigned it to Patrice on patchwork.

>
>> ---
>>  board/st/common/stm32mp_dfu.c | 2 +-
>>  1 file changed, 1 insertion(+), 1 deletion(-)
>>
>> diff --git a/board/st/common/stm32mp_dfu.c b/board/st/common/stm32mp_dfu.c
>> index 1db8e45480e..8c1f80b678a 100644
>> --- a/board/st/common/stm32mp_dfu.c
>> +++ b/board/st/common/stm32mp_dfu.c
>> @@ -105,7 +105,7 @@ void set_dfu_alt_info(char *interface, char *devstr)
>>  	if (env_get("dfu_alt_info"))
>>  		return;
>>  
>> -	memset(buf, 0, sizeof(buf));
>> +	memset(buf, 0, DFU_ALT_BUF_LEN);
>>  
>>  	snprintf(buf, DFU_ALT_BUF_LEN,
>>  		 "ram 0=%s", CONFIG_DFU_ALT_RAM0);
>> -- 
>> 2.47.2

Re: [PATCH 2/5] board: st: common: fix dfu alt buffer clearing

[Patrice CHOTARD]

On 4/7/25 19:05, Vincent Stehlé wrote:
> The set_dfu_alt_info() function calls the ALLOC_CACHE_ALIGN_BUFFER()
> macro to declare a `buf' variable pointer into an array allocated on the
> stack. It then calls the memset() function to clear the useable portion
> of the array using the idiomatic expression `sizeof(buf)'.
> 
> While this would indeed work fine for an array, in the present case we
> end up clearing only the size of a pointer.
> Fix this by specifying the explicit size `DFU_ALT_BUF_LEN' instead.
> 
> Fixes: ec2933e543df ("board: stm32mp1: move set_dfu_alt_info in st common directory")
> Signed-off-by: Vincent Stehlé <vincent.stehle@arm.com>
> Cc: Patrick Delaunay <patrick.delaunay@foss.st.com>
> Cc: Patrice Chotard <patrice.chotard@foss.st.com>
> Cc: Tom Rini <trini@konsulko.com>
> Cc: Marek Vasut <marex@denx.de>
> ---
>  board/st/common/stm32mp_dfu.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/board/st/common/stm32mp_dfu.c b/board/st/common/stm32mp_dfu.c
> index 1db8e45480e..8c1f80b678a 100644
> --- a/board/st/common/stm32mp_dfu.c
> +++ b/board/st/common/stm32mp_dfu.c
> @@ -105,7 +105,7 @@ void set_dfu_alt_info(char *interface, char *devstr)
>  	if (env_get("dfu_alt_info"))
>  		return;
>  
> -	memset(buf, 0, sizeof(buf));
> +	memset(buf, 0, DFU_ALT_BUF_LEN);
>  
>  	snprintf(buf, DFU_ALT_BUF_LEN,
>  		 "ram 0=%s", CONFIG_DFU_ALT_RAM0);

Hi Vincent,

Reviewed-by: Patrice Chotard <patrice.chotard@foss.st.com>

Thanks

Re: [PATCH 2/5] board: st: common: fix dfu alt buffer clearing

[Patrice CHOTARD]

On 4/22/25 09:32, Patrice CHOTARD wrote:
> 
> 
> On 4/7/25 19:05, Vincent Stehlé wrote:
>> The set_dfu_alt_info() function calls the ALLOC_CACHE_ALIGN_BUFFER()
>> macro to declare a `buf' variable pointer into an array allocated on the
>> stack. It then calls the memset() function to clear the useable portion
>> of the array using the idiomatic expression `sizeof(buf)'.
>>
>> While this would indeed work fine for an array, in the present case we
>> end up clearing only the size of a pointer.
>> Fix this by specifying the explicit size `DFU_ALT_BUF_LEN' instead.
>>
>> Fixes: ec2933e543df ("board: stm32mp1: move set_dfu_alt_info in st common directory")
>> Signed-off-by: Vincent Stehlé <vincent.stehle@arm.com>
>> Cc: Patrick Delaunay <patrick.delaunay@foss.st.com>
>> Cc: Patrice Chotard <patrice.chotard@foss.st.com>
>> Cc: Tom Rini <trini@konsulko.com>
>> Cc: Marek Vasut <marex@denx.de>
>> ---
>>  board/st/common/stm32mp_dfu.c | 2 +-
>>  1 file changed, 1 insertion(+), 1 deletion(-)
>>
>> diff --git a/board/st/common/stm32mp_dfu.c b/board/st/common/stm32mp_dfu.c
>> index 1db8e45480e..8c1f80b678a 100644
>> --- a/board/st/common/stm32mp_dfu.c
>> +++ b/board/st/common/stm32mp_dfu.c
>> @@ -105,7 +105,7 @@ void set_dfu_alt_info(char *interface, char *devstr)
>>  	if (env_get("dfu_alt_info"))
>>  		return;
>>  
>> -	memset(buf, 0, sizeof(buf));
>> +	memset(buf, 0, DFU_ALT_BUF_LEN);
>>  
>>  	snprintf(buf, DFU_ALT_BUF_LEN,
>>  		 "ram 0=%s", CONFIG_DFU_ALT_RAM0);
> 
> Hi Vincent,
> 
> Reviewed-by: Patrice Chotard <patrice.chotard@foss.st.com>
> 
> Thanks
Applied to u-boot-stm32/master

Thanks
Patrice

[PATCH 3/5] arm64: versal: fix dfu alt buffer clearing

[Vincent Stehlé]

The set_dfu_alt_info() function calls the ALLOC_CACHE_ALIGN_BUFFER()
macro to declare a `buf' variable pointer into an array allocated on the
stack. It then calls the memset() function to clear the useable portion
of the array using the idiomatic expression `sizeof(buf)'.

While this would indeed work fine for an array, in the present case we
end up clearing only the size of a pointer.
Fix this by specifying the explicit size `DFU_ALT_BUF_LEN' instead.

Fixes: 064c8978b44f ("arm64: versal: Enable capsule update (SD)")
Signed-off-by: Vincent Stehlé <vincent.stehle@arm.com>
Cc: Michal Simek <michal.simek@amd.com>
Cc: Tom Rini <trini@konsulko.com>
---
 board/xilinx/versal/board.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/board/xilinx/versal/board.c b/board/xilinx/versal/board.c
index b4483d00ad1..3edccc979d8 100644
--- a/board/xilinx/versal/board.c
+++ b/board/xilinx/versal/board.c
@@ -396,7 +396,7 @@ void set_dfu_alt_info(char *interface, char *devstr)
 	if (env_get("dfu_alt_info"))
 		return;
 
-	memset(buf, 0, sizeof(buf));
+	memset(buf, 0, DFU_ALT_BUF_LEN);
 
 	multiboot = env_get_hex("multiboot", multiboot);
 
-- 
2.47.2

RE: [PATCH 3/5] arm64: versal: fix dfu alt buffer clearing

[Begari, Padmarao]

[AMD Official Use Only - AMD Internal Distribution Only]

> From: U-Boot <u-boot-bounces@lists.denx.de> On Behalf Of Vincent Stehlé
> Sent: Monday, April 7, 2025 10:35 PM
> To: u-boot@lists.denx.de
> Cc: Vincent Stehlé <vincent.stehle@arm.com>; Jassi Brar
> <jaswinder.singh@linaro.org>; Marek Vasut <marex@denx.de>; Masahisa Kojima
> <kojima.masahisa@socionext.com>; Simek, Michal <michal.simek@amd.com>;
> Patrice Chotard <patrice.chotard@foss.st.com>; Patrick Delaunay
> <patrick.delaunay@foss.st.com>; Tom Rini <trini@konsulko.com>
> Subject: [PATCH 3/5] arm64: versal: fix dfu alt buffer clearing
>
> Caution: This message originated from an External Source. Use proper caution
> when opening attachments, clicking links, or responding.
>
>
> The set_dfu_alt_info() function calls the ALLOC_CACHE_ALIGN_BUFFER() macro
> to declare a `buf' variable pointer into an array allocated on the stack. It then calls
> the memset() function to clear the useable portion of the array using the idiomatic
> expression `sizeof(buf)'.
>
> While this would indeed work fine for an array, in the present case we end up
> clearing only the size of a pointer.
> Fix this by specifying the explicit size `DFU_ALT_BUF_LEN' instead.
>
> Fixes: 064c8978b44f ("arm64: versal: Enable capsule update (SD)")
> Signed-off-by: Vincent Stehlé <vincent.stehle@arm.com>
> Cc: Michal Simek <michal.simek@amd.com>
> Cc: Tom Rini <trini@konsulko.com>

Acked-by: Padmarao Begari <padmarao.begari@amd.com>

> ---
>  board/xilinx/versal/board.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/board/xilinx/versal/board.c b/board/xilinx/versal/board.c index
> b4483d00ad1..3edccc979d8 100644
> --- a/board/xilinx/versal/board.c
> +++ b/board/xilinx/versal/board.c
> @@ -396,7 +396,7 @@ void set_dfu_alt_info(char *interface, char *devstr)
>         if (env_get("dfu_alt_info"))
>                 return;
>
> -       memset(buf, 0, sizeof(buf));
> +       memset(buf, 0, DFU_ALT_BUF_LEN);
>
>         multiboot = env_get_hex("multiboot", multiboot);
>
> --
> 2.47.2

Re: [PATCH 3/5] arm64: versal: fix dfu alt buffer clearing

[Michal Simek]

On 4/7/25 19:05, Vincent Stehlé wrote:
> The set_dfu_alt_info() function calls the ALLOC_CACHE_ALIGN_BUFFER()
> macro to declare a `buf' variable pointer into an array allocated on the
> stack. It then calls the memset() function to clear the useable portion
> of the array using the idiomatic expression `sizeof(buf)'.
> 
> While this would indeed work fine for an array, in the present case we
> end up clearing only the size of a pointer.
> Fix this by specifying the explicit size `DFU_ALT_BUF_LEN' instead.
> 
> Fixes: 064c8978b44f ("arm64: versal: Enable capsule update (SD)")
> Signed-off-by: Vincent Stehlé <vincent.stehle@arm.com>
> Cc: Michal Simek <michal.simek@amd.com>
> Cc: Tom Rini <trini@konsulko.com>
> ---
>   board/xilinx/versal/board.c | 2 +-
>   1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/board/xilinx/versal/board.c b/board/xilinx/versal/board.c
> index b4483d00ad1..3edccc979d8 100644
> --- a/board/xilinx/versal/board.c
> +++ b/board/xilinx/versal/board.c
> @@ -396,7 +396,7 @@ void set_dfu_alt_info(char *interface, char *devstr)
>   	if (env_get("dfu_alt_info"))
>   		return;
>   
> -	memset(buf, 0, sizeof(buf));
> +	memset(buf, 0, DFU_ALT_BUF_LEN);
>   
>   	multiboot = env_get_hex("multiboot", multiboot);
>   

Applied.
M

[PATCH 4/5] xilinx: zynq: fix dfu alt buffer clearing

[Vincent Stehlé]

The set_dfu_alt_info() function calls the ALLOC_CACHE_ALIGN_BUFFER()
macro to declare a `buf' variable pointer into an array allocated on the
stack. It then calls the memset() function to clear the useable portion
of the array using the idiomatic expression `sizeof(buf)'.

While this would indeed work fine for an array, in the present case we
end up clearing only the size of a pointer.
Fix this by specifying the explicit size `DFU_ALT_BUF_LEN' instead.

Fixes: c67fecd2125b ("ARM: zynq: Enable capsule update for qspi and mmc")
Signed-off-by: Vincent Stehlé <vincent.stehle@arm.com>
Cc: Michal Simek <michal.simek@amd.com>
Cc: Tom Rini <trini@konsulko.com>
---
 board/xilinx/zynq/board.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/board/xilinx/zynq/board.c b/board/xilinx/zynq/board.c
index 8dbfa560423..d8d4d5022ae 100644
--- a/board/xilinx/zynq/board.c
+++ b/board/xilinx/zynq/board.c
@@ -176,7 +176,7 @@ void set_dfu_alt_info(char *interface, char *devstr)
 	if (env_get("dfu_alt_info"))
 		return;
 
-	memset(buf, 0, sizeof(buf));
+	memset(buf, 0, DFU_ALT_BUF_LEN);
 
 	switch ((zynq_slcr_get_boot_mode()) & ZYNQ_BM_MASK) {
 #if defined(CONFIG_SPL_FS_LOAD_PAYLOAD_NAME)
-- 
2.47.2

RE: [PATCH 4/5] xilinx: zynq: fix dfu alt buffer clearing

[Begari, Padmarao]

[AMD Official Use Only - AMD Internal Distribution Only]

> From: U-Boot <u-boot-bounces@lists.denx.de> On Behalf Of Vincent Stehlé
> Sent: Monday, April 7, 2025 10:35 PM
> To: u-boot@lists.denx.de
> Cc: Vincent Stehlé <vincent.stehle@arm.com>; Jassi Brar
> <jaswinder.singh@linaro.org>; Marek Vasut <marex@denx.de>; Masahisa Kojima
> <kojima.masahisa@socionext.com>; Simek, Michal <michal.simek@amd.com>;
> Patrice Chotard <patrice.chotard@foss.st.com>; Patrick Delaunay
> <patrick.delaunay@foss.st.com>; Tom Rini <trini@konsulko.com>
> Subject: [PATCH 4/5] xilinx: zynq: fix dfu alt buffer clearing
>
> Caution: This message originated from an External Source. Use proper caution
> when opening attachments, clicking links, or responding.
>
>
> The set_dfu_alt_info() function calls the ALLOC_CACHE_ALIGN_BUFFER() macro
> to declare a `buf' variable pointer into an array allocated on the stack. It then calls
> the memset() function to clear the useable portion of the array using the idiomatic
> expression `sizeof(buf)'.
>
> While this would indeed work fine for an array, in the present case we end up
> clearing only the size of a pointer.
> Fix this by specifying the explicit size `DFU_ALT_BUF_LEN' instead.
>
> Fixes: c67fecd2125b ("ARM: zynq: Enable capsule update for qspi and mmc")
> Signed-off-by: Vincent Stehlé <vincent.stehle@arm.com>
> Cc: Michal Simek <michal.simek@amd.com>
> Cc: Tom Rini <trini@konsulko.com>

Acked-by: Padmarao Begari <padmarao.begari@amd.com>

> ---
>  board/xilinx/zynq/board.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/board/xilinx/zynq/board.c b/board/xilinx/zynq/board.c index
> 8dbfa560423..d8d4d5022ae 100644
> --- a/board/xilinx/zynq/board.c
> +++ b/board/xilinx/zynq/board.c
> @@ -176,7 +176,7 @@ void set_dfu_alt_info(char *interface, char *devstr)
>         if (env_get("dfu_alt_info"))
>                 return;
>
> -       memset(buf, 0, sizeof(buf));
> +       memset(buf, 0, DFU_ALT_BUF_LEN);
>
>         switch ((zynq_slcr_get_boot_mode()) & ZYNQ_BM_MASK) {  #if
> defined(CONFIG_SPL_FS_LOAD_PAYLOAD_NAME)
> --
> 2.47.2

Re: [PATCH 4/5] xilinx: zynq: fix dfu alt buffer clearing

[Michal Simek]

On 4/7/25 19:05, Vincent Stehlé wrote:
> The set_dfu_alt_info() function calls the ALLOC_CACHE_ALIGN_BUFFER()
> macro to declare a `buf' variable pointer into an array allocated on the
> stack. It then calls the memset() function to clear the useable portion
> of the array using the idiomatic expression `sizeof(buf)'.
> 
> While this would indeed work fine for an array, in the present case we
> end up clearing only the size of a pointer.
> Fix this by specifying the explicit size `DFU_ALT_BUF_LEN' instead.
> 
> Fixes: c67fecd2125b ("ARM: zynq: Enable capsule update for qspi and mmc")
> Signed-off-by: Vincent Stehlé <vincent.stehle@arm.com>
> Cc: Michal Simek <michal.simek@amd.com>
> Cc: Tom Rini <trini@konsulko.com>
> ---
>   board/xilinx/zynq/board.c | 2 +-
>   1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/board/xilinx/zynq/board.c b/board/xilinx/zynq/board.c
> index 8dbfa560423..d8d4d5022ae 100644
> --- a/board/xilinx/zynq/board.c
> +++ b/board/xilinx/zynq/board.c
> @@ -176,7 +176,7 @@ void set_dfu_alt_info(char *interface, char *devstr)
>   	if (env_get("dfu_alt_info"))
>   		return;
>   
> -	memset(buf, 0, sizeof(buf));
> +	memset(buf, 0, DFU_ALT_BUF_LEN);
>   
>   	switch ((zynq_slcr_get_boot_mode()) & ZYNQ_BM_MASK) {
>   #if defined(CONFIG_SPL_FS_LOAD_PAYLOAD_NAME)

Applied.
M

[PATCH 5/5] arm64: zynqmp: fix dfu alt buffer clearing

[Vincent Stehlé]

The set_dfu_alt_info() function calls the ALLOC_CACHE_ALIGN_BUFFER()
macro to declare a `buf' variable pointer into an array allocated on the
stack. It then calls the memset() function to clear the useable portion
of the array using the idiomatic expression `sizeof(buf)'.

While this would indeed work fine for an array, in the present case we
end up clearing only the size of a pointer.
Fix this by specifying the explicit size `DFU_ALT_BUF_LEN' instead.

Fixes: b86f43de0be0 ("xilinx: zynqmp: Add support for runtime dfu_alt_info setup")
Signed-off-by: Vincent Stehlé <vincent.stehle@arm.com>
Cc: Michal Simek <michal.simek@amd.com>
Cc: Tom Rini <trini@konsulko.com>
---
 board/xilinx/zynqmp/zynqmp.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/board/xilinx/zynqmp/zynqmp.c b/board/xilinx/zynqmp/zynqmp.c
index 820fb252a3f..687dcd3ac9d 100644
--- a/board/xilinx/zynqmp/zynqmp.c
+++ b/board/xilinx/zynqmp/zynqmp.c
@@ -669,7 +669,7 @@ void set_dfu_alt_info(char *interface, char *devstr)
 	if (env_get("dfu_alt_info"))
 		return;
 
-	memset(buf, 0, sizeof(buf));
+	memset(buf, 0, DFU_ALT_BUF_LEN);
 
 	multiboot = multi_boot();
 	if (multiboot < 0)
-- 
2.47.2

RE: [PATCH 5/5] arm64: zynqmp: fix dfu alt buffer clearing

[Begari, Padmarao]

[AMD Official Use Only - AMD Internal Distribution Only]

> From: U-Boot <u-boot-bounces@lists.denx.de> On Behalf Of Vincent Stehlé
> Sent: Monday, April 7, 2025 10:35 PM
> To: u-boot@lists.denx.de
> Cc: Vincent Stehlé <vincent.stehle@arm.com>; Jassi Brar
> <jaswinder.singh@linaro.org>; Marek Vasut <marex@denx.de>; Masahisa Kojima
> <kojima.masahisa@socionext.com>; Simek, Michal <michal.simek@amd.com>;
> Patrice Chotard <patrice.chotard@foss.st.com>; Patrick Delaunay
> <patrick.delaunay@foss.st.com>; Tom Rini <trini@konsulko.com>
> Subject: [PATCH 5/5] arm64: zynqmp: fix dfu alt buffer clearing
>
> Caution: This message originated from an External Source. Use proper caution
> when opening attachments, clicking links, or responding.
>
>
> The set_dfu_alt_info() function calls the ALLOC_CACHE_ALIGN_BUFFER() macro
> to declare a `buf' variable pointer into an array allocated on the stack. It then calls
> the memset() function to clear the useable portion of the array using the idiomatic
> expression `sizeof(buf)'.
>
> While this would indeed work fine for an array, in the present case we end up
> clearing only the size of a pointer.
> Fix this by specifying the explicit size `DFU_ALT_BUF_LEN' instead.
>
> Fixes: b86f43de0be0 ("xilinx: zynqmp: Add support for runtime dfu_alt_info setup")
> Signed-off-by: Vincent Stehlé <vincent.stehle@arm.com>
> Cc: Michal Simek <michal.simek@amd.com>
> Cc: Tom Rini <trini@konsulko.com>

Acked-by: Padmarao Begari <padmarao.begari@amd.com>

> ---
>  board/xilinx/zynqmp/zynqmp.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/board/xilinx/zynqmp/zynqmp.c b/board/xilinx/zynqmp/zynqmp.c index
> 820fb252a3f..687dcd3ac9d 100644
> --- a/board/xilinx/zynqmp/zynqmp.c
> +++ b/board/xilinx/zynqmp/zynqmp.c
> @@ -669,7 +669,7 @@ void set_dfu_alt_info(char *interface, char *devstr)
>         if (env_get("dfu_alt_info"))
>                 return;
>
> -       memset(buf, 0, sizeof(buf));
> +       memset(buf, 0, DFU_ALT_BUF_LEN);
>
>         multiboot = multi_boot();
>         if (multiboot < 0)
> --
> 2.47.2

Re: [PATCH 5/5] arm64: zynqmp: fix dfu alt buffer clearing

[Michal Simek]

On 4/7/25 19:05, Vincent Stehlé wrote:
> The set_dfu_alt_info() function calls the ALLOC_CACHE_ALIGN_BUFFER()
> macro to declare a `buf' variable pointer into an array allocated on the
> stack. It then calls the memset() function to clear the useable portion
> of the array using the idiomatic expression `sizeof(buf)'.
> 
> While this would indeed work fine for an array, in the present case we
> end up clearing only the size of a pointer.
> Fix this by specifying the explicit size `DFU_ALT_BUF_LEN' instead.
> 
> Fixes: b86f43de0be0 ("xilinx: zynqmp: Add support for runtime dfu_alt_info setup")
> Signed-off-by: Vincent Stehlé <vincent.stehle@arm.com>
> Cc: Michal Simek <michal.simek@amd.com>
> Cc: Tom Rini <trini@konsulko.com>
> ---
>   board/xilinx/zynqmp/zynqmp.c | 2 +-
>   1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/board/xilinx/zynqmp/zynqmp.c b/board/xilinx/zynqmp/zynqmp.c
> index 820fb252a3f..687dcd3ac9d 100644
> --- a/board/xilinx/zynqmp/zynqmp.c
> +++ b/board/xilinx/zynqmp/zynqmp.c
> @@ -669,7 +669,7 @@ void set_dfu_alt_info(char *interface, char *devstr)
>   	if (env_get("dfu_alt_info"))
>   		return;
>   
> -	memset(buf, 0, sizeof(buf));
> +	memset(buf, 0, DFU_ALT_BUF_LEN);
>   
>   	multiboot = multi_boot();
>   	if (multiboot < 0)

Applied.
M

Re: (subset) [PATCH 0/5] fix dfu alt buffer clearing

[Mattijs Korpershoek]

Hi,

On Mon, 07 Apr 2025 19:05:24 +0200, Vincent Stehlé wrote:
> This patch series applies the same fix in five different locations (the
> detailed description of the fix is in the patches).
> 
> I did validate statically by looking at the assembly before/after for all
> five cases, using the following defconfigs:
> 
>   stm32mp15_defconfig
>   synquacer_developerbox_defconfig
>   xilinx_versal_virt_defconfig
>   xilinx_zynq_virt_defconfig
>   xilinx_zynqmp_kria_defconfig
> 
> [...]

Thanks, Applied to https://source.denx.de/u-boot/custodians/u-boot-dfu (u-boot-dfu)

[1/5] fwu: developerbox: fix dfu alt buffer clearing
      https://source.denx.de/u-boot/custodians/u-boot-dfu/-/commit/39a719dce59607d6abcac17cc2683aa9f2162539

--
Mattijs