firmware: arm_ffa: avoid string-fortify warningn in export_uuid()
PATCH 1/1 firmware: arm_ffa: avoid string-fortify warningn in export_uuid()
From: Arnd Bergmann <[email protected]>
Copying to a 16 byte structure into an 8-byte struct member causes a compile-time warning:
In file included from drivers/firmware/arm_ffa/driver.c:25:
In function 'fortify_memcpy_chk',
inlined from 'export_uuid' at include/linux/uuid.h:88:2,
inlined from 'ffa_msg_send_direct_req2' at drivers/firmware/arm_ffa/driver.c:488:2:include/linux/fortify-string.h:571:25: error: call to '__write_overflow_field' declared with attribute warning: detected write beyond size of field (1st parameter); maybe use struct_group()? [-Werror=attribute-warning]
571 | __write_overflow_field(p_size_field, size);
| ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~Use a union for the conversion instead and make sure the byte order is fixed in the process.
---
Not sure how endianess is handled in the ABI, adding the conversion seemed sensible here to allow big-endian kernels on a little-endian firmware, but it's possible that ff-a is already required to do the byte swapping in this case.
--- drivers/firmware/arm_ffa/driver.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-)
drivers/firmware/arm_ffa/driver.c +8 -3
@@ -481,11 +481,16 @@ static int ffa_msg_send_direct_req2(u16 src_id, u16 dst_id, const uuid_t *uuid, struct ffa_send_direct_data2 *data) {u32 src_dst_ids =PACK_TARGET_INFO (src_id, dst_id); +union { +uuid_t uuid; +__le64 regs[2 ]; + } uuid_regs = { .uuid = *uuid };ffa_value_t ret, args = { - .a0 =FFA_MSG_SEND_DIRECT_REQ2 , .a1 = src_dst_ids, + .a0 =FFA_MSG_SEND_DIRECT_REQ2 , + .a1 = src_dst_ids, + .a2 =le64_to_cpu (uuid_regs.regs[0 ]), + .a3 =le64_to_cpu (uuid_regs.regs[1 ]), }; - -export_uuid ((u8 *)&args.a2, uuid);memcpy ((void *)&args + offsetof(ffa_value_t , a4), data,sizeof (*data));invoke_ffa_fn (args, &ret);
Signature · 1 line
2.39.2
Quoted 10 lines · Arnd Bergmann
From: Arnd Bergmann <[email protected]>
Copying to a 16 byte structure into an 8-byte struct member causes a compile-time warning:
In file included from
drivers/firmware/arm_ffa/driver.c:25:
In function 'fortify_memcpy_chk',
inlined from 'export_uuid' atinclude/linux/uuid.h:88:2,
inlined from 'ffa_msg_send_direct_req2' atdrivers/firmware/arm_ffa/driver.c:488:2:include/linux/fortify-string.h:571:25: error: call to '__write_overflow_field' declared with attribute warning: detected write beyond size of field (1st parameter); maybe usestruct_group()? [-Werror=attribute-warning]
Quoted 6 lines
571 | __write_overflow_field(p_size_field, size); | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~Use a union for the conversion instead and make sure the byte order is fixed in the process.
Thanks for spotting and fixing the issue. I tested enabling CONFIG_FORTIFY_SOURCE but couldn't hit this with gcc 13 and clang 20
Also do you want this sent as fix on top of my FF-A PR now or after -rc1 ?
--
Regards,
Sudeep
Quoted 14 lines · Sudeep Holla
Quoted 13 lines · Arnd Bergmann
From: Arnd Bergmann <[email protected]>
Copying to a 16 byte structure into an 8-byte struct member causes a compile-time warning:
In file included from
drivers/firmware/arm_ffa/driver.c:25:
In function 'fortify_memcpy_chk',
inlined from 'export_uuid' atinclude/linux/uuid.h:88:2,
inlined from 'ffa_msg_send_direct_req2' atdrivers/firmware/arm_ffa/driver.c:488:2:include/linux/fortify-string.h:571:25: error: call to '__write_overflow_field' declared with attribute warning: detected write beyond size of field (1st parameter); maybe usestruct_group()? [-Werror=attribute-warning]571 | __write_overflow_field(p_size_field, size); | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
Quoted 6 lines
Quoted 3 lines
Use a union for the conversion instead and make sure the byte order is fixed in the process.
Thanks for spotting and fixing the issue. I tested enabling
CONFIG_FORTIFY_SOURCEbut couldn't hit this with gcc 13 and clang 20
Unfortunately I also don't have a reproducer at the moment, but I know it was from a randconfig build with gcc-14.2. I tried another few hundred randconfigs now with my patch reverted but it didn't come back. I assume it only shows up in rare combinations of some options,
Do you have any additional information on the endianess question? Is this arm_ffa firmware code supposed to work with big-endian kernels?
Quoted 1 line
Also do you want this sent as fix on top of my FF-A PR now or after -rc1 ?
Earlier would be better I think. I usually have one set of bugfixes before rc1 even if it doesn't make it into the first set of branches.
Arnd
Quoted 19 lines · Arnd Bergmann
Quoted 18 lines · Sudeep Holla
Quoted 16 lines · Arnd Bergmann
From: Arnd Bergmann <[email protected]>
Copying to a 16 byte structure into an 8-byte struct member causes a compile-time warning:
In file included from
drivers/firmware/arm_ffa/driver.c:25:
In function 'fortify_memcpy_chk',
inlined from 'export_uuid' atinclude/linux/uuid.h:88:2,
inlined from 'ffa_msg_send_direct_req2' atdrivers/firmware/arm_ffa/driver.c:488:2:include/linux/fortify-string.h:571:25: error: call to '__write_overflow_field' declared with attribute warning: detected write beyond size of field (1st parameter); maybe usestruct_group()? [-Werror=attribute-warning]571 | __write_overflow_field(p_size_field, size); | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~Use a union for the conversion instead and make sure the byte order is fixed in the process.
Quoted 9 lines
Quoted 2 lines
Thanks for spotting and fixing the issue. I tested enabling
CONFIG_FORTIFY_SOURCEbut couldn't hit this with gcc 13 and clang 20Unfortunately I also don't have a reproducer at the moment, but I know it was from a randconfig build with gcc-14.2. I tried another few hundred randconfigs now with my patch reverted but it didn't come back. I assume it only shows up in rare combinations of some options,
Oh OK.
Quoted 4 lines
Do you have any additional information on the endianess question? Is this
arm_ffafirmware code supposed to work with big-endian kernels?
I am trying to check if that is a requirement. Also the specification doesn't have any specific mention about it. Since it executes on the same AP cores as Linux in different EL, I assume the entire stack must be running same endian-ness. I will check internally. Unlike SCMI, I haven't tested FF-A with big-endian kernel so far.
Quoted 6 lines
Quoted 1 line
Also do you want this sent as fix on top of my FF-A PR now or after -rc1 ?
Earlier would be better I think. I usually have one set of bugfixes before rc1 even if it doesn't make it into the first set of branches.
I will try to send earlier unless this endian-ness triggers more questions. I will update here anyways.
Signature · 2 lines
Regards, Sudeep
Sudeep Holla
AppliedQuoted 8 lines · Arnd Bergmann
Copying to a 16 byte structure into an 8-byte struct member causes a compile-time warning:
In file included from
drivers/firmware/arm_ffa/driver.c:25:
In function 'fortify_memcpy_chk',
inlined from 'export_uuid' atinclude/linux/uuid.h:88:2,
inlined from 'ffa_msg_send_direct_req2' atdrivers/firmware/arm_ffa/driver.c:488:2:include/linux/fortify-string.h:571:25: error: call to '__write_overflow_field' declared with attribute warning: detected write beyond size of field (1st parameter); maybe usestruct_group()? [-Werror=attribute-warning]
Quoted 4 lines
571 | __write_overflow_field(p_size_field, size); | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~[...]
Sorry for the delay, was trying to see if I can test BE kernel and see if it needs more fixing. The spec does require all memory region to be LE. I will do that later, for now I am pulling this as fix for v6.12
Applied to sudeep.holla/linux (for-next/ffa/fixes), thanks!
[1/1] firmware: arm_ffa: avoid string-fortify warningn in export_uuid()
https://git.kernel.org/sudeep.holla/c/629253b2f6d7
--
Regards,
Sudeep