From mboxrd@z Thu Jan 1 00:00:00 1970 From: Daniel Vetter Subject: Re: [PATCH] drm/i915: Avoid NULL ctx->obj dereference in debugfs/i915_context_info Date: Wed, 30 Apr 2014 09:37:52 +0200 Message-ID: <20140430073752.GC20800@phenom.ffwll.local> References: <1398843000-16108-1-git-send-email-chris@chris-wilson.co.uk> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: Received: from mail-ee0-f49.google.com (mail-ee0-f49.google.com [74.125.83.49]) by gabe.freedesktop.org (Postfix) with ESMTP id 7C3D06EB65 for ; Wed, 30 Apr 2014 00:37:56 -0700 (PDT) Received: by mail-ee0-f49.google.com with SMTP id e53so997908eek.8 for ; Wed, 30 Apr 2014 00:37:55 -0700 (PDT) Content-Disposition: inline In-Reply-To: <1398843000-16108-1-git-send-email-chris@chris-wilson.co.uk> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" To: Chris Wilson Cc: intel-gfx@lists.freedesktop.org List-Id: intel-gfx@lists.freedesktop.org On Wed, Apr 30, 2014 at 08:30:00AM +0100, Chris Wilson wrote: > In commit 691e6415c891b8b2b082a120b896b443531c4d45 > Author: Chris Wilson > Date: Wed Apr 9 09:07:36 2014 +0100 > > drm/i915: Always use kref tracking for all contexts. > > we populated fake contexts on all platforms. These were identical to the > full hardware context tracking structs, except for the ctx->obj used to > store the hardware state. However, there remained one place where we > assumed that if a context existed, it would have an object associated > with it. > > Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=77717 > Testcase: igt/drv_suspend/debugfs-reader > Signed-off-by: Chris Wilson Queued for -next, thanks for the patch. -Daniel > --- > drivers/gpu/drm/i915/i915_debugfs.c | 3 +++ > 1 file changed, 3 insertions(+) > > diff --git a/drivers/gpu/drm/i915/i915_debugfs.c b/drivers/gpu/drm/i915/i915_debugfs.c > index 3c066e635022..9f50675c327a 100644 > --- a/drivers/gpu/drm/i915/i915_debugfs.c > +++ b/drivers/gpu/drm/i915/i915_debugfs.c > @@ -1796,6 +1796,9 @@ static int i915_context_status(struct seq_file *m, void *unused) > } > > list_for_each_entry(ctx, &dev_priv->context_list, link) { > + if (ctx->obj == NULL) > + continue; > + > seq_puts(m, "HW context "); > describe_ctx(m, ctx); > for_each_ring(ring, dev_priv, i) > -- > 2.0.0.rc0 > > _______________________________________________ > Intel-gfx mailing list > Intel-gfx@lists.freedesktop.org > http://lists.freedesktop.org/mailman/listinfo/intel-gfx -- Daniel Vetter Software Engineer, Intel Corporation +41 (0) 79 365 57 48 - http://blog.ffwll.ch