From 779596ce6a79e187995f04f143fc5ea44a565ea9 Mon Sep 17 00:00:00 2001

From: Tom Rix <trix@redhat.com>

Date: Thu, 17 Feb 2022 07:38:42 -0800

Subject: drm/amdgpu: fix amdgpu_ras_block_late_init error handler

Git-commit: 779596ce6a79e187995f04f143fc5ea44a565ea9

Patch-mainline: v5.18-rc1

References: bsc#1152489

Clang build fails with

amdgpu_ras.c:2416:7: error: variable 'ras_obj' is used uninitialized

  whenever 'if' condition is true

  if (adev->in_suspend || amdgpu_in_reset(adev)) {

  ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

amdgpu_ras.c:2453:6: note: uninitialized use occurs here

 if (ras_obj->ras_cb)

     ^~~~~~~

There is a logic error in the error handler's labels.

ex/ The sysfs: is the last goto label in the normal code but

is the middle of error handler.  Rework the error handler.

cleanup: is the first error, so it's handler should be last.

interrupt: is the second error, it's handler is next.  interrupt:

handles the failure of amdgpu_ras_interrupt_add_hander() by

calling amdgpu_ras_interrupt_remove_handler().  This is wrong,

remove() assumes the interrupt has been setup, not torn down by

add().  Change the goto label to cleanup.

sysfs is the last error, it's handler should be first.  sysfs:

handles the failure of amdgpu_ras_sysfs_create() by calling

amdgpu_ras_sysfs_remove().  But when the create() fails there

is nothing added so there is nothing to remove.  This error

handler is not needed. Remove the error handler and change

goto label to interrupt.

Fixes: b293e891b057 ("drm/amdgpu: add helper function to do common ras_late_init/fini (v3)")

Reviewed-by: Luben Tuikov <luben.tuikov@amd.com>

Signed-off-by: Tom Rix <trix@redhat.com>

Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

Acked-by: Thomas Zimmermann <tzimmermann@suse.de>

---

 drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c |   11 +++++------

 1 file changed, 5 insertions(+), 6 deletions(-)

--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c

+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c

@@ -1998,20 +1998,19 @@ int amdgpu_ras_late_init(struct amdgpu_d

 	if (ih_info->cb) {

 		r = amdgpu_ras_interrupt_add_handler(adev, ih_info);

 		if (r)

-			goto interrupt;

+			goto cleanup;

 	}

 	r = amdgpu_ras_sysfs_create(adev, fs_info);

 	if (r)

-		goto sysfs;

+		goto interrupt;

 	return 0;

-cleanup:

-	amdgpu_ras_sysfs_remove(adev, ras_block);

-sysfs:

+

+interrupt:

 	if (ih_info->cb)

 		amdgpu_ras_interrupt_remove_handler(adev, ih_info);

-interrupt:

+cleanup:

 	amdgpu_ras_feature_enable(adev, ras_block, 0);

 	return r;

 }