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

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

drm/amdgpu: fix error handling in amdgpu_cs_user_fence_chunk 



[ Upstream commit 0165de983272d1fae0809ed9db47c46a412279bc ]

Slowly leaking memory one page at a time :)

Signed-off-by: default avatarChristian König <christian.koenig@amd.com>
Reviewed-by: default avatarAndrey Grodzovsky <andrey.grodzovsky@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
Signed-off-by: default avatarSasha Levin <alexander.levin@microsoft.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent f2c9d68e

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

+15 −8
Original line number Diff line number Diff line
@@ -37,6 +37,7 @@ static int amdgpu_cs_user_fence_chunk(struct amdgpu_cs_parser *p, 
{

	struct drm_gem_object *gobj;

	unsigned long size;

	int r;



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

	if (gobj == NULL)
@@ -48,20 +49,26 @@ static int amdgpu_cs_user_fence_chunk(struct amdgpu_cs_parser *p, 
	p->uf_entry.tv.shared = true;

	p->uf_entry.user_pages = NULL;



	size = amdgpu_bo_size(p->uf_entry.robj);

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

		return -EINVAL;



	*offset = data->offset;



	drm_gem_object_put_unlocked(gobj);



	size = amdgpu_bo_size(p->uf_entry.robj);

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

		r = -EINVAL;

		goto error_unref;

	}



	if (amdgpu_ttm_tt_get_usermm(p->uf_entry.robj->tbo.ttm)) {

		amdgpu_bo_unref(&p->uf_entry.robj);

		return -EINVAL;

		r = -EINVAL;

		goto error_unref;

	}



	*offset = data->offset;



	return 0;



error_unref:

	amdgpu_bo_unref(&p->uf_entry.robj);

	return r;

}



static int amdgpu_cs_parser_init(struct amdgpu_cs_parser *p, void *data)