Commit 7bed1df8 authored by Eric Huang's avatar Eric Huang Committed by Alex Deucher
Browse files

drm/amdgpu: fix NULL pointer in amdgpu_reset_get_desc 



amdgpu_job_ring may return NULL, which causes kernel NULL
pointer error, using another way to print ring name instead
of ring->name.

Suggested-by: default avatarLijo Lazar <Lijo.Lazar@amd.com>
Signed-off-by: default avatarEric Huang <jinhuieric.huang@amd.com>
Acked-by: default avatarAlex Deucher <alexander.deucher@amd.com>
Reviewed-by: default avatarLijo Lazar <lijo.lazar@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 6218bd6b

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

+2 −4
Original line number Diff line number Diff line
@@ -164,16 +164,14 @@ void amdgpu_device_unlock_reset_domain(struct amdgpu_reset_domain *reset_domain) 
void amdgpu_reset_get_desc(struct amdgpu_reset_context *rst_ctxt, char *buf,

			   size_t len)

{

	struct amdgpu_ring *ring;



	if (!buf || !len)

		return;



	switch (rst_ctxt->src) {

	case AMDGPU_RESET_SRC_JOB:

		if (rst_ctxt->job) {

			ring = amdgpu_job_ring(rst_ctxt->job);

			snprintf(buf, len, "job hang on ring:%s", ring->name);

			snprintf(buf, len, "job hang on ring:%s",

				 rst_ctxt->job->base.sched->name);

		} else {

			strscpy(buf, "job hang", len);

		}