From mboxrd@z Thu Jan 1 00:00:00 1970 From: Daniel Vetter Subject: Re: [patch] drm/i915: dereferencing an error pointer Date: Tue, 17 Jul 2012 10:22:14 +0200 Message-ID: <20120717082214.GA5498@phenom.ffwll.local> References: <20120717064449.GB14985@elgon.mountain> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: Received: from mail-we0-f177.google.com (mail-we0-f177.google.com [74.125.82.177]) by gabe.freedesktop.org (Postfix) with ESMTP id 5C94DA0A12 for ; Tue, 17 Jul 2012 01:22:15 -0700 (PDT) Received: by weyr3 with SMTP id r3so100148wey.36 for ; Tue, 17 Jul 2012 01:22:14 -0700 (PDT) Content-Disposition: inline In-Reply-To: <20120717064449.GB14985@elgon.mountain> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: dri-devel-bounces+sf-dri-devel=m.gmane.org@lists.freedesktop.org Errors-To: dri-devel-bounces+sf-dri-devel=m.gmane.org@lists.freedesktop.org To: Dan Carpenter Cc: Daniel Vetter , kernel-janitors@vger.kernel.org, dri-devel@lists.freedesktop.org List-Id: dri-devel@lists.freedesktop.org On Tue, Jul 17, 2012 at 09:44:49AM +0300, Dan Carpenter wrote: > We need to check that "ctx" is a valid pointer before dereferencing it. > > Signed-off-by: Dan Carpenter Queued for drm-intel-next, thanks for the patch. -Daniel > --- > Applies to linux-next. > > diff --git a/drivers/gpu/drm/i915/i915_gem_context.c b/drivers/gpu/drm/i915/i915_gem_context.c > index 9ae3f2c..a82c0ec 100644 > --- a/drivers/gpu/drm/i915/i915_gem_context.c > +++ b/drivers/gpu/drm/i915/i915_gem_context.c > @@ -496,11 +496,13 @@ int i915_gem_context_create_ioctl(struct drm_device *dev, void *data, > > ctx = create_hw_context(dev, file_priv); > mutex_unlock(&dev->struct_mutex); > + if (IS_ERR(ctx)) > + return PTR_ERR(ctx); > > args->ctx_id = ctx->id; > DRM_DEBUG_DRIVER("HW context %d created\n", args->ctx_id); > > - return PTR_RET(ctx); > + return 0; > } > > int i915_gem_context_destroy_ioctl(struct drm_device *dev, void *data, -- Daniel Vetter Mail: daniel@ffwll.ch Mobile: +41 (0)79 365 57 48