From mboxrd@z Thu Jan 1 00:00:00 1970 From: Dan Carpenter Date: Fri, 21 Dec 2018 20:24:06 +0000 Subject: Re: [PATCH] drm/etnaviv: fix some off by one bugs Message-Id: <20181221202406.GF2240@kadam> List-Id: References: <20180713145631.qxd3pzk72v4bshii@kili.mountain> In-Reply-To: <20180713145631.qxd3pzk72v4bshii@kili.mountain> MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: Lucas Stach , Christian Gmeiner Cc: David Airlie , kernel-janitors@vger.kernel.org, etnaviv@lists.freedesktop.org, dri-devel@lists.freedesktop.org, Russell King I don't think anyone responded to this one? regards, dan carpenter On Fri, Jul 13, 2018 at 06:00:18PM +0300, Dan Carpenter wrote: > The ->nr_signal is the supposed to be the number of elements in the > ->signal array. There was one place where it was 5 but it was supposed > to be 4. That looks like a copy and paste bug. There were also two > checks that were off by one. > > Fixes: 9e2c2e273012 ("drm/etnaviv: add infrastructure to query perf counter") > Signed-off-by: Dan Carpenter > --- > Not tested. > > diff --git a/drivers/gpu/drm/etnaviv/etnaviv_perfmon.c b/drivers/gpu/drm/etnaviv/etnaviv_perfmon.c > index 9980d81a26e3..4227a4006c34 100644 > --- a/drivers/gpu/drm/etnaviv/etnaviv_perfmon.c > +++ b/drivers/gpu/drm/etnaviv/etnaviv_perfmon.c > @@ -113,7 +113,7 @@ static const struct etnaviv_pm_domain doms_3d[] = { > .name = "PE", > .profile_read = VIVS_MC_PROFILE_PE_READ, > .profile_config = VIVS_MC_PROFILE_CONFIG0, > - .nr_signals = 5, > + .nr_signals = 4, > .signal = (const struct etnaviv_pm_signal[]) { > { > "PIXEL_COUNT_KILLED_BY_COLOR_PIPE", > @@ -435,7 +435,7 @@ int etnaviv_pm_query_sig(struct etnaviv_gpu *gpu, > > dom = meta->domains + signal->domain; > > - if (signal->iter > dom->nr_signals) > + if (signal->iter >= dom->nr_signals) > return -EINVAL; > > sig = &dom->signal[signal->iter]; > @@ -461,7 +461,7 @@ int etnaviv_pm_req_validate(const struct drm_etnaviv_gem_submit_pmr *r, > > dom = meta->domains + r->domain; > > - if (r->signal > dom->nr_signals) > + if (r->signal >= dom->nr_signals) > return -EINVAL; > > return 0; From mboxrd@z Thu Jan 1 00:00:00 1970 From: Dan Carpenter Subject: Re: [PATCH] drm/etnaviv: fix some off by one bugs Date: Fri, 21 Dec 2018 23:24:06 +0300 Message-ID: <20181221202406.GF2240@kadam> References: <20180713145631.qxd3pzk72v4bshii@kili.mountain> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Content-Disposition: inline In-Reply-To: <20180713145631.qxd3pzk72v4bshii@kili.mountain> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" To: Lucas Stach , Christian Gmeiner Cc: David Airlie , kernel-janitors@vger.kernel.org, etnaviv@lists.freedesktop.org, dri-devel@lists.freedesktop.org, Russell King List-Id: dri-devel@lists.freedesktop.org SSBkb24ndCB0aGluayBhbnlvbmUgcmVzcG9uZGVkIHRvIHRoaXMgb25lPwoKcmVnYXJkcywKZGFu IGNhcnBlbnRlcgoKT24gRnJpLCBKdWwgMTMsIDIwMTggYXQgMDY6MDA6MThQTSArMDMwMCwgRGFu IENhcnBlbnRlciB3cm90ZToKPiBUaGUgLT5ucl9zaWduYWwgaXMgdGhlIHN1cHBvc2VkIHRvIGJl IHRoZSBudW1iZXIgb2YgZWxlbWVudHMgaW4gdGhlCj4gLT5zaWduYWwgYXJyYXkuICBUaGVyZSB3 YXMgb25lIHBsYWNlIHdoZXJlIGl0IHdhcyA1IGJ1dCBpdCB3YXMgc3VwcG9zZWQKPiB0byBiZSA0 LiAgVGhhdCBsb29rcyBsaWtlIGEgY29weSBhbmQgcGFzdGUgYnVnLiAgVGhlcmUgd2VyZSBhbHNv IHR3bwo+IGNoZWNrcyB0aGF0IHdlcmUgb2ZmIGJ5IG9uZS4KPiAKPiBGaXhlczogOWUyYzJlMjcz MDEyICgiZHJtL2V0bmF2aXY6IGFkZCBpbmZyYXN0cnVjdHVyZSB0byBxdWVyeSBwZXJmIGNvdW50 ZXIiKQo+IFNpZ25lZC1vZmYtYnk6IERhbiBDYXJwZW50ZXIgPGRhbi5jYXJwZW50ZXJAb3JhY2xl LmNvbT4KPiAtLS0KPiBOb3QgdGVzdGVkLgo+IAo+IGRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9k cm0vZXRuYXZpdi9ldG5hdml2X3BlcmZtb24uYyBiL2RyaXZlcnMvZ3B1L2RybS9ldG5hdml2L2V0 bmF2aXZfcGVyZm1vbi5jCj4gaW5kZXggOTk4MGQ4MWEyNmUzLi40MjI3YTQwMDZjMzQgMTAwNjQ0 Cj4gLS0tIGEvZHJpdmVycy9ncHUvZHJtL2V0bmF2aXYvZXRuYXZpdl9wZXJmbW9uLmMKPiArKysg Yi9kcml2ZXJzL2dwdS9kcm0vZXRuYXZpdi9ldG5hdml2X3BlcmZtb24uYwo+IEBAIC0xMTMsNyAr MTEzLDcgQEAgc3RhdGljIGNvbnN0IHN0cnVjdCBldG5hdml2X3BtX2RvbWFpbiBkb21zXzNkW10g PSB7Cj4gIAkJLm5hbWUgPSAiUEUiLAo+ICAJCS5wcm9maWxlX3JlYWQgPSBWSVZTX01DX1BST0ZJ TEVfUEVfUkVBRCwKPiAgCQkucHJvZmlsZV9jb25maWcgPSBWSVZTX01DX1BST0ZJTEVfQ09ORklH MCwKPiAtCQkubnJfc2lnbmFscyA9IDUsCj4gKwkJLm5yX3NpZ25hbHMgPSA0LAo+ICAJCS5zaWdu YWwgPSAoY29uc3Qgc3RydWN0IGV0bmF2aXZfcG1fc2lnbmFsW10pIHsKPiAgCQkJewo+ICAJCQkJ IlBJWEVMX0NPVU5UX0tJTExFRF9CWV9DT0xPUl9QSVBFIiwKPiBAQCAtNDM1LDcgKzQzNSw3IEBA IGludCBldG5hdml2X3BtX3F1ZXJ5X3NpZyhzdHJ1Y3QgZXRuYXZpdl9ncHUgKmdwdSwKPiAgCj4g IAlkb20gPSBtZXRhLT5kb21haW5zICsgc2lnbmFsLT5kb21haW47Cj4gIAo+IC0JaWYgKHNpZ25h bC0+aXRlciA+IGRvbS0+bnJfc2lnbmFscykKPiArCWlmIChzaWduYWwtPml0ZXIgPj0gZG9tLT5u cl9zaWduYWxzKQo+ICAJCXJldHVybiAtRUlOVkFMOwo+ICAKPiAgCXNpZyA9ICZkb20tPnNpZ25h bFtzaWduYWwtPml0ZXJdOwo+IEBAIC00NjEsNyArNDYxLDcgQEAgaW50IGV0bmF2aXZfcG1fcmVx X3ZhbGlkYXRlKGNvbnN0IHN0cnVjdCBkcm1fZXRuYXZpdl9nZW1fc3VibWl0X3BtciAqciwKPiAg Cj4gIAlkb20gPSBtZXRhLT5kb21haW5zICsgci0+ZG9tYWluOwo+ICAKPiAtCWlmIChyLT5zaWdu YWwgPiBkb20tPm5yX3NpZ25hbHMpCj4gKwlpZiAoci0+c2lnbmFsID49IGRvbS0+bnJfc2lnbmFs cykKPiAgCQlyZXR1cm4gLUVJTlZBTDsKPiAgCj4gIAlyZXR1cm4gMDsKX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KZHJpLWRldmVsIG1haWxpbmcgbGlzdApk cmktZGV2ZWxAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHBzOi8vbGlzdHMuZnJlZWRlc2t0b3Au b3JnL21haWxtYW4vbGlzdGluZm8vZHJpLWRldmVsCg==