drm/amdgpu: validate the context id in the dependencies
Just to make sure userspace don't send nonsense to the kernel. Signed-off-by: Christian König <christian.koenig@amd.com> Reviewed-by: Alex Deucher <alexander.deucher@amd.com> Reviewed-by: Jammy Zhou <Jammy.Zhou@amd.com>
This commit is contained in:
Родитель
12f1384da6
Коммит
76a1ea618f
|
@ -669,6 +669,7 @@ static int amdgpu_cs_ib_fill(struct amdgpu_device *adev,
|
||||||
static int amdgpu_cs_dependencies(struct amdgpu_device *adev,
|
static int amdgpu_cs_dependencies(struct amdgpu_device *adev,
|
||||||
struct amdgpu_cs_parser *p)
|
struct amdgpu_cs_parser *p)
|
||||||
{
|
{
|
||||||
|
struct amdgpu_fpriv *fpriv = p->filp->driver_priv;
|
||||||
struct amdgpu_ib *ib;
|
struct amdgpu_ib *ib;
|
||||||
int i, j, r;
|
int i, j, r;
|
||||||
|
|
||||||
|
@ -694,6 +695,7 @@ static int amdgpu_cs_dependencies(struct amdgpu_device *adev,
|
||||||
for (j = 0; j < num_deps; ++j) {
|
for (j = 0; j < num_deps; ++j) {
|
||||||
struct amdgpu_fence *fence;
|
struct amdgpu_fence *fence;
|
||||||
struct amdgpu_ring *ring;
|
struct amdgpu_ring *ring;
|
||||||
|
struct amdgpu_ctx *ctx;
|
||||||
|
|
||||||
r = amdgpu_cs_get_ring(adev, deps[j].ip_type,
|
r = amdgpu_cs_get_ring(adev, deps[j].ip_type,
|
||||||
deps[j].ip_instance,
|
deps[j].ip_instance,
|
||||||
|
@ -701,14 +703,21 @@ static int amdgpu_cs_dependencies(struct amdgpu_device *adev,
|
||||||
if (r)
|
if (r)
|
||||||
return r;
|
return r;
|
||||||
|
|
||||||
|
ctx = amdgpu_ctx_get(fpriv, deps[j].ctx_id);
|
||||||
|
if (ctx == NULL)
|
||||||
|
return -EINVAL;
|
||||||
|
|
||||||
r = amdgpu_fence_recreate(ring, p->filp,
|
r = amdgpu_fence_recreate(ring, p->filp,
|
||||||
deps[j].handle,
|
deps[j].handle,
|
||||||
&fence);
|
&fence);
|
||||||
if (r)
|
if (r) {
|
||||||
|
amdgpu_ctx_put(ctx);
|
||||||
return r;
|
return r;
|
||||||
|
}
|
||||||
|
|
||||||
amdgpu_sync_fence(&ib->sync, fence);
|
amdgpu_sync_fence(&ib->sync, fence);
|
||||||
amdgpu_fence_unref(&fence);
|
amdgpu_fence_unref(&fence);
|
||||||
|
amdgpu_ctx_put(ctx);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Загрузка…
Ссылка в новой задаче