From mboxrd@z Thu Jan 1 00:00:00 1970 From: walter harms Date: Thu, 13 Oct 2016 09:27:28 +0000 Subject: Re: [patch] drm/i915: fix a read size argument Message-Id: <57FF5380.1080704@bfs.de> List-Id: References: <20161013085508.GJ16198@mwanda> In-Reply-To: <20161013085508.GJ16198@mwanda> MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: Dan Carpenter Cc: intel-gfx@lists.freedesktop.org, kernel-janitors@vger.kernel.org, linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org, Daniel Vetter Am 13.10.2016 10:55, schrieb Dan Carpenter: > 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)) perhaps we can morph that into something more readable ? I would suggest: if (intel_dp->dpcd[DP_EDP_CONFIGURATION_CAP] & DP_DPCD_DISPLAY_CONTROL_CAPABLE) { size_t size=sizeof(intel_dp->edp_dpcd); /* = EDP_DISPLAY_CTL_CAP_SIZE */ int ret; ret=drm_dp_dpcd_read(&intel_dp->aux, DP_EDP_DPCD_REV,intel_dp->edp_dpcd,size); if (ret != size ) ...... } this way it improves readability and reduces line length. > DRM_DEBUG_KMS("EDP DPCD : %*ph\n", (int) sizeof(intel_dp->edp_dpcd), > intel_dp->edp_dpcd); > > -- > To unsubscribe from this list: send the line "unsubscribe kernel-janitors" in > the body of a message to majordomo@vger.kernel.org > More majordomo info at http://vger.kernel.org/majordomo-info.html > From mboxrd@z Thu Jan 1 00:00:00 1970 From: walter harms Subject: Re: [patch] drm/i915: fix a read size argument Date: Thu, 13 Oct 2016 11:27:28 +0200 Message-ID: <57FF5380.1080704@bfs.de> References: <20161013085508.GJ16198@mwanda> Reply-To: wharms@bfs.de Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: In-Reply-To: <20161013085508.GJ16198@mwanda> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" To: Dan Carpenter Cc: intel-gfx@lists.freedesktop.org, kernel-janitors@vger.kernel.org, linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org, Daniel Vetter List-Id: dri-devel@lists.freedesktop.org CgpBbSAxMy4xMC4yMDE2IDEwOjU1LCBzY2hyaWViIERhbiBDYXJwZW50ZXI6Cj4gV2Ugd2FudCB0 byByZWFkIDMgYnl0ZXMgaGVyZSwgYnV0IGJlY2F1c2UgdGhlIHBhcmVudGhlc2lzIGFyZSBpbiB0 aGUKPiB3cm9uZyBwbGFjZSB3ZSBpbnN0ZWFkIHJlYWQ6Cj4gCj4gCXNpemVvZihpbnRlbF9kcC0+ ZWRwX2RwY2QpID09IHNpemVvZihpbnRlbF9kcC0+ZWRwX2RwY2QpCj4gCj4gd2hpY2ggaXMgb25l IGJ5dGUuCj4gCj4gRml4ZXM6IGZlNWE2NmY5MWM4OCAoImRybS9pOTE1OiBSZWFkIFBTUiBjYXBz L2ludGVybWVkaWF0ZSBmcmVxcy9ldGMuIG9ubHkgb25jZSBvbiBlRFAiKQo+IFNpZ25lZC1vZmYt Ynk6IERhbiBDYXJwZW50ZXIgPGRhbi5jYXJwZW50ZXJAb3JhY2xlLmNvbT4KPiAKPiBkaWZmIC0t Z2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZHAuYyBiL2RyaXZlcnMvZ3B1L2RybS9p OTE1L2ludGVsX2RwLmMKPiBpbmRleCAxNGEzY2YwLi5lZThhYTk1IDEwMDY0NAo+IC0tLSBhL2Ry aXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2RwLmMKPiArKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkx NS9pbnRlbF9kcC5jCj4gQEAgLTM1NTEsOCArMzU1MSw4IEBAIGludGVsX2VkcF9pbml0X2RwY2Qo c3RydWN0IGludGVsX2RwICppbnRlbF9kcCkKPiAgCS8qIFJlYWQgdGhlIGVEUCBEaXNwbGF5IGNv bnRyb2wgY2FwYWJpbGl0aWVzIHJlZ2lzdGVycyAqLwo+ICAJaWYgKChpbnRlbF9kcC0+ZHBjZFtE UF9FRFBfQ09ORklHVVJBVElPTl9DQVBdICYgRFBfRFBDRF9ESVNQTEFZX0NPTlRST0xfQ0FQQUJM RSkgJiYKPiAgCSAgICBkcm1fZHBfZHBjZF9yZWFkKCZpbnRlbF9kcC0+YXV4LCBEUF9FRFBfRFBD RF9SRVYsCj4gLQkJCSAgICAgaW50ZWxfZHAtPmVkcF9kcGNkLCBzaXplb2YoaW50ZWxfZHAtPmVk cF9kcGNkKSA9PQo+IC0JCQkgICAgIHNpemVvZihpbnRlbF9kcC0+ZWRwX2RwY2QpKSkKPiArCQkJ ICAgICBpbnRlbF9kcC0+ZWRwX2RwY2QsIHNpemVvZihpbnRlbF9kcC0+ZWRwX2RwY2QpKSA9PQo+ ICsJCQkgICAgIHNpemVvZihpbnRlbF9kcC0+ZWRwX2RwY2QpKQoKCgpwZXJoYXBzIHdlIGNhbiBt b3JwaCB0aGF0IGludG8gc29tZXRoaW5nIG1vcmUgcmVhZGFibGUgPyBJIHdvdWxkIHN1Z2dlc3Q6 CgoKaWYgKGludGVsX2RwLT5kcGNkW0RQX0VEUF9DT05GSUdVUkFUSU9OX0NBUF0gJiBEUF9EUENE X0RJU1BMQVlfQ09OVFJPTF9DQVBBQkxFKQogIHsKICAgIHNpemVfdCBzaXplPXNpemVvZihpbnRl bF9kcC0+ZWRwX2RwY2QpOyAvKiA9PSBFRFBfRElTUExBWV9DVExfQ0FQX1NJWkUgKi8KICAgIGlu dCByZXQ7CQoKICAgIHJldD1kcm1fZHBfZHBjZF9yZWFkKCZpbnRlbF9kcC0+YXV4LCBEUF9FRFBf RFBDRF9SRVYsaW50ZWxfZHAtPmVkcF9kcGNkLHNpemUpOwkKCiAgICBpZiAocmV0ICE9IHNpemUg KQogICAgICAgIC4uLi4uLgoKIH0KCnRoaXMgd2F5IGl0IGltcHJvdmVzIHJlYWRhYmlsaXR5IGFu ZCByZWR1Y2VzIGxpbmUgbGVuZ3RoLgoKCj4gIAkJRFJNX0RFQlVHX0tNUygiRURQIERQQ0QgOiAl KnBoXG4iLCAoaW50KSBzaXplb2YoaW50ZWxfZHAtPmVkcF9kcGNkKSwKPiAgCQkJICAgICAgaW50 ZWxfZHAtPmVkcF9kcGNkKTsKPiAgCj4gLS0KPiBUbyB1bnN1YnNjcmliZSBmcm9tIHRoaXMgbGlz dDogc2VuZCB0aGUgbGluZSAidW5zdWJzY3JpYmUga2VybmVsLWphbml0b3JzIiBpbgo+IHRoZSBi b2R5IG9mIGEgbWVzc2FnZSB0byBtYWpvcmRvbW9Admdlci5rZXJuZWwub3JnCj4gTW9yZSBtYWpv cmRvbW8gaW5mbyBhdCAgaHR0cDovL3ZnZXIua2VybmVsLm9yZy9tYWpvcmRvbW8taW5mby5odG1s Cj4gCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fCmRyaS1k ZXZlbCBtYWlsaW5nIGxpc3QKZHJpLWRldmVsQGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwczov L2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2RyaS1kZXZlbAo= From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753331AbcJMJpU (ORCPT ); Thu, 13 Oct 2016 05:45:20 -0400 Received: from mx01-fr.bfs.de ([193.174.231.67]:56427 "EHLO mx01-fr.bfs.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752777AbcJMJpM (ORCPT ); Thu, 13 Oct 2016 05:45:12 -0400 Message-ID: <57FF5380.1080704@bfs.de> Date: Thu, 13 Oct 2016 11:27:28 +0200 From: walter harms Reply-To: wharms@bfs.de User-Agent: Mozilla/5.0 (X11; U; Linux x86_64; de; rv:1.9.1.16) Gecko/20101125 SUSE/3.0.11 Thunderbird/3.0.11 MIME-Version: 1.0 To: Dan Carpenter CC: Daniel Vetter , =?ISO-8859-1?Q?Ville_Syrj=E4?= =?ISO-8859-1?Q?l=E4?= , 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: Re: [patch] drm/i915: fix a read size argument References: <20161013085508.GJ16198@mwanda> In-Reply-To: <20161013085508.GJ16198@mwanda> Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Am 13.10.2016 10:55, schrieb Dan Carpenter: > 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)) perhaps we can morph that into something more readable ? I would suggest: if (intel_dp->dpcd[DP_EDP_CONFIGURATION_CAP] & DP_DPCD_DISPLAY_CONTROL_CAPABLE) { size_t size=sizeof(intel_dp->edp_dpcd); /* == EDP_DISPLAY_CTL_CAP_SIZE */ int ret; ret=drm_dp_dpcd_read(&intel_dp->aux, DP_EDP_DPCD_REV,intel_dp->edp_dpcd,size); if (ret != size ) ...... } this way it improves readability and reduces line length. > DRM_DEBUG_KMS("EDP DPCD : %*ph\n", (int) sizeof(intel_dp->edp_dpcd), > intel_dp->edp_dpcd); > > -- > To unsubscribe from this list: send the line "unsubscribe kernel-janitors" in > the body of a message to majordomo@vger.kernel.org > More majordomo info at http://vger.kernel.org/majordomo-info.html >