Commit 9c8f268d authored Jul 03, 2018 by Dan Carpenter Committed by Greg Kroah-Hartman Aug 24, 2018

drm/nouveau/gem: off by one bugs in nouveau_gem_pushbuf_reloc_apply()



[ Upstream commit 7f073d011f93e92d4d225526b9ab6b8b0bbd6613 ]

The bo array has req->nr_buffers elements so the > should be >= so we
don't read beyond the end of the array.

Fixes: a1606a95 ("drm/nouveau: new gem pushbuf interface, bump to 0.0.16")
Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Signed-off-by: Sasha Levin <alexander.levin@microsoft.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

parent 43707aa8

drivers/gpu/drm/nouveau/nouveau_gem.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -602,7 +602,7 @@ nouveau_gem_pushbuf_reloc_apply(struct nouveau_cli *cli,
		struct nouveau_bo *nvbo;
		uint32_t data;

		if (unlikely(r->bo_index > req->nr_buffers)) {
		if (unlikely(r->bo_index >= req->nr_buffers)) {
		NV_PRINTK(err, cli, "reloc bo index invalid\n");
		ret = -EINVAL;
		break;
		@@ -612,7 +612,7 @@ nouveau_gem_pushbuf_reloc_apply(struct nouveau_cli *cli,
		if (b->presumed.valid)
		continue;

		if (unlikely(r->reloc_bo_index > req->nr_buffers)) {
		if (unlikely(r->reloc_bo_index >= req->nr_buffers)) {
		NV_PRINTK(err, cli, "reloc container bo index invalid\n");
		ret = -EINVAL;
		break;