From: Jani Nikula <jani.nikula@linux.intel.com>
To: Daniel Vetter <daniel.vetter@intel.com>, David Airlie <airlied@linux.ie>
Cc: Geliang Tang <geliangtang@163.com>,
intel-gfx@lists.freedesktop.org, linux-kernel@vger.kernel.org,
dri-devel@lists.freedesktop.org
Subject: Re: [PATCH] drm/i915: fix task reference leak in i915_debugfs.c
Date: Fri, 25 Sep 2015 14:16:07 +0300 [thread overview]
Message-ID: <87k2ren408.fsf@intel.com> (raw)
In-Reply-To: <7789a9d65ac9f2fc27e95a40b6995b21aab9fb73.1443198651.git.geliangtang@163.com>
On Fri, 25 Sep 2015, Geliang Tang <geliangtang@163.com> wrote:
> Leak a task reference in i915_ppgtt_info(), add put_task_struct()
> to fix it.
Introduced by
commit 1c60fef535d143860d5bf6593e24ab6417f5227c
Author: Ben Widawsky <ben@bwidawsk.net>
Date: Fri Dec 6 14:11:30 2013 -0800
drm/i915: Dump all ppgtt
>
> Signed-off-by: Geliang Tang <geliangtang@163.com>
> ---
> drivers/gpu/drm/i915/i915_debugfs.c | 8 ++++++--
> 1 file changed, 6 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/i915_debugfs.c b/drivers/gpu/drm/i915/i915_debugfs.c
> index 5615d3d..8797717 100644
> --- a/drivers/gpu/drm/i915/i915_debugfs.c
> +++ b/drivers/gpu/drm/i915/i915_debugfs.c
> @@ -2288,9 +2288,13 @@ static int i915_ppgtt_info(struct seq_file *m, void *data)
>
> list_for_each_entry_reverse(file, &dev->filelist, lhead) {
> struct drm_i915_file_private *file_priv = file->driver_priv;
> + struct task_struct *task;
>
> - seq_printf(m, "\nproc: %s\n",
> - get_pid_task(file->pid, PIDTYPE_PID)->comm);
> + task = get_pid_task(file->pid, PIDTYPE_PID);
> + if (!task)
> + return -ESRCH;
> + 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);
> }
> --
> 1.9.1
>
>
--
Jani Nikula, Intel Open Source Technology Center
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
WARNING: multiple messages have this Message-ID (diff)
From: Jani Nikula <jani.nikula@linux.intel.com>
To: Geliang Tang <geliangtang@163.com>,
Daniel Vetter <daniel.vetter@intel.com>,
David Airlie <airlied@linux.ie>
Cc: Geliang Tang <geliangtang@163.com>,
intel-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org,
linux-kernel@vger.kernel.org
Subject: Re: [PATCH] drm/i915: fix task reference leak in i915_debugfs.c
Date: Fri, 25 Sep 2015 14:16:07 +0300 [thread overview]
Message-ID: <87k2ren408.fsf@intel.com> (raw)
In-Reply-To: <7789a9d65ac9f2fc27e95a40b6995b21aab9fb73.1443198651.git.geliangtang@163.com>
On Fri, 25 Sep 2015, Geliang Tang <geliangtang@163.com> wrote:
> Leak a task reference in i915_ppgtt_info(), add put_task_struct()
> to fix it.
Introduced by
commit 1c60fef535d143860d5bf6593e24ab6417f5227c
Author: Ben Widawsky <ben@bwidawsk.net>
Date: Fri Dec 6 14:11:30 2013 -0800
drm/i915: Dump all ppgtt
>
> Signed-off-by: Geliang Tang <geliangtang@163.com>
> ---
> drivers/gpu/drm/i915/i915_debugfs.c | 8 ++++++--
> 1 file changed, 6 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/i915_debugfs.c b/drivers/gpu/drm/i915/i915_debugfs.c
> index 5615d3d..8797717 100644
> --- a/drivers/gpu/drm/i915/i915_debugfs.c
> +++ b/drivers/gpu/drm/i915/i915_debugfs.c
> @@ -2288,9 +2288,13 @@ static int i915_ppgtt_info(struct seq_file *m, void *data)
>
> list_for_each_entry_reverse(file, &dev->filelist, lhead) {
> struct drm_i915_file_private *file_priv = file->driver_priv;
> + struct task_struct *task;
>
> - seq_printf(m, "\nproc: %s\n",
> - get_pid_task(file->pid, PIDTYPE_PID)->comm);
> + task = get_pid_task(file->pid, PIDTYPE_PID);
> + if (!task)
> + return -ESRCH;
> + 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);
> }
> --
> 1.9.1
>
>
--
Jani Nikula, Intel Open Source Technology Center
next prev parent reply other threads:[~2015-09-25 11:16 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-09-25 10:58 [PATCH] drm/i915: fix task reference leak in i915_debugfs.c Geliang Tang
2015-09-25 11:16 ` Jani Nikula [this message]
2015-09-25 11:16 ` Jani Nikula
2015-09-25 12:27 ` Daniel Vetter
2015-09-25 12:27 ` Daniel Vetter
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=87k2ren408.fsf@intel.com \
--to=jani.nikula@linux.intel.com \
--cc=airlied@linux.ie \
--cc=daniel.vetter@intel.com \
--cc=dri-devel@lists.freedesktop.org \
--cc=geliangtang@163.com \
--cc=intel-gfx@lists.freedesktop.org \
--cc=linux-kernel@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.