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: Thu, 8 Oct 2015 16:29:31 +0200 Message-ID: <20151008142930.GC3383@phenom.ffwll.local> References: <1444312681-10149-1-git-send-email-sudipm.mukherjee@gmail.com> <1444312681-10149-2-git-send-email-sudipm.mukherjee@gmail.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mail-wi0-f170.google.com (mail-wi0-f170.google.com [209.85.212.170]) by gabe.freedesktop.org (Postfix) with ESMTPS id D097B6EC5C for ; Thu, 8 Oct 2015 07:26:38 -0700 (PDT) Received: by wicge5 with SMTP id ge5so28370651wic.0 for ; Thu, 08 Oct 2015 07:26:37 -0700 (PDT) Content-Disposition: inline In-Reply-To: <1444312681-10149-2-git-send-email-sudipm.mukherjee@gmail.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" To: Sudip Mukherjee Cc: Daniel Vetter , intel-gfx@lists.freedesktop.org, linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org, Daniel Vetter List-Id: dri-devel@lists.freedesktop.org T24gVGh1LCBPY3QgMDgsIDIwMTUgYXQgMDc6Mjg6MDBQTSArMDUzMCwgU3VkaXAgTXVraGVyamVl IHdyb3RlOgo+IFdlIHdlcmUgbm90IGNoZWNraW5nIHRoZSByZXR1cm4gdmFsdWUgb2YgZHJtX2Vu Y29kZXJfaW5pdCgpIHdoaWNoIGNhbgo+IGZhaWwuIEFuZCBpZiBpdCBmYWlscyB0aGVuIHdlIHdp bGwgYmUgd29ya2luZyB3aXRoIGFuIHVuaW5pdGlhbGl6ZWQKPiBlbmNvZGVyLgo+IAo+IENjOiBE YW5pZWwgVmV0dGVyIDxkYW5pZWwudmV0dGVyQGludGVsLmNvbT4KPiBDYzogSmFuaSBOaWt1bGEg PGphbmkubmlrdWxhQGxpbnV4LmludGVsLmNvbT4KPiBTaWduZWQtb2ZmLWJ5OiBTdWRpcCBNdWto ZXJqZWUgPHN1ZGlwQHZlY3RvcmluZGlhLm9yZz4KClF1ZXVlZCBmb3IgLW5leHQsIHRoYW5rcyBm b3IgdGhlIHBhdGNoLgotRGFuaWVsCgo+IC0tLQo+IAo+IFNlbnQgb24gMjcvMDcvMjAxNQo+IAo+ ICBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kcC5jIHwgNiArKysrLS0KPiAgMSBmaWxlIGNo YW5nZWQsIDQgaW5zZXJ0aW9ucygrKSwgMiBkZWxldGlvbnMoLSkKPiAKPiBkaWZmIC0tZ2l0IGEv ZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZHAuYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2lu dGVsX2RwLmMKPiBpbmRleCAxOGJjZmJlLi4yYThiNDdlIDEwMDY0NAo+IC0tLSBhL2RyaXZlcnMv Z3B1L2RybS9pOTE1L2ludGVsX2RwLmMKPiArKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRl bF9kcC5jCj4gQEAgLTYxNzQsOCArNjE3NCw5IEBAIGludGVsX2RwX2luaXQoc3RydWN0IGRybV9k ZXZpY2UgKmRldiwgaW50IG91dHB1dF9yZWcsIGVudW0gcG9ydCBwb3J0KQo+ICAJaW50ZWxfZW5j b2RlciA9ICZpbnRlbF9kaWdfcG9ydC0+YmFzZTsKPiAgCWVuY29kZXIgPSAmaW50ZWxfZW5jb2Rl ci0+YmFzZTsKPiAgCj4gLQlkcm1fZW5jb2Rlcl9pbml0KGRldiwgJmludGVsX2VuY29kZXItPmJh c2UsICZpbnRlbF9kcF9lbmNfZnVuY3MsCj4gLQkJCSBEUk1fTU9ERV9FTkNPREVSX1RNRFMpOwo+ ICsJaWYgKGRybV9lbmNvZGVyX2luaXQoZGV2LCAmaW50ZWxfZW5jb2Rlci0+YmFzZSwgJmludGVs X2RwX2VuY19mdW5jcywKPiArCQkJICAgICBEUk1fTU9ERV9FTkNPREVSX1RNRFMpKQo+ICsJCWdv dG8gZXJyX2VuY29kZXJfaW5pdDsKPiAgCj4gIAlpbnRlbF9lbmNvZGVyLT5jb21wdXRlX2NvbmZp ZyA9IGludGVsX2RwX2NvbXB1dGVfY29uZmlnOwo+ICAJaW50ZWxfZW5jb2Rlci0+ZGlzYWJsZSA9 IGludGVsX2Rpc2FibGVfZHA7Cj4gQEAgLTYyMjQsNiArNjIyNSw3IEBAIGludGVsX2RwX2luaXQo c3RydWN0IGRybV9kZXZpY2UgKmRldiwgaW50IG91dHB1dF9yZWcsIGVudW0gcG9ydCBwb3J0KQo+ ICAKPiAgZXJyX2luaXRfY29ubmVjdG9yOgo+ICAJZHJtX2VuY29kZXJfY2xlYW51cChlbmNvZGVy KTsKPiArZXJyX2VuY29kZXJfaW5pdDoKPiAgCWtmcmVlKGludGVsX2Nvbm5lY3Rvcik7Cj4gIGVy cl9jb25uZWN0b3JfYWxsb2M6Cj4gIAlrZnJlZShpbnRlbF9kaWdfcG9ydCk7Cj4gLS0gCj4gMS45 LjEKPiAKCi0tIApEYW5pZWwgVmV0dGVyClNvZnR3YXJlIEVuZ2luZWVyLCBJbnRlbCBDb3Jwb3Jh dGlvbgpodHRwOi8vYmxvZy5mZndsbC5jaApfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fXwpkcmktZGV2ZWwgbWFpbGluZyBsaXN0CmRyaS1kZXZlbEBsaXN0cy5m cmVlZGVza3RvcC5vcmcKaHR0cDovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3Rp bmZvL2RyaS1kZXZlbAo= From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933254AbbJHO0j (ORCPT ); Thu, 8 Oct 2015 10:26:39 -0400 Received: from mail-wi0-f175.google.com ([209.85.212.175]:36719 "EHLO mail-wi0-f175.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932466AbbJHO0i (ORCPT ); Thu, 8 Oct 2015 10:26:38 -0400 Date: Thu, 8 Oct 2015 16:29:31 +0200 From: Daniel Vetter To: Sudip Mukherjee Cc: David Airlie , Daniel Vetter , 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: <20151008142930.GC3383@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> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <1444312681-10149-2-git-send-email-sudipm.mukherjee@gmail.com> 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 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 > --- > > 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