On Thu, Feb 13, 2025 at 04:12:48PM +0000, Steven Price wrote:
> Assigning a string to an array which is too small to include the NUL
> byte at the end causes a warning on some compilers. But this function
> also has some other oddities like the 'header' array which is only ever
> used within sizeof().
>
> Tidy up the function by removing the 'header' array, allow the NUL byte
> to be present in git_sha_header, and calculate the length directly from
> git_sha_header.
>
> Reported-by: Will Deacon <will@xxxxxxxxxx>
> Fixes: 9d443deb0441 ("drm/panthor: Display FW version information")
> Signed-off-by: Steven Price <steven.price@xxxxxxx>
> ---
> Note that there should be no functional change from this patch.
> ---
> drivers/gpu/drm/panthor/panthor_fw.c | 9 ++++-----
> 1 file changed, 4 insertions(+), 5 deletions(-)
>
> diff --git a/drivers/gpu/drm/panthor/panthor_fw.c b/drivers/gpu/drm/panthor/panthor_fw.c
> index 4a9c4afa9ad7..645fc6d2e63b 100644
> --- a/drivers/gpu/drm/panthor/panthor_fw.c
> +++ b/drivers/gpu/drm/panthor/panthor_fw.c
> @@ -636,8 +636,8 @@ static int panthor_fw_read_build_info(struct panthor_device *ptdev,
> u32 ehdr)
> {
> struct panthor_fw_build_info_hdr hdr;
> - char header[9];
> - const char git_sha_header[sizeof(header)] = "git_sha: ";
> + const char git_sha_header[] = "git_sha: ";
> + const int header_len = sizeof(git_sha_header) - 1;
nit: strlen()?
In any case, this fixes the arm64 CI [1], so:
Acked-by: Will Deacon <will@xxxxxxxxxx>
It would be great to land this as a fix to save us having to carry it
on our CI branch.
Cheers,
Will
[1] https://lore.kernel.org/r/20250213154237.GA11897@willie-the-truck
