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;