linux-kernel - RE: [PATCH] gpu: drm: fix an improper check of amdgpu_bo_create

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Date:   Wed, 26 Dec 2018 08:29:29 +0000
From:   "Huang, Ray" <Ray.Huang@....com>
To:     Kangjie Lu <kjlu@....edu>
CC:     "pakki001@....edu" <pakki001@....edu>,
        "Deucher, Alexander" <Alexander.Deucher@....com>,
        "Koenig, Christian" <Christian.Koenig@....com>,
        "Zhou, David(ChunMing)" <David1.Zhou@....com>,
        David Airlie <airlied@...ux.ie>,
        Daniel Vetter <daniel@...ll.ch>, "Zhu, Rex" <Rex.Zhu@....com>,
        "Zhang, Hawking" <Hawking.Zhang@....com>,
        "Xu, Feifei" <Feifei.Xu@....com>, "Gao, Likun" <Likun.Gao@....com>,
        "Francis, David" <David.Francis@....com>,
        "amd-gfx@...ts.freedesktop.org" <amd-gfx@...ts.freedesktop.org>,
        "dri-devel@...ts.freedesktop.org" <dri-devel@...ts.freedesktop.org>,
        "linux-kernel@...r.kernel.org" <linux-kernel@...r.kernel.org>
Subject: RE: [PATCH] gpu: drm: fix an improper check of
 amdgpu_bo_create_kernel

> -----Original Message-----
> From: Kangjie Lu [mailto:kjlu@....edu]
> Sent: Wednesday, December 26, 2018 2:24 PM
> To: kjlu@....edu
> Cc: pakki001@....edu; Deucher, Alexander
> <Alexander.Deucher@....com>; Koenig, Christian
> <Christian.Koenig@....com>; Zhou, David(ChunMing)
> <David1.Zhou@....com>; David Airlie <airlied@...ux.ie>; Daniel Vetter
> <daniel@...ll.ch>; Zhu, Rex <Rex.Zhu@....com>; Huang, Ray
> <Ray.Huang@....com>; Zhang, Hawking <Hawking.Zhang@....com>; Xu,
> Feifei <Feifei.Xu@....com>; Gao, Likun <Likun.Gao@....com>; Francis,
> David <David.Francis@....com>; amd-gfx@...ts.freedesktop.org; dri-
> devel@...ts.freedesktop.org; linux-kernel@...r.kernel.org
> Subject: [PATCH] gpu: drm: fix an improper check of
> amdgpu_bo_create_kernel
> 
> adev->firmware.fw_buf being not NULL may not indicate kernel buffer is
> created successful. A better way is to check the status (return value)
> of it. The fix does so.

Actually, it is the same. If bo is created successfully, the amdgpu_bo object will be created.
But using "ret" to align with other function should be better as the return status.  Thanks.

Reviewed-by: Huang Rui <ray.huang@....com>

> 
> Signed-off-by: Kangjie Lu <kjlu@....edu>
> ---
>  drivers/gpu/drm/amd/amdgpu/amdgpu_ucode.c | 18 ++++++++++++------
>  1 file changed, 12 insertions(+), 6 deletions(-)
> 
> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_ucode.c
> b/drivers/gpu/drm/amd/amdgpu/amdgpu_ucode.c
> index 7b33867036e7..ba3c1cfb2c35 100644
> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_ucode.c
> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_ucode.c
> @@ -422,13 +422,19 @@ static int amdgpu_ucode_patch_jt(struct
> amdgpu_firmware_info *ucode,
> 
>  int amdgpu_ucode_create_bo(struct amdgpu_device *adev)
>  {
> +	int ret;
> +
>  	if (adev->firmware.load_type != AMDGPU_FW_LOAD_DIRECT) {
> -		amdgpu_bo_create_kernel(adev, adev->firmware.fw_size,
> PAGE_SIZE,
> -			amdgpu_sriov_vf(adev) ?
> AMDGPU_GEM_DOMAIN_VRAM : AMDGPU_GEM_DOMAIN_GTT,
> -			&adev->firmware.fw_buf,
> -			&adev->firmware.fw_buf_mc,
> -			&adev->firmware.fw_buf_ptr);
> -		if (!adev->firmware.fw_buf) {
> +		ret =
> +			amdgpu_bo_create_kernel(adev,
> +			  adev->firmware.fw_size,
> +			  PAGE_SIZE,
> +			  amdgpu_sriov_vf(adev) ?
> AMDGPU_GEM_DOMAIN_VRAM :
> +				AMDGPU_GEM_DOMAIN_GTT,
> +			  &adev->firmware.fw_buf,
> +			  &adev->firmware.fw_buf_mc,
> +				&adev->firmware.fw_buf_ptr);
> +		if (ret) {
>  			dev_err(adev->dev, "failed to create kernel buffer
> for firmware.fw_buf\n");
>  			return -ENOMEM;
>  		} else if (amdgpu_sriov_vf(adev)) {
> --
> 2.17.2 (Apple Git-113)