[PATCH] drm/amdgpu/atomfirmware: silence UBSAN warning

[PATCH] drm/amdgpu/atomfirmware: silence UBSAN warning

[Alex Deucher]

This is a variably sized array.

Link: https://lists.freedesktop.org/archives/amd-gfx/2024-June/110420.html
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
---
 drivers/gpu/drm/amd/include/atomfirmware.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/gpu/drm/amd/include/atomfirmware.h b/drivers/gpu/drm/amd/include/atomfirmware.h
index 571691837200..09cbc3afd6d8 100644
--- a/drivers/gpu/drm/amd/include/atomfirmware.h
+++ b/drivers/gpu/drm/amd/include/atomfirmware.h
@@ -734,7 +734,7 @@ struct atom_gpio_pin_lut_v2_1
 {
   struct  atom_common_table_header  table_header;
   /*the real number of this included in the structure is calcualted by using the (whole structure size - the header size)/size of atom_gpio_pin_lut  */
-  struct  atom_gpio_pin_assignment  gpio_pin[8];
+  struct  atom_gpio_pin_assignment  gpio_pin[];
 };
 
 
-- 
2.45.2

Re: [PATCH] drm/amdgpu/atomfirmware: silence UBSAN warning

[Jeff Layton]

On Mon, 2024-07-01 at 12:55 -0400, Alex Deucher wrote:
> This is a variably sized array.
> 
> Link:
> https://lists.freedesktop.org/archives/amd-gfx/2024-June/110420.html
> Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
> ---
>  drivers/gpu/drm/amd/include/atomfirmware.h | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/drivers/gpu/drm/amd/include/atomfirmware.h
> b/drivers/gpu/drm/amd/include/atomfirmware.h
> index 571691837200..09cbc3afd6d8 100644
> --- a/drivers/gpu/drm/amd/include/atomfirmware.h
> +++ b/drivers/gpu/drm/amd/include/atomfirmware.h
> @@ -734,7 +734,7 @@ struct atom_gpio_pin_lut_v2_1
>  {
>    struct  atom_common_table_header  table_header;
>    /*the real number of this included in the structure is calcualted
> by using the (whole structure size - the header size)/size of
> atom_gpio_pin_lut  */
> -  struct  atom_gpio_pin_assignment  gpio_pin[8];
> +  struct  atom_gpio_pin_assignment  gpio_pin[];
>  };
>  
>  

Works for me:

Tested-by: Jeff Layton <jlayton@kernel.org>

RE: [PATCH] drm/amdgpu/atomfirmware: silence UBSAN warning

[SHANMUGAM, SRINIVASAN]

[Public]

Acked-by: Srinivasan Shanmugam <srinivasan.shanmugam@amd.com>

-----Original Message-----
From: amd-gfx <amd-gfx-bounces@lists.freedesktop.org> On Behalf Of Alex Deucher
Sent: Monday, July 1, 2024 10:25 PM
To: amd-gfx@lists.freedesktop.org; jlayton@kernel.org
Cc: Deucher, Alexander <Alexander.Deucher@amd.com>
Subject: [PATCH] drm/amdgpu/atomfirmware: silence UBSAN warning

This is a variably sized array.

Link: https://lists.freedesktop.org/archives/amd-gfx/2024-June/110420.html
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
---
 drivers/gpu/drm/amd/include/atomfirmware.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/gpu/drm/amd/include/atomfirmware.h b/drivers/gpu/drm/amd/include/atomfirmware.h
index 571691837200..09cbc3afd6d8 100644
--- a/drivers/gpu/drm/amd/include/atomfirmware.h
+++ b/drivers/gpu/drm/amd/include/atomfirmware.h
@@ -734,7 +734,7 @@ struct atom_gpio_pin_lut_v2_1  {
   struct  atom_common_table_header  table_header;
   /*the real number of this included in the structure is calcualted by using the (whole structure size - the header size)/size of atom_gpio_pin_lut  */
-  struct  atom_gpio_pin_assignment  gpio_pin[8];
+  struct  atom_gpio_pin_assignment  gpio_pin[];
 };


--
2.45.2

[PATCH] drm/amdgpu/atomfirmware: Silence UBSAN warning

[Alex Deucher]

Per the comments, these are variable sized arrays.

Closes: https://gitlab.freedesktop.org/drm/amd/-/issues/3613
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
---
 drivers/gpu/drm/amd/include/atomfirmware.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/gpu/drm/amd/include/atomfirmware.h b/drivers/gpu/drm/amd/include/atomfirmware.h
index 09cbc3afd6d8..b0fc22383e28 100644
--- a/drivers/gpu/drm/amd/include/atomfirmware.h
+++ b/drivers/gpu/drm/amd/include/atomfirmware.h
@@ -1038,7 +1038,7 @@ struct display_object_info_table_v1_4
   uint16_t  supporteddevices;
   uint8_t   number_of_path;
   uint8_t   reserved;
