linux-kernel - Re: [Intel-gfx] [PATCH] drm/i915: Fix missing unlock on error in i915_ppgtt_info()

Open Source and information security mailing list archives

Date:	Tue, 14 Jun 2016 07:57:31 +0200
From:	Daniel Vetter <daniel@...ll.ch>
To:	weiyj_lk@....com
Cc:	Daniel Vetter <daniel.vetter@...el.com>,
	Jani Nikula <jani.nikula@...ux.intel.com>,
	David Airlie <airlied@...ux.ie>,
	Wei Yongjun <yongjun_wei@...ndmicro.com.cn>,
	intel-gfx@...ts.freedesktop.org, dri-devel@...ts.freedesktop.org,
	linux-kernel@...r.kernel.org
Subject: Re: [Intel-gfx] [PATCH] drm/i915: Fix missing unlock on error in
 i915_ppgtt_info()

On Mon, Jun 13, 2016 at 11:42:00PM +0000, weiyj_lk@....com wrote:
> From: Wei Yongjun <yongjun_wei@...ndmicro.com.cn>
> 
> Add the missing unlock before return from function i915_ppgtt_info()
> in the error handling case.
> 
> Fixes: 1d2ac403ae3b(drm: Protect dev->filelist with its own mutex)
> Signed-off-by: Wei Yongjun <yongjun_wei@...ndmicro.com.cn>

Applied to drm-misc, thanks.
-Daniel

> ---
>  drivers/gpu/drm/i915/i915_debugfs.c | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/drivers/gpu/drm/i915/i915_debugfs.c b/drivers/gpu/drm/i915/i915_debugfs.c
> index 3269033..1035468 100644
> --- a/drivers/gpu/drm/i915/i915_debugfs.c
> +++ b/drivers/gpu/drm/i915/i915_debugfs.c
> @@ -2365,16 +2365,16 @@ static int i915_ppgtt_info(struct seq_file *m, void *data)
>  		task = get_pid_task(file->pid, PIDTYPE_PID);
>  		if (!task) {
>  			ret = -ESRCH;
> -			goto out_put;
> +			goto out_unlock;
>  		}
>  		seq_printf(m, "\nproc: %s\n", task->comm);
>  		put_task_struct(task);
>  		idr_for_each(&file_priv->context_idr, per_file_ctx,
>  			     (void *)(unsigned long)m);
>  	}
> +out_unlock:
>  	mutex_unlock(&dev->filelist_mutex);
>  
> -out_put:
>  	intel_runtime_pm_put(dev_priv);
>  	mutex_unlock(&dev->struct_mutex);
> 
> 
> _______________________________________________
> Intel-gfx mailing list
> Intel-gfx@...ts.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/intel-gfx

-- 
Daniel Vetter
Software Engineer, Intel Corporation
http://blog.ffwll.ch

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