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

Commit e477e940 authored by Arnd Bergmann's avatar Arnd Bergmann Committed by Alex Deucher
Browse files

drm/amdgpu/virt: don't dereference undefined 'module' struct 



Accessing the THIS_MODULE directly is only possible when modules
are enabled, otherwise we get a build failure:

drivers/gpu/drm/amd/amdgpu/amdgpu_virt.c: In function 'amdgpu_virt_init_data_exchange':
drivers/gpu/drm/amd/amdgpu/amdgpu_virt.c:331:20: error: dereferencing pointer to incomplete type 'struct module'

Further, THIS_MODULE is NULL when the driver is built-in, so the
code would likely cause a NULL pointer dereference.

This adds an #ifdef check to avoid the compile-time error, plus
a NULL pointer check before dereferencing THIS_MODULE. It might
be better to find a way to avoid using the module version
altogether.

Fixes: 2dc8f81e ("drm/amdgpu: SR-IOV data exchange between PF&VF")
Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
Reviewed-by: default avatarHarry Wentland <harry.wentland@amd.com>
Reviewed-By: default avatarXiangliang Yu <Xiangliang.Yu@amd.com>
parent bf6eb600

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

+2 −0
Original line number Diff line number Diff line
@@ -328,9 +328,11 @@ void amdgpu_virt_init_data_exchange(struct amdgpu_device *adev) 
					sizeof(amdgim_vf2pf_info));

				AMDGPU_FW_VRAM_VF2PF_READ(adev, driver_version,

					&str);

#ifdef MODULE

				if (THIS_MODULE->version != NULL)

					strcpy(str, THIS_MODULE->version);

				else

#endif

					strcpy(str, "N/A");

				AMDGPU_FW_VRAM_VF2PF_WRITE(adev, driver_cert,

					0);