From mboxrd@z Thu Jan 1 00:00:00 1970 From: Sudip Mukherjee Subject: [PATCH RESEND 2/3] drm/i915: check for return value Date: Thu, 8 Oct 2015 19:28:00 +0530 Message-ID: <1444312681-10149-2-git-send-email-sudipm.mukherjee@gmail.com> References: <1444312681-10149-1-git-send-email-sudipm.mukherjee@gmail.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: In-Reply-To: <1444312681-10149-1-git-send-email-sudipm.mukherjee@gmail.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" To: David Airlie , Daniel Vetter Cc: intel-gfx@lists.freedesktop.org, linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org, Daniel Vetter , Sudip Mukherjee List-Id: dri-devel@lists.freedesktop.org V2Ugd2VyZSBub3QgY2hlY2tpbmcgdGhlIHJldHVybiB2YWx1ZSBvZiBkcm1fZW5jb2Rlcl9pbml0 KCkgd2hpY2ggY2FuCmZhaWwuIEFuZCBpZiBpdCBmYWlscyB0aGVuIHdlIHdpbGwgYmUgd29ya2lu ZyB3aXRoIGFuIHVuaW5pdGlhbGl6ZWQKZW5jb2Rlci4KCkNjOiBEYW5pZWwgVmV0dGVyIDxkYW5p ZWwudmV0dGVyQGludGVsLmNvbT4KQ2M6IEphbmkgTmlrdWxhIDxqYW5pLm5pa3VsYUBsaW51eC5p bnRlbC5jb20+ClNpZ25lZC1vZmYtYnk6IFN1ZGlwIE11a2hlcmplZSA8c3VkaXBAdmVjdG9yaW5k aWEub3JnPgotLS0KClNlbnQgb24gMjcvMDcvMjAxNQoKIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2lu dGVsX2RwLmMgfCA2ICsrKystLQogMSBmaWxlIGNoYW5nZWQsIDQgaW5zZXJ0aW9ucygrKSwgMiBk ZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kcC5j IGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZHAuYwppbmRleCAxOGJjZmJlLi4yYThiNDdl IDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kcC5jCisrKyBiL2RyaXZl cnMvZ3B1L2RybS9pOTE1L2ludGVsX2RwLmMKQEAgLTYxNzQsOCArNjE3NCw5IEBAIGludGVsX2Rw X2luaXQoc3RydWN0IGRybV9kZXZpY2UgKmRldiwgaW50IG91dHB1dF9yZWcsIGVudW0gcG9ydCBw b3J0KQogCWludGVsX2VuY29kZXIgPSAmaW50ZWxfZGlnX3BvcnQtPmJhc2U7CiAJZW5jb2RlciA9 ICZpbnRlbF9lbmNvZGVyLT5iYXNlOwogCi0JZHJtX2VuY29kZXJfaW5pdChkZXYsICZpbnRlbF9l bmNvZGVyLT5iYXNlLCAmaW50ZWxfZHBfZW5jX2Z1bmNzLAotCQkJIERSTV9NT0RFX0VOQ09ERVJf VE1EUyk7CisJaWYgKGRybV9lbmNvZGVyX2luaXQoZGV2LCAmaW50ZWxfZW5jb2Rlci0+YmFzZSwg JmludGVsX2RwX2VuY19mdW5jcywKKwkJCSAgICAgRFJNX01PREVfRU5DT0RFUl9UTURTKSkKKwkJ Z290byBlcnJfZW5jb2Rlcl9pbml0OwogCiAJaW50ZWxfZW5jb2Rlci0+Y29tcHV0ZV9jb25maWcg PSBpbnRlbF9kcF9jb21wdXRlX2NvbmZpZzsKIAlpbnRlbF9lbmNvZGVyLT5kaXNhYmxlID0gaW50 ZWxfZGlzYWJsZV9kcDsKQEAgLTYyMjQsNiArNjIyNSw3IEBAIGludGVsX2RwX2luaXQoc3RydWN0 IGRybV9kZXZpY2UgKmRldiwgaW50IG91dHB1dF9yZWcsIGVudW0gcG9ydCBwb3J0KQogCiBlcnJf aW5pdF9jb25uZWN0b3I6CiAJZHJtX2VuY29kZXJfY2xlYW51cChlbmNvZGVyKTsKK2Vycl9lbmNv ZGVyX2luaXQ6CiAJa2ZyZWUoaW50ZWxfY29ubmVjdG9yKTsKIGVycl9jb25uZWN0b3JfYWxsb2M6 CiAJa2ZyZWUoaW50ZWxfZGlnX3BvcnQpOwotLSAKMS45LjEKCl9fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fCkludGVsLWdmeCBtYWlsaW5nIGxpc3QKSW50ZWwt Z2Z4QGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21h aWxtYW4vbGlzdGluZm8vaW50ZWwtZ2Z4Cg== From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756950AbbJHN6P (ORCPT ); Thu, 8 Oct 2015 09:58:15 -0400 Received: from mail-pa0-f42.google.com ([209.85.220.42]:34875 "EHLO mail-pa0-f42.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754109AbbJHN6N (ORCPT ); Thu, 8 Oct 2015 09:58:13 -0400 From: Sudip Mukherjee To: David Airlie , Daniel Vetter Cc: linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org, Sudip Mukherjee , intel-gfx@lists.freedesktop.org, Daniel Vetter , Jani Nikula Subject: [PATCH RESEND 2/3] drm/i915: check for return value Date: Thu, 8 Oct 2015 19:28:00 +0530 Message-Id: <1444312681-10149-2-git-send-email-sudipm.mukherjee@gmail.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1444312681-10149-1-git-send-email-sudipm.mukherjee@gmail.com> References: <1444312681-10149-1-git-send-email-sudipm.mukherjee@gmail.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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 --- 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