[PATCH] drm/etnaviv: Fix off-by-one error in reloc checking

Philipp Zabel p.zabel at pengutronix.de
Tue Jul 25 15:49:30 UTC 2017


On Tue, 2017-07-25 at 14:33 +0200, Wladimir J. van der Laan wrote:
> A relocation pointing to the last four bytes of a buffer can
> legitimately happen in the case of small vertex buffers.
> 
> Signed-off-by: Wladimir J. van der Laan <laanwj at gmail.com>
> ---
>  drivers/gpu/drm/etnaviv/etnaviv_gem_submit.c | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/drivers/gpu/drm/etnaviv/etnaviv_gem_submit.c b/drivers/gpu/drm/etnaviv/etnaviv_gem_submit.c
> index de80ee1..21be4dc 100644
> --- a/drivers/gpu/drm/etnaviv/etnaviv_gem_submit.c
> +++ b/drivers/gpu/drm/etnaviv/etnaviv_gem_submit.c
> @@ -270,8 +270,8 @@ static int submit_reloc(struct etnaviv_gem_submit *submit, void *stream,
>  		if (ret)
>  			return ret;
>  
> -		if (r->reloc_offset >= bo->obj->base.size - sizeof(*ptr)) {
> -			DRM_ERROR("relocation %u outside object", i);
> +		if (r->reloc_offset > bo->obj->base.size - sizeof(*ptr)) {
> +			DRM_ERROR("relocation %u outside object\n", i);
>  			return -EINVAL;
>  		}
>  

Reviewed-by: Philipp Zabel <p.zabel at pengutronix.de>

regards
Philipp



More information about the etnaviv mailing list