Skip to content

Commit a93b102

Browse files
peppsacalexdeucher
authored andcommitted
drm/amdgpu: don't access invalid sched
Since 2320c9e ("drm/sched: memset() 'job' in drm_sched_job_init()") accessing job->base.sched can produce unexpected results as the initialisation of (*job)->base.sched done in amdgpu_job_alloc is overwritten by the memset. This commit fixes an issue when a CS would fail validation and would be rejected after job->num_ibs is incremented. In this case, amdgpu_ib_free(ring->adev, ...) will be called, which would crash the machine because the ring value is bogus. To fix this, pass a NULL pointer to amdgpu_ib_free(): we can do this because the device is actually not used in this function. The next commit will remove the ring argument completely. Fixes: 2320c9e ("drm/sched: memset() 'job' in drm_sched_job_init()") Signed-off-by: Pierre-Eric Pelloux-Prayer <pierre-eric.pelloux-prayer@amd.com> Reviewed-by: Alex Deucher <alexander.deucher@amd.com> Reviewed-by: Christian König <christian.koenig@amd.com> Signed-off-by: Alex Deucher <alexander.deucher@amd.com> (cherry picked from commit 2ae520c)
1 parent 536ae08 commit a93b102

1 file changed

Lines changed: 1 addition & 2 deletions

File tree

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -255,7 +255,6 @@ void amdgpu_job_set_resources(struct amdgpu_job *job, struct amdgpu_bo *gds,
255255

256256
void amdgpu_job_free_resources(struct amdgpu_job *job)
257257
{
258-
struct amdgpu_ring *ring = to_amdgpu_ring(job->base.sched);
259258
struct dma_fence *f;
260259
unsigned i;
261260

@@ -268,7 +267,7 @@ void amdgpu_job_free_resources(struct amdgpu_job *job)
268267
f = NULL;
269268

270269
for (i = 0; i < job->num_ibs; ++i)
271-
amdgpu_ib_free(ring->adev, &job->ibs[i], f);
270+
amdgpu_ib_free(NULL, &job->ibs[i], f);
272271
}
273272

274273
static void amdgpu_job_free_cb(struct drm_sched_job *s_job)

0 commit comments

Comments
 (0)