Commit b56b6c51 authored Sep 02, 2021 by Ernst Sjöstrand Committed by Greg Kroah-Hartman Sep 22, 2021

drm/amd/amdgpu: Increase HWIP_MAX_INSTANCE to 10

commit 67a44e659888569a133a8f858c8230e9d7aad1d5 upstream.

Seems like newer cards can have even more instances now.
Found by UBSAN: array-index-out-of-bounds in
drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c:318:29
index 8 is out of range for type 'uint32_t *[8]'

Bug: https://gitlab.freedesktop.org/drm/amd/-/issues/1697


Cc: stable@vger.kernel.org
Signed-off-by: Ernst Sjöstrand <ernstp@gmail.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

parent c221eb00

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

+1 −1

Original line number	Diff line number	Diff line
		@@ -762,7 +762,7 @@ enum amd_hw_ip_block_type {
		MAX_HWIP
		};

		#define HWIP_MAX_INSTANCE 8
		#define HWIP_MAX_INSTANCE 10

		struct amd_powerplay {
		void *pp_handle;