diff options
Diffstat (limited to 'meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.19.8/3993-drm-amd-powerplay-Fix-error-handling-in-smu_init_fb_.patch')
| -rw-r--r-- | meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.19.8/3993-drm-amd-powerplay-Fix-error-handling-in-smu_init_fb_.patch | 48 |
1 files changed, 48 insertions, 0 deletions
diff --git a/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.19.8/3993-drm-amd-powerplay-Fix-error-handling-in-smu_init_fb_.patch b/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.19.8/3993-drm-amd-powerplay-Fix-error-handling-in-smu_init_fb_.patch new file mode 100644 index 00000000..7cd39f2e --- /dev/null +++ b/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.19.8/3993-drm-amd-powerplay-Fix-error-handling-in-smu_init_fb_.patch @@ -0,0 +1,48 @@ +From cf2ec759c2eb91c144c94a1eed145982c01f31e3 Mon Sep 17 00:00:00 2001 +From: Dan Carpenter <dan.carpenter@oracle.com> +Date: Mon, 7 Oct 2019 12:02:06 +0300 +Subject: [PATCH 3993/4256] drm/amd/powerplay: Fix error handling in + smu_init_fb_allocations() + +The error handling is off by one. We should not free the first +"tables[i].bo" without decrementing "i" because that might result in a +double free. The second problem is that when an error occurs, then the +zeroth element "tables[0].bo" isn't freed. + +I had make "i" signed int for the error handling to work, so I just +updated "ret" as well as a clean up. + +Fixes: f96357a991b9 ("drm/amd/powerplay: implement smu_init(fini)_fb_allocations function") +Reviewed-by: Kevin Wang <kevin1.wang@amd.com> +Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com> +Signed-off-by: Alex Deucher <alexander.deucher@amd.com> +--- + drivers/gpu/drm/amd/powerplay/amdgpu_smu.c | 5 ++--- + 1 file changed, 2 insertions(+), 3 deletions(-) + +diff --git a/drivers/gpu/drm/amd/powerplay/amdgpu_smu.c b/drivers/gpu/drm/amd/powerplay/amdgpu_smu.c +index 88d7376aee71..054376342454 100644 +--- a/drivers/gpu/drm/amd/powerplay/amdgpu_smu.c ++++ b/drivers/gpu/drm/amd/powerplay/amdgpu_smu.c +@@ -896,8 +896,7 @@ static int smu_init_fb_allocations(struct smu_context *smu) + struct amdgpu_device *adev = smu->adev; + struct smu_table_context *smu_table = &smu->smu_table; + struct smu_table *tables = smu_table->tables; +- uint32_t i = 0; +- int32_t ret = 0; ++ int ret, i; + + for (i = 0; i < SMU_TABLE_COUNT; i++) { + if (tables[i].size == 0) +@@ -915,7 +914,7 @@ static int smu_init_fb_allocations(struct smu_context *smu) + + return 0; + failed: +- for (; i > 0; i--) { ++ while (--i >= 0) { + if (tables[i].size == 0) + continue; + amdgpu_bo_free_kernel(&tables[i].bo, +-- +2.17.1 + |