提交 e477e940 编写于 作者: A Arnd Bergmann 提交者: Alex Deucher

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: NArnd Bergmann <arnd@arndb.de>
Signed-off-by: NAlex Deucher <alexander.deucher@amd.com>
Reviewed-by: NHarry Wentland <harry.wentland@amd.com>
Reviewed-By: NXiangliang Yu <Xiangliang.Yu@amd.com>
上级 bf6eb600
...@@ -328,9 +328,11 @@ void amdgpu_virt_init_data_exchange(struct amdgpu_device *adev) ...@@ -328,9 +328,11 @@ void amdgpu_virt_init_data_exchange(struct amdgpu_device *adev)
sizeof(amdgim_vf2pf_info)); sizeof(amdgim_vf2pf_info));
AMDGPU_FW_VRAM_VF2PF_READ(adev, driver_version, AMDGPU_FW_VRAM_VF2PF_READ(adev, driver_version,
&str); &str);
#ifdef MODULE
if (THIS_MODULE->version != NULL) if (THIS_MODULE->version != NULL)
strcpy(str, THIS_MODULE->version); strcpy(str, THIS_MODULE->version);
else else
#endif
strcpy(str, "N/A"); strcpy(str, "N/A");
AMDGPU_FW_VRAM_VF2PF_WRITE(adev, driver_cert, AMDGPU_FW_VRAM_VF2PF_WRITE(adev, driver_cert,
0); 0);
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册