Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f6b4bda8 authored by Arnd Bergmann's avatar Arnd Bergmann Committed by Greg Kroah-Hartman
Browse files

drm/amdgpu: fix warning for overflow check 



[ Upstream commit 335aea75b0d95518951cad7c4c676e6f1c02c150 ]

The overflow check in amdgpu_bo_list_create() causes a warning with
clang-14 on 64-bit architectures, since the limit can never be
exceeded.

drivers/gpu/drm/amd/amdgpu/amdgpu_bo_list.c:74:18: error: result of comparison of constant 256204778801521549 with expression of type 'unsigned int' is always false [-Werror,-Wtautological-constant-out-of-range-compare]
        if (num_entries > (SIZE_MAX - sizeof(struct amdgpu_bo_list))
            ~~~~~~~~~~~ ^ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

The check remains useful for 32-bit architectures, so just avoid the
warning by using size_t as the type for the count.

Fixes: 920990cb ("drm/amdgpu: allocate the bo_list array after the list")
Reviewed-by: default avatarChristian König <christian.koenig@amd.com>
Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent 867462fd

drivers/gpu/drm/amd/amdgpu/amdgpu_bo_list.c

+1 −1
Original line number Diff line number Diff line
@@ -57,7 +57,7 @@ static void amdgpu_bo_list_free(struct kref *ref) 


int amdgpu_bo_list_create(struct amdgpu_device *adev, struct drm_file *filp,

			  struct drm_amdgpu_bo_list_entry *info,

			  unsigned num_entries, struct amdgpu_bo_list **result)

			  size_t num_entries, struct amdgpu_bo_list **result)

{

	unsigned last_entry = 0, first_userptr = num_entries;

	struct amdgpu_bo_list_entry *array;

drivers/gpu/drm/amd/amdgpu/amdgpu_bo_list.h

+1 −1
Original line number Diff line number Diff line
@@ -61,7 +61,7 @@ int amdgpu_bo_create_list_entry_array(struct drm_amdgpu_bo_list_in *in, 
int amdgpu_bo_list_create(struct amdgpu_device *adev,

				 struct drm_file *filp,

				 struct drm_amdgpu_bo_list_entry *info,

				 unsigned num_entries,

				 size_t num_entries,

				 struct amdgpu_bo_list **list);



static inline struct amdgpu_bo_list_entry *