From mboxrd@z Thu Jan 1 00:00:00 1970 From: Sudip Mukherjee Subject: Re: [PATCH RESEND 2/3] drm/i915: check for return value Date: Wed, 9 Dec 2015 17:09:12 +0530 Message-ID: <20151209113912.GA24852@sudip-pc> 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> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Content-Disposition: inline In-Reply-To: <20151008142930.GC3383@phenom.ffwll.local> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" To: David Airlie , linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org, intel-gfx@lists.freedesktop.org, Daniel Vetter , Jani Nikula List-Id: dri-devel@lists.freedesktop.org T24gVGh1LCBPY3QgMDgsIDIwMTUgYXQgMDQ6Mjk6MzFQTSArMDIwMCwgRGFuaWVsIFZldHRlciB3 cm90ZToKPiBPbiBUaHUsIE9jdCAwOCwgMjAxNSBhdCAwNzoyODowMFBNICswNTMwLCBTdWRpcCBN dWtoZXJqZWUgd3JvdGU6Cj4gPiBXZSB3ZXJlIG5vdCBjaGVja2luZyB0aGUgcmV0dXJuIHZhbHVl IG9mIGRybV9lbmNvZGVyX2luaXQoKSB3aGljaCBjYW4KPiA+IGZhaWwuIEFuZCBpZiBpdCBmYWls cyB0aGVuIHdlIHdpbGwgYmUgd29ya2luZyB3aXRoIGFuIHVuaW5pdGlhbGl6ZWQKPiA+IGVuY29k ZXIuCj4gPiAKPiA+IENjOiBEYW5pZWwgVmV0dGVyIDxkYW5pZWwudmV0dGVyQGludGVsLmNvbT4K PiA+IENjOiBKYW5pIE5pa3VsYSA8amFuaS5uaWt1bGFAbGludXguaW50ZWwuY29tPgo+ID4gU2ln bmVkLW9mZi1ieTogU3VkaXAgTXVraGVyamVlIDxzdWRpcEB2ZWN0b3JpbmRpYS5vcmc+Cj4gCj4g UXVldWVkIGZvciAtbmV4dCwgdGhhbmtzIGZvciB0aGUgcGF0Y2guCj4gLURhbmllbAoKSGkgRGFu aWVsLApJdCBpcyBzdGlsbCBub3QgdGhlcmUgaW4gbGludXgtbmV4dC4gU3RpbGwgYXBwbGllcyBj bGVhbmx5IG9uCm5leHQtMjAxNTEyMDkuCgpyZWdhcmRzCnN1ZGlwCgo+IAo+ID4gLS0tCj4gPiAK PiA+IFNlbnQgb24gMjcvMDcvMjAxNQo+ID4gCj4gPiAgZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50 ZWxfZHAuYyB8IDYgKysrKy0tCj4gPiAgMSBmaWxlIGNoYW5nZWQsIDQgaW5zZXJ0aW9ucygrKSwg MiBkZWxldGlvbnMoLSkKPiA+IAo+ID4gZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1 L2ludGVsX2RwLmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kcC5jCj4gPiBpbmRleCAx OGJjZmJlLi4yYThiNDdlIDEwMDY0NAo+ID4gLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50 ZWxfZHAuYwo+ID4gKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZHAuYwo+ID4gQEAg LTYxNzQsOCArNjE3NCw5IEBAIGludGVsX2RwX2luaXQoc3RydWN0IGRybV9kZXZpY2UgKmRldiwg aW50IG91dHB1dF9yZWcsIGVudW0gcG9ydCBwb3J0KQo+ID4gIAlpbnRlbF9lbmNvZGVyID0gJmlu dGVsX2RpZ19wb3J0LT5iYXNlOwo+ID4gIAllbmNvZGVyID0gJmludGVsX2VuY29kZXItPmJhc2U7 Cj4gPiAgCj4gPiAtCWRybV9lbmNvZGVyX2luaXQoZGV2LCAmaW50ZWxfZW5jb2Rlci0+YmFzZSwg JmludGVsX2RwX2VuY19mdW5jcywKPiA+IC0JCQkgRFJNX01PREVfRU5DT0RFUl9UTURTKTsKPiA+ ICsJaWYgKGRybV9lbmNvZGVyX2luaXQoZGV2LCAmaW50ZWxfZW5jb2Rlci0+YmFzZSwgJmludGVs X2RwX2VuY19mdW5jcywKPiA+ICsJCQkgICAgIERSTV9NT0RFX0VOQ09ERVJfVE1EUykpCj4gPiAr CQlnb3RvIGVycl9lbmNvZGVyX2luaXQ7Cj4gPiAgCj4gPiAgCWludGVsX2VuY29kZXItPmNvbXB1 dGVfY29uZmlnID0gaW50ZWxfZHBfY29tcHV0ZV9jb25maWc7Cj4gPiAgCWludGVsX2VuY29kZXIt PmRpc2FibGUgPSBpbnRlbF9kaXNhYmxlX2RwOwo+ID4gQEAgLTYyMjQsNiArNjIyNSw3IEBAIGlu dGVsX2RwX2luaXQoc3RydWN0IGRybV9kZXZpY2UgKmRldiwgaW50IG91dHB1dF9yZWcsIGVudW0g cG9ydCBwb3J0KQo+ID4gIAo+ID4gIGVycl9pbml0X2Nvbm5lY3RvcjoKPiA+ICAJZHJtX2VuY29k ZXJfY2xlYW51cChlbmNvZGVyKTsKPiA+ICtlcnJfZW5jb2Rlcl9pbml0Ogo+ID4gIAlrZnJlZShp bnRlbF9jb25uZWN0b3IpOwo+ID4gIGVycl9jb25uZWN0b3JfYWxsb2M6Cj4gPiAgCWtmcmVlKGlu dGVsX2RpZ19wb3J0KTsKPiA+IC0tIAo+ID4gMS45LjEKPiA+IAo+IAo+IC0tIAo+IERhbmllbCBW ZXR0ZXIKPiBTb2Z0d2FyZSBFbmdpbmVlciwgSW50ZWwgQ29ycG9yYXRpb24KPiBodHRwOi8vYmxv Zy5mZndsbC5jaApfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f XwpkcmktZGV2ZWwgbWFpbGluZyBsaXN0CmRyaS1kZXZlbEBsaXN0cy5mcmVlZGVza3RvcC5vcmcK aHR0cDovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2RyaS1kZXZlbAo= From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753771AbbLILjY (ORCPT ); Wed, 9 Dec 2015 06:39:24 -0500 Received: from mail-pf0-f181.google.com ([209.85.192.181]:33287 "EHLO mail-pf0-f181.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751526AbbLILjW (ORCPT ); Wed, 9 Dec 2015 06:39:22 -0500 Date: Wed, 9 Dec 2015 17:09:12 +0530 From: Sudip Mukherjee To: 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: <20151209113912.GA24852@sudip-pc> 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> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20151008142930.GC3383@phenom.ffwll.local> User-Agent: Mutt/1.5.21 (2010-09-15) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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. 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