Skip to contentSkip to conversation

drm/amdgpu: Fix memory leak in amdgpu_cs_pass1

PATCH In review Dong Chenchen 4 participants 4 messages Nov 10, 2022 – Nov 11, 2022

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 drm/amdgpu: Fix memory leak in amdgpu_cs_pass1

When p->gang_size equals 0, amdgpu_cs_pass1() will return directly without freeing chunk_array, which will cause a memory leak issue, this patch fixes it.

Fixes 4624459c84d7 ("drm/amdgpu: add gang submit frontend v6")
---
 drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c +4 -2
index 1bbd39b3b0fc..0e24d6b80e0b 100644
@@ -287,8 +287,10 @@ static int amdgpu_cs_pass1(struct amdgpu_cs_parser *p,
 		}
 	}
 
-	if (!p->gang_size)
-		return -EINVAL;
+	if (!p->gang_size) {
+		ret = -EINVAL;
+		goto free_partial_kdata;
+	}
 
 	for (i = 0; i < p->gang_size; ++i) {
 		ret = amdgpu_job_alloc(p->adev, num_ibs[i], &p->jobs[i], vm);
Signature · 1 line
2.25.1
Reviewed-by on v1 1/1
#1 lore raw

Thanks for fixing this.

Please add a Cc tag to stable, and repost.

Regards,
Luben

Quoted 27 lines · Dong Chenchen

When p->gang_size equals 0, amdgpu_cs_pass1() will return directly without freeing chunk_array, which will cause a memory leak issue, this patch fixes it.

Fixes 4624459c84d7 ("drm/amdgpu: add gang submit frontend v6")
---
 drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c +4 -2
index 1bbd39b3b0fc..0e24d6b80e0b 100644
@@ -287,8 +287,10 @@ static int amdgpu_cs_pass1(struct amdgpu_cs_parser *p,
 		}
 	}
 
-	if (!p->gang_size)
-		return -EINVAL;
+	if (!p->gang_size) {
+		ret = -EINVAL;
+		goto free_partial_kdata;
+	}
 
 	for (i = 0; i < p->gang_size; ++i) {
 		ret = amdgpu_job_alloc(p->adev, num_ibs[i], &p->jobs[i], vm);
#2 lore raw
Quoted 4 lines · Luben Tuikov

Thanks for fixing this.

Please add a Cc tag to stable, and repost.

No need for stable. This patch just went upstream in 6.1, so I can include it in my 6.1 fixes pull next week. Applied.

Thanks!

Alex

Quoted 35 lines

Regards,
Luben

Quoted 27 lines · Dong Chenchen

When p->gang_size equals 0, amdgpu_cs_pass1() will return directly without freeing chunk_array, which will cause a memory leak issue, this patch fixes it.

Fixes 4624459c84d7 ("drm/amdgpu: add gang submit frontend v6")
---
 drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c +4 -2
index 1bbd39b3b0fc..0e24d6b80e0b 100644
@@ -287,8 +287,10 @@ static int amdgpu_cs_pass1(struct amdgpu_cs_parser *p,
              }
      }
 
-     if (!p->gang_size)
-             return -EINVAL;
+     if (!p->gang_size) {
+             ret = -EINVAL;
+             goto free_partial_kdata;
+     }
 
      for (i = 0; i < p->gang_size; ++i) {
              ret = amdgpu_job_alloc(p->adev, num_ibs[i], &p->jobs[i], vm);
maintainer
#3 lore raw
In reply to Dong Chenchen

Am 10.11.22 um 15:33 schrieb Dong Chenchen:

Quoted 6 lines

When p->gang_size equals 0, amdgpu_cs_pass1() will return directly without freeing chunk_array, which will cause a memory leak issue, this patch fixes it.

Fixes 4624459c84d7 ("drm/amdgpu: add gang submit frontend v6")

Good catch, thanks. Patch is Reviewed-by: Christian König <[email protected]>

Quoted 21 lines
---
  drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c | 6 ++++--
  1 file changed, 4 insertions(+), 2 deletions(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c +4 -2
index 1bbd39b3b0fc..0e24d6b80e0b 100644
@@ -287,8 +287,10 @@ static int amdgpu_cs_pass1(struct amdgpu_cs_parser *p,
  		}
  	}
 
-	if (!p->gang_size)
-		return -EINVAL;
+	if (!p->gang_size) {
+		ret = -EINVAL;
+		goto free_partial_kdata;
+	}
 
  	for (i = 0; i < p->gang_size; ++i) {
  		ret = amdgpu_job_alloc(p->adev, num_ibs[i], &p->jobs[i], vm);