[PATCH AUTOSEL 6.10 034/121] drm/amdgpu: Fix out-of-bounds read of df_v1_7_channel_number

[Pavel Machek]

Hi!

> [ Upstream commit d768394fa99467bcf2703bde74ddc96eeb0b71fa ]
> 
> Check the fb_channel_number range to avoid the array out-of-bounds
> read error

We can still have array out-of-bounds, right? As soon as that function
returns 0x8000 0000.

drivers/gpu/drm/amd/amdgpu/amdgpu_df.h: u32 (*get_fb_channel_number)(struct amdgpu_device *adev);

int fb_channel_number should really be u32.

Best regards,
								Pavel
> +++ b/drivers/gpu/drm/amd/amdgpu/df_v1_7.c
> @@ -70,6 +70,8 @@ static u32 df_v1_7_get_hbm_channel_number(struct amdgpu_device *adev)
>  	int fb_channel_number;
>  
>  	fb_channel_number = adev->df.funcs->get_fb_channel_number(adev);
> +	if (fb_channel_number >= ARRAY_SIZE(df_v1_7_channel_number))
> +		fb_channel_number = 0;
>  
>  	return df_v1_7_channel_number[fb_channel_number];
>  }

-- 
DENX Software Engineering GmbH,        Managing Director: Erika Unter
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 195 bytes
Desc: not available
URL: <https://lists.freedesktop.org/archives/amd-gfx/attachments/20240827/de9f592a/attachment.sig>