linux-kernel - Re: [PATCH] drm/xe: unlock on error path in xe_vm_add_compute_exec

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] [day] [month] [year] [list]

Date: Fri, 5 Jan 2024 20:36:48 +0000
From: Matthew Brost <matthew.brost@...el.com>
To: Dan Carpenter <dan.carpenter@...aro.org>
CC: Thomas Hellström <thomas.hellstrom@...ux.intel.com>,
	Lucas De Marchi <lucas.demarchi@...el.com>, Oded Gabbay <ogabbay@...nel.org>,
	Maarten Lankhorst <maarten.lankhorst@...ux.intel.com>, Maxime Ripard
	<mripard@...nel.org>, Thomas Zimmermann <tzimmermann@...e.de>, David Airlie
	<airlied@...il.com>, Daniel Vetter <daniel@...ll.ch>, Rodrigo Vivi
	<rodrigo.vivi@...el.com>, <intel-xe@...ts.freedesktop.org>,
	<dri-devel@...ts.freedesktop.org>, <linux-kernel@...r.kernel.org>,
	<kernel-janitors@...r.kernel.org>
Subject: Re: [PATCH] drm/xe: unlock on error path in
 xe_vm_add_compute_exec_queue()

On Fri, Jan 05, 2024 at 03:20:22PM +0300, Dan Carpenter wrote:
> Drop the "&vm->lock" before returning.
> 
> Fixes: 24f947d58fe5 ("drm/xe: Use DRM GPUVM helpers for external- and evicted objects")
> Signed-off-by: Dan Carpenter <dan.carpenter@...aro.org>

Reviewed-by: Matthew Brost <matthew.brost@...el.com>

> ---
>  drivers/gpu/drm/xe/xe_vm.c | 7 ++++---
>  1 file changed, 4 insertions(+), 3 deletions(-)
> 
> diff --git a/drivers/gpu/drm/xe/xe_vm.c b/drivers/gpu/drm/xe/xe_vm.c
> index 9180f2d2d71d..4aa7979fe6bf 100644
> --- a/drivers/gpu/drm/xe/xe_vm.c
> +++ b/drivers/gpu/drm/xe/xe_vm.c
> @@ -332,13 +332,13 @@ int xe_vm_add_compute_exec_queue(struct xe_vm *vm, struct xe_exec_queue *q)
>  	down_write(&vm->lock);
>  	err = drm_gpuvm_exec_lock(&vm_exec);
>  	if (err)
> -		return err;
> +		goto out_up_write;
>  
>  	pfence = xe_preempt_fence_create(q, q->compute.context,
>  					 ++q->compute.seqno);
>  	if (!pfence) {
>  		err = -ENOMEM;
> -		goto out_unlock;
> +		goto out_fini;
>  	}
>  
>  	list_add(&q->compute.link, &vm->preempt.exec_queues);
> @@ -361,8 +361,9 @@ int xe_vm_add_compute_exec_queue(struct xe_vm *vm, struct xe_exec_queue *q)
>  
>  	up_read(&vm->userptr.notifier_lock);
>  
> -out_unlock:
> +out_fini:
>  	drm_exec_fini(exec);
> +out_up_write:
>  	up_write(&vm->lock);
>  
>  	return err;
> -- 
> 2.42.0
>