Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754610AbbLINde (ORCPT ); Wed, 9 Dec 2015 08:33:34 -0500 Received: from mail-wm0-f47.google.com ([74.125.82.47]:34653 "EHLO mail-wm0-f47.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754451AbbLINdc (ORCPT ); Wed, 9 Dec 2015 08:33:32 -0500 Date: Wed, 9 Dec 2015 14:33:28 +0100 From: Daniel Vetter To: Sudip Mukherjee Cc: David Airlie , linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org, intel-gfx@lists.freedesktop.org, Daniel Vetter , Jani Nikula Subject: Re: [PATCH RESEND 2/3] drm/i915: check for return value Message-ID: <20151209133328.GP20822@phenom.ffwll.local> Mail-Followup-To: Sudip Mukherjee , David Airlie , linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org, intel-gfx@lists.freedesktop.org, Daniel Vetter , Jani Nikula References: <1444312681-10149-1-git-send-email-sudipm.mukherjee@gmail.com> <1444312681-10149-2-git-send-email-sudipm.mukherjee@gmail.com> <20151008142930.GC3383@phenom.ffwll.local> <20151209113912.GA24852@sudip-pc> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20151209113912.GA24852@sudip-pc> X-Operating-System: Linux phenom 4.1.0-2-amd64 User-Agent: Mutt/1.5.23 (2014-03-12) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2663 Lines: 81 On Wed, Dec 09, 2015 at 05:09:12PM +0530, Sudip Mukherjee wrote: > On Thu, Oct 08, 2015 at 04:29:31PM +0200, Daniel Vetter wrote: > > On Thu, Oct 08, 2015 at 07:28:00PM +0530, Sudip Mukherjee wrote: > > > We were not checking the return value of drm_encoder_init() which can > > > fail. And if it fails then we will be working with an uninitialized > > > encoder. > > > > > > Cc: Daniel Vetter > > > Cc: Jani Nikula > > > Signed-off-by: Sudip Mukherjee > > > > Queued for -next, thanks for the patch. > > -Daniel > > Hi Daniel, > It is still not there in linux-next. Still applies cleanly on > next-20151209. Sorry, this must have fallen through the cracks somehow. Applied now for real. Thanks, Daniel > > regards > sudip > > > > > > --- > > > > > > Sent on 27/07/2015 > > > > > > drivers/gpu/drm/i915/intel_dp.c | 6 ++++-- > > > 1 file changed, 4 insertions(+), 2 deletions(-) > > > > > > diff --git a/drivers/gpu/drm/i915/intel_dp.c b/drivers/gpu/drm/i915/intel_dp.c > > > index 18bcfbe..2a8b47e 100644 > > > --- a/drivers/gpu/drm/i915/intel_dp.c > > > +++ b/drivers/gpu/drm/i915/intel_dp.c > > > @@ -6174,8 +6174,9 @@ intel_dp_init(struct drm_device *dev, int output_reg, enum port port) > > > intel_encoder = &intel_dig_port->base; > > > encoder = &intel_encoder->base; > > > > > > - drm_encoder_init(dev, &intel_encoder->base, &intel_dp_enc_funcs, > > > - DRM_MODE_ENCODER_TMDS); > > > + if (drm_encoder_init(dev, &intel_encoder->base, &intel_dp_enc_funcs, > > > + DRM_MODE_ENCODER_TMDS)) > > > + goto err_encoder_init; > > > > > > intel_encoder->compute_config = intel_dp_compute_config; > > > intel_encoder->disable = intel_disable_dp; > > > @@ -6224,6 +6225,7 @@ intel_dp_init(struct drm_device *dev, int output_reg, enum port port) > > > > > > err_init_connector: > > > drm_encoder_cleanup(encoder); > > > +err_encoder_init: > > > kfree(intel_connector); > > > err_connector_alloc: > > > kfree(intel_dig_port); > > > -- > > > 1.9.1 > > > > > > > -- > > Daniel Vetter > > Software Engineer, Intel Corporation > > http://blog.ffwll.ch > _______________________________________________ > dri-devel mailing list > dri-devel@lists.freedesktop.org > http://lists.freedesktop.org/mailman/listinfo/dri-devel -- Daniel Vetter Software Engineer, Intel Corporation http://blog.ffwll.ch -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/