| Message ID | 7789a9d65ac9f2fc27e95a40b6995b21aab9fb73.1443198651.git.geliangtang@163.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Fri, Sep 25, 2015 at 02:16:07PM +0300, Jani Nikula wrote: > 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 Queued for -next, thanks for the patch. -Daniel > > > > > > 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 > _______________________________________________ > dri-devel mailing list > dri-devel@lists.freedesktop.org > http://lists.freedesktop.org/mailman/listinfo/dri-devel
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); }
Leak a task reference in i915_ppgtt_info(), add put_task_struct() to fix it. Signed-off-by: Geliang Tang <geliangtang@163.com> --- drivers/gpu/drm/i915/i915_debugfs.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-)