-  struct    atom_display_object_path_v2 display_path[8];   //the real number of this included in the structure is calculated by using the (whole structure size - the header size- number_of_path)/size of atom_display_object_path
+  struct    atom_display_object_path_v2 display_path[];   //the real number of this included in the structure is calculated by using the (whole structure size - the header size- number_of_path)/size of atom_display_object_path
 };
 
 struct display_object_info_table_v1_5 {
@@ -1048,7 +1048,7 @@ struct display_object_info_table_v1_5 {
 	uint8_t reserved;
 	// the real number of this included in the structure is calculated by using the
 	// (whole structure size - the header size- number_of_path)/size of atom_display_object_path
-	struct atom_display_object_path_v3 display_path[8];
+	struct atom_display_object_path_v3 display_path[];
 };
 
 /* 
-- 
2.46.0

Re: [PATCH] drm/amdgpu/atomfirmware: Silence UBSAN warning

[Alex Deucher]

Ping?

Alex

On Fri, Sep 6, 2024 at 12:43 PM Alex Deucher <alexander.deucher@amd.com> wrote:
>
> Per the comments, these are variable sized arrays.
>
> Closes: https://gitlab.freedesktop.org/drm/amd/-/issues/3613
> Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
> ---
>  drivers/gpu/drm/amd/include/atomfirmware.h | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/gpu/drm/amd/include/atomfirmware.h b/drivers/gpu/drm/amd/include/atomfirmware.h
> index 09cbc3afd6d8..b0fc22383e28 100644
> --- a/drivers/gpu/drm/amd/include/atomfirmware.h
> +++ b/drivers/gpu/drm/amd/include/atomfirmware.h
> @@ -1038,7 +1038,7 @@ struct display_object_info_table_v1_4
>    uint16_t  supporteddevices;
>    uint8_t   number_of_path;
>    uint8_t   reserved;
> -  struct    atom_display_object_path_v2 display_path[8];   //the real number of this included in the structure is calculated by using the (whole structure size - the header size- number_of_path)/size of atom_display_object_path
> +  struct    atom_display_object_path_v2 display_path[];   //the real number of this included in the structure is calculated by using the (whole structure size - the header size- number_of_path)/size of atom_display_object_path
>  };
>
>  struct display_object_info_table_v1_5 {
> @@ -1048,7 +1048,7 @@ struct display_object_info_table_v1_5 {
>         uint8_t reserved;
>         // the real number of this included in the structure is calculated by using the
>         // (whole structure size - the header size- number_of_path)/size of atom_display_object_path
> -       struct atom_display_object_path_v3 display_path[8];
> +       struct atom_display_object_path_v3 display_path[];
>  };
>
>  /*
> --
> 2.46.0
>

Re: [PATCH] drm/amdgpu/atomfirmware: Silence UBSAN warning

[Harry Wentland]

On 2024-09-09 13:19, Alex Deucher wrote:
> Ping?
> 
> Alex
> 
> On Fri, Sep 6, 2024 at 12:43 PM Alex Deucher <alexander.deucher@amd.com> wrote:
>>
>> Per the comments, these are variable sized arrays.
>>
>> Closes: https://gitlab.freedesktop.org/drm/amd/-/issues/3613
>> Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

Reviewed-by: Harry Wentland <harry.wentland@amd.com>

Harry

>> ---
>>  drivers/gpu/drm/amd/include/atomfirmware.h | 4 ++--
>>  1 file changed, 2 insertions(+), 2 deletions(-)
>>
>> diff --git a/drivers/gpu/drm/amd/include/atomfirmware.h b/drivers/gpu/drm/amd/include/atomfirmware.h
>> index 09cbc3afd6d8..b0fc22383e28 100644
>> --- a/drivers/gpu/drm/amd/include/atomfirmware.h
>> +++ b/drivers/gpu/drm/amd/include/atomfirmware.h
>> @@ -1038,7 +1038,7 @@ struct display_object_info_table_v1_4
>>    uint16_t  supporteddevices;
>>    uint8_t   number_of_path;
>>    uint8_t   reserved;
>> -  struct    atom_display_object_path_v2 display_path[8];   //the real number of this included in the structure is calculated by using the (whole structure size - the header size- number_of_path)/size of atom_display_object_path
>> +  struct    atom_display_object_path_v2 display_path[];   //the real number of this included in the structure is calculated by using the (whole structure size - the header size- number_of_path)/size of atom_display_object_path
>>  };
>>
>>  struct display_object_info_table_v1_5 {
>> @@ -1048,7 +1048,7 @@ struct display_object_info_table_v1_5 {
>>         uint8_t reserved;
>>         // the real number of this included in the structure is calculated by using the
>>         // (whole structure size - the header size- number_of_path)/size of atom_display_object_path
>> -       struct atom_display_object_path_v3 display_path[8];
>> +       struct atom_display_object_path_v3 display_path[];
>>  };
>>
>>  /*
>> --
>> 2.46.0
>>