Commit d094aea3 authored by Hawking Zhang's avatar Hawking Zhang Committed by Alex Deucher
Browse files

drm/amdgpu: set ip specific ras interface pointer to NULL after free it 



to prevent access to dangling pointers

Signed-off-by: default avatarHawking Zhang <Hawking.Zhang@amd.com>
Reviewed-by: default avatarTao Zhou <tao.zhou1@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent d5ea093e

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

+5 −2
Original line number Diff line number Diff line
@@ -4444,14 +4444,17 @@ static int gfx_v9_0_ecc_late_init(void *handle) 
		r = amdgpu_irq_get(adev, &adev->gfx.cp_ecc_error_irq, 0);

		if (r)

			goto late_fini;

	} else

		kfree(adev->gfx.ras_if);

	} else {

		r = 0;

		goto free;

	}



	return 0;

late_fini:

	amdgpu_ras_late_fini(adev, adev->gfx.ras_if, &ih_info);

free:

	kfree(adev->gfx.ras_if);

	adev->gfx.ras_if = NULL;

	return r;

}

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

+6 −2
Original line number Diff line number Diff line
@@ -799,8 +799,11 @@ static int gmc_v9_0_ecc_late_init(void *handle) 
		r = amdgpu_irq_get(adev, &adev->gmc.ecc_irq, 0);

		if (r)

			goto umc_late_fini;

	} else

		kfree(adev->gmc.umc_ras_if);

	} else {

		/* free umc ras_if if umc ras is not supported */

		r = 0;

		goto free;

	}



	if (adev->mmhub_funcs && adev->mmhub_funcs->ras_late_init) {

		r = adev->mmhub_funcs->ras_late_init(adev);
@@ -812,6 +815,7 @@ static int gmc_v9_0_ecc_late_init(void *handle) 
	amdgpu_ras_late_fini(adev, adev->gmc.umc_ras_if, &umc_ih_info);

free:

	kfree(adev->gmc.umc_ras_if);

	adev->gmc.umc_ras_if = NULL;

	return r;

}

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

+3 −1
Original line number Diff line number Diff line
@@ -639,8 +639,10 @@ static int mmhub_v1_0_ras_late_init(struct amdgpu_device *adev) 
	mmhub_ih_info.head = mmhub_fs_info.head = *adev->gmc.mmhub_ras_if;

	r = amdgpu_ras_late_init(adev, adev->gmc.mmhub_ras_if,

				 &mmhub_fs_info, &mmhub_ih_info);

	if (r || !amdgpu_ras_is_supported(adev, adev->gmc.mmhub_ras_if->block))

	if (r || !amdgpu_ras_is_supported(adev, adev->gmc.mmhub_ras_if->block)) {

		kfree(adev->gmc.mmhub_ras_if);

		adev->gmc.mmhub_ras_if = NULL;

	}

	return r;

}

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

+4 −0
Original line number Diff line number Diff line
@@ -507,6 +507,9 @@ static int nbio_v7_4_ras_late_init(struct amdgpu_device *adev) 
		r = amdgpu_irq_get(adev, &adev->nbio.ras_err_event_athub_irq, 0);

		if (r)

			goto late_fini;

	} else {

		r = 0;

		goto free;

	}



	return 0;
@@ -514,6 +517,7 @@ static int nbio_v7_4_ras_late_init(struct amdgpu_device *adev) 
	amdgpu_ras_late_fini(adev, adev->nbio.ras_if, &ih_info);

free:

	kfree(adev->nbio.ras_if);

	adev->nbio.ras_if = NULL;

	return r;

}

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

+6 −2
Original line number Diff line number Diff line
@@ -1728,14 +1728,18 @@ static int sdma_v4_0_late_init(void *handle) 
			if (r)

				goto late_fini;

		}

	} else

		kfree(adev->sdma.ras_if);

	} else {

		/* free sdma ras_if if sdma ras is not supported */

		r = 0;

		goto free;

	}



        return 0;

late_fini:

	amdgpu_ras_late_fini(adev, adev->sdma.ras_if, &ih_info);

free:

	kfree(adev->sdma.ras_if);

	adev->sdma.ras_if = NULL;

	return r;

}