RE: [PATCH] drm/amdgpu/virt: don't dereference undefined 'module' struct

[Yu, Xiangliang]

Reviewed-By: Xiangliang Yu 

Thanks!

> -Original Message-
> From: Arnd Bergmann [mailto:a...@arndb.de]
> Sent: Thursday, November 02, 2017 7:26 PM
> To: Deucher, Alexander ; Koenig, Christian
> 
> Cc: Arnd Bergmann ; David Airlie ; Liu,
> Monk ; Yu, Xiangliang ;
> Chen, Horace ; amd-...@lists.freedesktop.org;
> dri-de...@lists.freedesktop.org; linux-kernel@vger.kernel.org
> Subject: [PATCH] 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: 2dc8f81e4f82 ("drm/amdgpu: SR-IOV data exchange between PF")
> Signed-off-by: Arnd Bergmann 
> ---
>  drivers/gpu/drm/amd/amdgpu/amdgpu_virt.c | 2 ++
>  1 file changed, 2 insertions(+)
> 
> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_virt.c
> b/drivers/gpu/drm/amd/amdgpu/amdgpu_virt.c
> index e97f80f86005..4e4a476593e8 100644
> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_virt.c
> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_virt.c
> @@ -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,
>   );
> +#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);
> --
> 2.9.0

RE: [PATCH] drm/amdgpu/virt: don't dereference undefined 'module' struct

[Yu, Xiangliang]

Reviewed-By: Xiangliang Yu 

Thanks!

> -Original Message-
> From: Arnd Bergmann [mailto:a...@arndb.de]
> Sent: Thursday, November 02, 2017 7:26 PM
> To: Deucher, Alexander ; Koenig, Christian
> 
> Cc: Arnd Bergmann ; David Airlie ; Liu,
> Monk ; Yu, Xiangliang ;
> Chen, Horace ; amd-...@lists.freedesktop.org;
> dri-de...@lists.freedesktop.org; linux-kernel@vger.kernel.org
> Subject: [PATCH] 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: 2dc8f81e4f82 ("drm/amdgpu: SR-IOV data exchange between PF")
> Signed-off-by: Arnd Bergmann 
> ---
>  drivers/gpu/drm/amd/amdgpu/amdgpu_virt.c | 2 ++
>  1 file changed, 2 insertions(+)
> 
> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_virt.c
> b/drivers/gpu/drm/amd/amdgpu/amdgpu_virt.c
> index e97f80f86005..4e4a476593e8 100644
> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_virt.c
> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_virt.c
> @@ -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,
>   );
> +#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);
> --
> 2.9.0

Re: [PATCH] drm/amdgpu/virt: don't dereference undefined 'module' struct

[Alex Deucher]

On Thu, Nov 2, 2017 at 3:22 PM, Harry Wentland  wrote:
> On 2017-11-02 07:25 AM, Arnd Bergmann wrote:
>> 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: 2dc8f81e4f82 ("drm/amdgpu: SR-IOV data exchange between PF")
>> Signed-off-by: Arnd Bergmann 
>
> Looks like 'str' isn't even used here.
>
> Either way, this change by itself is correct and
> Reviewed-by: Harry Wentland 
>

Applied.  Thanks!

Alex

> Harry
>
>> ---
>>  drivers/gpu/drm/amd/amdgpu/amdgpu_virt.c | 2 ++
>>  1 file changed, 2 insertions(+)
>>
>> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_virt.c 
>> b/drivers/gpu/drm/amd/amdgpu/amdgpu_virt.c
>> index e97f80f86005..4e4a476593e8 100644
>> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_virt.c
>> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_virt.c
>> @@ -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,
>>   );
>> +#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);
>>
> ___
> amd-gfx mailing list
> amd-...@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/amd-gfx

Re: [PATCH] drm/amdgpu/virt: don't dereference undefined 'module' struct

[Alex Deucher]

On Thu, Nov 2, 2017 at 3:22 PM, Harry Wentland  wrote:
> On 2017-11-02 07:25 AM, Arnd Bergmann wrote:
>> 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: 2dc8f81e4f82 ("drm/amdgpu: SR-IOV data exchange between PF")
>> Signed-off-by: Arnd Bergmann 
>
> Looks like 'str' isn't even used here.
>
> Either way, this change by itself is correct and
> Reviewed-by: Harry Wentland 
>

Applied.  Thanks!

Alex

> Harry
>
>> ---
>>  drivers/gpu/drm/amd/amdgpu/amdgpu_virt.c | 2 ++
>>  1 file changed, 2 insertions(+)
>>
>> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_virt.c 
>> b/drivers/gpu/drm/amd/amdgpu/amdgpu_virt.c
>> index e97f80f86005..4e4a476593e8 100644
>> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_virt.c
>> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_virt.c
>> @@ -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,
>>   );
>> +#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);
>>
> ___
> amd-gfx mailing list
> amd-...@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/amd-gfx

Re: [PATCH] drm/amdgpu/virt: don't dereference undefined 'module' struct

[Harry Wentland]

On 2017-11-02 07:25 AM, Arnd Bergmann wrote:
> 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: 2dc8f81e4f82 ("drm/amdgpu: SR-IOV data exchange between PF")
> Signed-off-by: Arnd Bergmann 

Looks like 'str' isn't even used here.

Either way, this change by itself is correct and
Reviewed-by: Harry Wentland 

Harry

> ---
>  drivers/gpu/drm/amd/amdgpu/amdgpu_virt.c | 2 ++
>  1 file changed, 2 insertions(+)
> 
> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_virt.c 
> b/drivers/gpu/drm/amd/amdgpu/amdgpu_virt.c
> index e97f80f86005..4e4a476593e8 100644
> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_virt.c
> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_virt.c
> @@ -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,
>   );
> +#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);
> 

Re: [PATCH] drm/amdgpu/virt: don't dereference undefined 'module' struct

[Harry Wentland]

On 2017-11-02 07:25 AM, Arnd Bergmann wrote:
> 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: 2dc8f81e4f82 ("drm/amdgpu: SR-IOV data exchange between PF")
> Signed-off-by: Arnd Bergmann 

Looks like 'str' isn't even used here.

Either way, this change by itself is correct and
Reviewed-by: Harry Wentland 

Harry

> ---
>  drivers/gpu/drm/amd/amdgpu/amdgpu_virt.c | 2 ++
>  1 file changed, 2 insertions(+)
> 
> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_virt.c 
> b/drivers/gpu/drm/amd/amdgpu/amdgpu_virt.c
> index e97f80f86005..4e4a476593e8 100644
> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_virt.c
> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_virt.c
> @@ -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,
>   );
> +#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);
>