From mboxrd@z Thu Jan 1 00:00:00 1970 From: Daniel Vetter Subject: Re: [PATCH RESEND 2/3] drm/i915: check for return value Date: Wed, 9 Dec 2015 14:33:28 +0100 Message-ID: <20151209133328.GP20822@phenom.ffwll.local> 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="utf-8" Content-Transfer-Encoding: base64 Return-path: Content-Disposition: inline In-Reply-To: <20151209113912.GA24852@sudip-pc> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" To: Sudip Mukherjee Cc: David Airlie , intel-gfx@lists.freedesktop.org, linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org, Daniel Vetter List-Id: dri-devel@lists.freedesktop.org T24gV2VkLCBEZWMgMDksIDIwMTUgYXQgMDU6MDk6MTJQTSArMDUzMCwgU3VkaXAgTXVraGVyamVl IHdyb3RlOgo+IE9uIFRodSwgT2N0IDA4LCAyMDE1IGF0IDA0OjI5OjMxUE0gKzAyMDAsIERhbmll bCBWZXR0ZXIgd3JvdGU6Cj4gPiBPbiBUaHUsIE9jdCAwOCwgMjAxNSBhdCAwNzoyODowMFBNICsw NTMwLCBTdWRpcCBNdWtoZXJqZWUgd3JvdGU6Cj4gPiA+IFdlIHdlcmUgbm90IGNoZWNraW5nIHRo ZSByZXR1cm4gdmFsdWUgb2YgZHJtX2VuY29kZXJfaW5pdCgpIHdoaWNoIGNhbgo+ID4gPiBmYWls LiBBbmQgaWYgaXQgZmFpbHMgdGhlbiB3ZSB3aWxsIGJlIHdvcmtpbmcgd2l0aCBhbiB1bmluaXRp YWxpemVkCj4gPiA+IGVuY29kZXIuCj4gPiA+IAo+ID4gPiBDYzogRGFuaWVsIFZldHRlciA8ZGFu aWVsLnZldHRlckBpbnRlbC5jb20+Cj4gPiA+IENjOiBKYW5pIE5pa3VsYSA8amFuaS5uaWt1bGFA bGludXguaW50ZWwuY29tPgo+ID4gPiBTaWduZWQtb2ZmLWJ5OiBTdWRpcCBNdWtoZXJqZWUgPHN1 ZGlwQHZlY3RvcmluZGlhLm9yZz4KPiA+IAo+ID4gUXVldWVkIGZvciAtbmV4dCwgdGhhbmtzIGZv ciB0aGUgcGF0Y2guCj4gPiAtRGFuaWVsCj4gCj4gSGkgRGFuaWVsLAo+IEl0IGlzIHN0aWxsIG5v dCB0aGVyZSBpbiBsaW51eC1uZXh0LiBTdGlsbCBhcHBsaWVzIGNsZWFubHkgb24KPiBuZXh0LTIw MTUxMjA5LgoKU29ycnksIHRoaXMgbXVzdCBoYXZlIGZhbGxlbiB0aHJvdWdoIHRoZSBjcmFja3Mg c29tZWhvdy4gQXBwbGllZCBub3cgZm9yCnJlYWwuCgpUaGFua3MsIERhbmllbAoKPiAKPiByZWdh cmRzCj4gc3VkaXAKPiAKPiA+IAo+ID4gPiAtLS0KPiA+ID4gCj4gPiA+IFNlbnQgb24gMjcvMDcv MjAxNQo+ID4gPiAKPiA+ID4gIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2RwLmMgfCA2ICsr KystLQo+ID4gPiAgMSBmaWxlIGNoYW5nZWQsIDQgaW5zZXJ0aW9ucygrKSwgMiBkZWxldGlvbnMo LSkKPiA+ID4gCj4gPiA+IGRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9k cC5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZHAuYwo+ID4gPiBpbmRleCAxOGJjZmJl Li4yYThiNDdlIDEwMDY0NAo+ID4gPiAtLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9k cC5jCj4gPiA+ICsrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2RwLmMKPiA+ID4gQEAg LTYxNzQsOCArNjE3NCw5IEBAIGludGVsX2RwX2luaXQoc3RydWN0IGRybV9kZXZpY2UgKmRldiwg aW50IG91dHB1dF9yZWcsIGVudW0gcG9ydCBwb3J0KQo+ID4gPiAgCWludGVsX2VuY29kZXIgPSAm aW50ZWxfZGlnX3BvcnQtPmJhc2U7Cj4gPiA+ICAJZW5jb2RlciA9ICZpbnRlbF9lbmNvZGVyLT5i YXNlOwo+ID4gPiAgCj4gPiA+IC0JZHJtX2VuY29kZXJfaW5pdChkZXYsICZpbnRlbF9lbmNvZGVy LT5iYXNlLCAmaW50ZWxfZHBfZW5jX2Z1bmNzLAo+ID4gPiAtCQkJIERSTV9NT0RFX0VOQ09ERVJf VE1EUyk7Cj4gPiA+ICsJaWYgKGRybV9lbmNvZGVyX2luaXQoZGV2LCAmaW50ZWxfZW5jb2Rlci0+ YmFzZSwgJmludGVsX2RwX2VuY19mdW5jcywKPiA+ID4gKwkJCSAgICAgRFJNX01PREVfRU5DT0RF Ul9UTURTKSkKPiA+ID4gKwkJZ290byBlcnJfZW5jb2Rlcl9pbml0Owo+ID4gPiAgCj4gPiA+ICAJ aW50ZWxfZW5jb2Rlci0+Y29tcHV0ZV9jb25maWcgPSBpbnRlbF9kcF9jb21wdXRlX2NvbmZpZzsK PiA+ID4gIAlpbnRlbF9lbmNvZGVyLT5kaXNhYmxlID0gaW50ZWxfZGlzYWJsZV9kcDsKPiA+ID4g QEAgLTYyMjQsNiArNjIyNSw3IEBAIGludGVsX2RwX2luaXQoc3RydWN0IGRybV9kZXZpY2UgKmRl diwgaW50IG91dHB1dF9yZWcsIGVudW0gcG9ydCBwb3J0KQo+ID4gPiAgCj4gPiA+ICBlcnJfaW5p dF9jb25uZWN0b3I6Cj4gPiA+ICAJZHJtX2VuY29kZXJfY2xlYW51cChlbmNvZGVyKTsKPiA+ID4g K2Vycl9lbmNvZGVyX2luaXQ6Cj4gPiA+ICAJa2ZyZWUoaW50ZWxfY29ubmVjdG9yKTsKPiA+ID4g IGVycl9jb25uZWN0b3JfYWxsb2M6Cj4gPiA+ICAJa2ZyZWUoaW50ZWxfZGlnX3BvcnQpOwo+ID4g PiAtLSAKPiA+ID4gMS45LjEKPiA+ID4gCj4gPiAKPiA+IC0tIAo+ID4gRGFuaWVsIFZldHRlcgo+ ID4gU29mdHdhcmUgRW5naW5lZXIsIEludGVsIENvcnBvcmF0aW9uCj4gPiBodHRwOi8vYmxvZy5m ZndsbC5jaAo+IF9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f Cj4gZHJpLWRldmVsIG1haWxpbmcgbGlzdAo+IGRyaS1kZXZlbEBsaXN0cy5mcmVlZGVza3RvcC5v cmcKPiBodHRwOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8vZHJpLWRl dmVsCgotLSAKRGFuaWVsIFZldHRlcgpTb2Z0d2FyZSBFbmdpbmVlciwgSW50ZWwgQ29ycG9yYXRp b24KaHR0cDovL2Jsb2cuZmZ3bGwuY2gKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX18KSW50ZWwtZ2Z4IG1haWxpbmcgbGlzdApJbnRlbC1nZnhAbGlzdHMuZnJl ZWRlc2t0b3Aub3JnCmh0dHA6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5m by9pbnRlbC1nZngK From mboxrd@z Thu Jan 1 00:00:00 1970 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 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