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

Commit b3637835 authored by Christian König's avatar Christian König Committed by Greg Kroah-Hartman
Browse files

drm/amdgpu: fix amdgpu_cs_p1_user_fence 



commit 35588314e963938dfdcdb792c9170108399377d6 upstream.

The offset is just 32bits here so this can potentially overflow if
somebody specifies a large value. Instead reduce the size to calculate
the last possible offset.

The error handling path incorrectly drops the reference to the user
fence BO resulting in potential reference count underflow.

Signed-off-by: default avatarChristian König <christian.koenig@amd.com>
Reviewed-by: default avatarAlex Deucher <alexander.deucher@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
Cc: stable@vger.kernel.org
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 650ebbba

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

+4 −14
Original line number Diff line number Diff line
@@ -43,7 +43,6 @@ static int amdgpu_cs_user_fence_chunk(struct amdgpu_cs_parser *p, 
	struct drm_gem_object *gobj;

	struct amdgpu_bo *bo;

	unsigned long size;

	int r;



	gobj = drm_gem_object_lookup(p->filp, data->handle);

	if (gobj == NULL)
@@ -58,23 +57,14 @@ static int amdgpu_cs_user_fence_chunk(struct amdgpu_cs_parser *p, 
	drm_gem_object_put_unlocked(gobj);



	size = amdgpu_bo_size(bo);

	if (size != PAGE_SIZE || (data->offset + 8) > size) {

		r = -EINVAL;

		goto error_unref;

	}

	if (size != PAGE_SIZE || data->offset > (size - 8))

		return -EINVAL;



	if (amdgpu_ttm_tt_get_usermm(bo->tbo.ttm)) {

		r = -EINVAL;

		goto error_unref;

	}

	if (amdgpu_ttm_tt_get_usermm(bo->tbo.ttm))

		return -EINVAL;



	*offset = data->offset;



	return 0;



error_unref:

	amdgpu_bo_unref(&bo);

	return r;

}



static int amdgpu_cs_bo_handles_chunk(struct amdgpu_cs_parser *p,