From mboxrd@z Thu Jan 1 00:00:00 1970 From: Dan Carpenter Date: Thu, 13 Oct 2016 08:55:08 +0000 Subject: [patch] drm/i915: fix a read size argument Message-Id: <20161013085508.GJ16198@mwanda> List-Id: MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: Daniel Vetter , Ville =?iso-8859-1?Q?Syrj=E4l=E4?= Cc: David Airlie , intel-gfx@lists.freedesktop.org, kernel-janitors@vger.kernel.org, linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org We want to read 3 bytes here, but because the parenthesis are in the wrong place we instead read: sizeof(intel_dp->edp_dpcd) = sizeof(intel_dp->edp_dpcd) which is one byte. Fixes: fe5a66f91c88 ("drm/i915: Read PSR caps/intermediate freqs/etc. only once on eDP") Signed-off-by: Dan Carpenter diff --git a/drivers/gpu/drm/i915/intel_dp.c b/drivers/gpu/drm/i915/intel_dp.c index 14a3cf0..ee8aa95 100644 --- a/drivers/gpu/drm/i915/intel_dp.c +++ b/drivers/gpu/drm/i915/intel_dp.c @@ -3551,8 +3551,8 @@ intel_edp_init_dpcd(struct intel_dp *intel_dp) /* Read the eDP Display control capabilities registers */ if ((intel_dp->dpcd[DP_EDP_CONFIGURATION_CAP] & DP_DPCD_DISPLAY_CONTROL_CAPABLE) && drm_dp_dpcd_read(&intel_dp->aux, DP_EDP_DPCD_REV, - intel_dp->edp_dpcd, sizeof(intel_dp->edp_dpcd) = - sizeof(intel_dp->edp_dpcd))) + intel_dp->edp_dpcd, sizeof(intel_dp->edp_dpcd)) = + sizeof(intel_dp->edp_dpcd)) DRM_DEBUG_KMS("EDP DPCD : %*ph\n", (int) sizeof(intel_dp->edp_dpcd), intel_dp->edp_dpcd); From mboxrd@z Thu Jan 1 00:00:00 1970 From: Dan Carpenter Subject: [patch] drm/i915: fix a read size argument Date: Thu, 13 Oct 2016 11:55:08 +0300 Message-ID: <20161013085508.GJ16198@mwanda> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Content-Disposition: inline List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" To: Daniel Vetter , Ville =?iso-8859-1?Q?Syrj=E4l=E4?= Cc: David Airlie , intel-gfx@lists.freedesktop.org, kernel-janitors@vger.kernel.org, linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org List-Id: dri-devel@lists.freedesktop.org V2Ugd2FudCB0byByZWFkIDMgYnl0ZXMgaGVyZSwgYnV0IGJlY2F1c2UgdGhlIHBhcmVudGhlc2lz IGFyZSBpbiB0aGUKd3JvbmcgcGxhY2Ugd2UgaW5zdGVhZCByZWFkOgoKCXNpemVvZihpbnRlbF9k cC0+ZWRwX2RwY2QpID09IHNpemVvZihpbnRlbF9kcC0+ZWRwX2RwY2QpCgp3aGljaCBpcyBvbmUg Ynl0ZS4KCkZpeGVzOiBmZTVhNjZmOTFjODggKCJkcm0vaTkxNTogUmVhZCBQU1IgY2Fwcy9pbnRl cm1lZGlhdGUgZnJlcXMvZXRjLiBvbmx5IG9uY2Ugb24gZURQIikKU2lnbmVkLW9mZi1ieTogRGFu IENhcnBlbnRlciA8ZGFuLmNhcnBlbnRlckBvcmFjbGUuY29tPgoKZGlmZiAtLWdpdCBhL2RyaXZl cnMvZ3B1L2RybS9pOTE1L2ludGVsX2RwLmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9k cC5jCmluZGV4IDE0YTNjZjAuLmVlOGFhOTUgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9p OTE1L2ludGVsX2RwLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZHAuYwpAQCAt MzU1MSw4ICszNTUxLDggQEAgaW50ZWxfZWRwX2luaXRfZHBjZChzdHJ1Y3QgaW50ZWxfZHAgKmlu dGVsX2RwKQogCS8qIFJlYWQgdGhlIGVEUCBEaXNwbGF5IGNvbnRyb2wgY2FwYWJpbGl0aWVzIHJl Z2lzdGVycyAqLwogCWlmICgoaW50ZWxfZHAtPmRwY2RbRFBfRURQX0NPTkZJR1VSQVRJT05fQ0FQ XSAmIERQX0RQQ0RfRElTUExBWV9DT05UUk9MX0NBUEFCTEUpICYmCiAJICAgIGRybV9kcF9kcGNk X3JlYWQoJmludGVsX2RwLT5hdXgsIERQX0VEUF9EUENEX1JFViwKLQkJCSAgICAgaW50ZWxfZHAt PmVkcF9kcGNkLCBzaXplb2YoaW50ZWxfZHAtPmVkcF9kcGNkKSA9PQotCQkJICAgICBzaXplb2Yo aW50ZWxfZHAtPmVkcF9kcGNkKSkpCisJCQkgICAgIGludGVsX2RwLT5lZHBfZHBjZCwgc2l6ZW9m KGludGVsX2RwLT5lZHBfZHBjZCkpID09CisJCQkgICAgIHNpemVvZihpbnRlbF9kcC0+ZWRwX2Rw Y2QpKQogCQlEUk1fREVCVUdfS01TKCJFRFAgRFBDRCA6ICUqcGhcbiIsIChpbnQpIHNpemVvZihp bnRlbF9kcC0+ZWRwX2RwY2QpLAogCQkJICAgICAgaW50ZWxfZHAtPmVkcF9kcGNkKTsKIApfX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpJbnRlbC1nZnggbWFp bGluZyBsaXN0CkludGVsLWdmeEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cHM6Ly9saXN0cy5m cmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9pbnRlbC1nZngK From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752843AbcJMIzm (ORCPT ); Thu, 13 Oct 2016 04:55:42 -0400 Received: from userp1040.oracle.com ([156.151.31.81]:35033 "EHLO userp1040.oracle.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753217AbcJMIze (ORCPT ); Thu, 13 Oct 2016 04:55:34 -0400 Date: Thu, 13 Oct 2016 11:55:08 +0300 From: Dan Carpenter To: Daniel Vetter , Ville =?iso-8859-1?Q?Syrj=E4l=E4?= Cc: Jani Nikula , David Airlie , intel-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org, kernel-janitors@vger.kernel.org Subject: [patch] drm/i915: fix a read size argument Message-ID: <20161013085508.GJ16198@mwanda> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline User-Agent: Mutt/1.6.0 (2016-04-01) X-Source-IP: userv0021.oracle.com [156.151.31.71] Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org We want to read 3 bytes here, but because the parenthesis are in the wrong place we instead read: sizeof(intel_dp->edp_dpcd) == sizeof(intel_dp->edp_dpcd) which is one byte. Fixes: fe5a66f91c88 ("drm/i915: Read PSR caps/intermediate freqs/etc. only once on eDP") Signed-off-by: Dan Carpenter diff --git a/drivers/gpu/drm/i915/intel_dp.c b/drivers/gpu/drm/i915/intel_dp.c index 14a3cf0..ee8aa95 100644 --- a/drivers/gpu/drm/i915/intel_dp.c +++ b/drivers/gpu/drm/i915/intel_dp.c @@ -3551,8 +3551,8 @@ intel_edp_init_dpcd(struct intel_dp *intel_dp) /* Read the eDP Display control capabilities registers */ if ((intel_dp->dpcd[DP_EDP_CONFIGURATION_CAP] & DP_DPCD_DISPLAY_CONTROL_CAPABLE) && drm_dp_dpcd_read(&intel_dp->aux, DP_EDP_DPCD_REV, - intel_dp->edp_dpcd, sizeof(intel_dp->edp_dpcd) == - sizeof(intel_dp->edp_dpcd))) + intel_dp->edp_dpcd, sizeof(intel_dp->edp_dpcd)) == + sizeof(intel_dp->edp_dpcd)) DRM_DEBUG_KMS("EDP DPCD : %*ph\n", (int) sizeof(intel_dp->edp_dpcd), intel_dp->edp_dpcd);