Commit 1995b3a3 authored Oct 03, 2019 by Felix Kuehling Committed by Alex Deucher Oct 07, 2019

drm/amdgpu: Fix error handling in amdgpu_ras_recovery_init



Don't set a struct pointer to NULL before freeing its members. It's
hard to see what's happening due to a local pointer-to-pointer data
aliasing con->eh_data.

Signed-off-by: Felix Kuehling <Felix.Kuehling@amd.com>
Tested-by: Philip Cox <Philip.Cox@amd.com>
Reviewed-by: Hawking Zhang <Hawking.Zhang@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

parent 317a8d9e

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

+1 −1

Original line number	Diff line number	Diff line
		@@ -1542,10 +1542,10 @@ int amdgpu_ras_recovery_init(struct amdgpu_device *adev)
		release:
		amdgpu_ras_release_bad_pages(adev);
		free:
		con->eh_data = NULL;
		kfree((*data)->bps);
		kfree((*data)->bps_bo);
		kfree(*data);
		con->eh_data = NULL;
		out:
		DRM_WARN("Failed to initialize ras recovery!\n");

Admin message