Re: [PATCH] drm/amd/powerplay: Fix error handling in smu_init_fb_allocations()

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



thanks correct it.

Reviewed-by: Kevin Wang <kevin1.wang@xxxxxxx>

Best Regards,
Kevin

From: Dan Carpenter <dan.carpenter@xxxxxxxxxx>
Sent: Monday, October 7, 2019 5:02 PM
To: Rex Zhu <rex.zhu@xxxxxxx>; Wang, Kevin(Yang) <Kevin1.Wang@xxxxxxx>
Cc: Quan, Evan <Evan.Quan@xxxxxxx>; Deucher, Alexander <Alexander.Deucher@xxxxxxx>; Koenig, Christian <Christian.Koenig@xxxxxxx>; Zhou, David(ChunMing) <David1.Zhou@xxxxxxx>; David Airlie <airlied@xxxxxxxx>; Daniel Vetter <daniel@xxxxxxxx>; amd-gfx@xxxxxxxxxxxxxxxxxxxxx <amd-gfx@xxxxxxxxxxxxxxxxxxxxx>; dri-devel@xxxxxxxxxxxxxxxxxxxxx <dri-devel@xxxxxxxxxxxxxxxxxxxxx>; kernel-janitors@xxxxxxxxxxxxxxx <kernel-janitors@xxxxxxxxxxxxxxx>
Subject: [PATCH] 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")
Signed-off-by: Dan Carpenter <dan.carpenter@xxxxxxxxxx>
---
 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 f1fbbc8b77ee..c9266ea70331 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.20.1

_______________________________________________
amd-gfx mailing list
amd-gfx@xxxxxxxxxxxxxxxxxxxxx
https://lists.freedesktop.org/mailman/listinfo/amd-gfx

[Index of Archives]     [Linux USB Devel]     [Linux Audio Users]     [Yosemite News]     [Linux Kernel]     [Linux SCSI]

  Powered by Linux