Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 52ae28e7 authored by Dave Airlie's avatar Dave Airlie
Browse files

Merge branch 'etnaviv/fixes' of https://git.pengutronix.de/git/lst/linux into drm-fixes 

single etnaviv fix.

* 'etnaviv/fixes' of https://git.pengutronix.de/git/lst/linux:
  drm/etnaviv: Fix off-by-one error in reloc checking
parents 1c52a78e d6f756e0

drivers/gpu/drm/etnaviv/etnaviv_gem_submit.c

+2 −2
Original line number Diff line number Diff line
@@ -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;

		}