Commit c0ec082f authored by Mohammed Anees's avatar Mohammed Anees Committed by Alex Deucher
Browse files

drm/amdgpu: prevent BO_HANDLES error from being overwritten 



Before this patch, if multiple BO_HANDLES chunks were submitted,
the error -EINVAL would be correctly set but could be overwritten
by the return value from amdgpu_cs_p1_bo_handles(). This patch
ensures that if there are multiple BO_HANDLES, we stop.

Fixes: fec5f8e8 ("drm/amdgpu: disallow multiple BO_HANDLES chunks in one submit")
Signed-off-by: default avatarMohammed Anees <pvmohammedanees2003@gmail.com>
Reviewed-by: default avatarChristian König <christian.koenig@amd.com>
Signed-off-by: default avatarPierre-Eric Pelloux-Prayer <pierre-eric.pelloux-prayer@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
(cherry picked from commit 40f2cd98)
Cc: stable@vger.kernel.org
parent d2c72d96

drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c

+1 −1
Original line number Diff line number Diff line
@@ -265,7 +265,7 @@ static int amdgpu_cs_pass1(struct amdgpu_cs_parser *p, 


			/* Only a single BO list is allowed to simplify handling. */

			if (p->bo_list)

				ret = -EINVAL;

				goto free_partial_kdata;



			ret = amdgpu_cs_p1_bo_handles(p, p->chunks[i].kdata);

			if (ret)