1 files changed, 134 insertions, 0 deletions

diff --git a/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.19.8/3740-drm-amdgpu-set-ip-specific-ras-interface-pointer-to-.patch b/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.19.8/3740-drm-amdgpu-set-ip-specific-ras-interface-pointer-to-.patch
new file mode 100644
index 00000000..5e0b3669
--- /dev/null
+++ b/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.19.8/3740-drm-amdgpu-set-ip-specific-ras-interface-pointer-to-.patch
@@ -0,0 +1,134 @@
+From e435de2a43a55ec79ddfc88d8f8855b92ca967bb Mon Sep 17 00:00:00 2001
+From: Hawking Zhang <Hawking.Zhang@amd.com>
+Date: Tue, 3 Sep 2019 03:16:47 +0800
+Subject: [PATCH 3740/4256] drm/amdgpu: set ip specific ras interface pointer
+ to NULL after free it
+
+to prevent access to dangling pointers
+
+Signed-off-by: Hawking Zhang <Hawking.Zhang@amd.com>
+Reviewed-by: Tao Zhou <tao.zhou1@amd.com>
+---
+ drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c   | 7 +++++--
+ drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c   | 8 ++++++--
+ drivers/gpu/drm/amd/amdgpu/mmhub_v1_0.c | 4 +++-
+ drivers/gpu/drm/amd/amdgpu/nbio_v7_4.c  | 4 ++++
+ drivers/gpu/drm/amd/amdgpu/sdma_v4_0.c  | 8 ++++++--
+ 5 files changed, 24 insertions(+), 7 deletions(-)
+
+diff --git a/drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c b/drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c
+index 918eaeedb5b9..18272761af53 100644
+--- a/drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c
++++ b/drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c
+@@ -4442,14 +4442,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;
+ }
+ 
+diff --git a/drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c b/drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c
+index 617311db7d2e..a72c63124d50 100644
+--- a/drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c
++++ b/drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c
+@@ -795,8 +795,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);
+@@ -808,6 +811,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;
+ }
+ 
+diff --git a/drivers/gpu/drm/amd/amdgpu/mmhub_v1_0.c b/drivers/gpu/drm/amd/amdgpu/mmhub_v1_0.c
+index 3b28c1c0cf21..57aae096947d 100644
+--- a/drivers/gpu/drm/amd/amdgpu/mmhub_v1_0.c
++++ b/drivers/gpu/drm/amd/amdgpu/mmhub_v1_0.c
+@@ -641,8 +641,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;
+ }
+ 
+diff --git a/drivers/gpu/drm/amd/amdgpu/nbio_v7_4.c b/drivers/gpu/drm/amd/amdgpu/nbio_v7_4.c
+index 27eeab143ad7..f25c6a9c6718 100644
+--- a/drivers/gpu/drm/amd/amdgpu/nbio_v7_4.c
++++ b/drivers/gpu/drm/amd/amdgpu/nbio_v7_4.c
+@@ -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;
+ }
+ 
+diff --git a/drivers/gpu/drm/amd/amdgpu/sdma_v4_0.c b/drivers/gpu/drm/amd/amdgpu/sdma_v4_0.c
+index 6424723e1af0..b837ffd161e6 100644
+--- a/drivers/gpu/drm/amd/amdgpu/sdma_v4_0.c
++++ b/drivers/gpu/drm/amd/amdgpu/sdma_v4_0.c
+@@ -1727,14 +1727,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;
+ }
+ 
+-- 
+2.17.1
+