Skip to contentSkip to conversation

drm/amd/display: prevent memory leak

PATCH Applied Navid Emamdoost 3 participants 3 messages Sep 25, 2019

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

PATCH 1/1 drm/amd/display: prevent memory leak

In dcn*_create_resource_pool the allocated memory should be released if construct pool fails.

---
 drivers/gpu/drm/amd/display/dc/dce100/dce100_resource.c | 1 +
 drivers/gpu/drm/amd/display/dc/dce110/dce110_resource.c | 1 +
 drivers/gpu/drm/amd/display/dc/dce112/dce112_resource.c | 1 +
 drivers/gpu/drm/amd/display/dc/dce120/dce120_resource.c | 1 +
 drivers/gpu/drm/amd/display/dc/dcn10/dcn10_resource.c   | 1 +
 5 files changed, 5 insertions(+)
drivers/gpu/drm/amd/display/dc/dce100/dce100_resource.c +1 -0
index afc61055eca1..1787b9bf800a 100644
@@ -1091,6 +1091,7 @@ struct resource_pool *dce100_create_resource_pool(
 	if (construct(num_virtual_links, dc, pool))
 		return &pool->base;
 
+	kfree(pool);
 	BREAK_TO_DEBUGGER();
 	return NULL;
 }
drivers/gpu/drm/amd/display/dc/dce110/dce110_resource.c +1 -0
index c66fe170e1e8..318e9c2e2ca8 100644
@@ -1462,6 +1462,7 @@ struct resource_pool *dce110_create_resource_pool(
 	if (construct(num_virtual_links, dc, pool, asic_id))
 		return &pool->base;
 
+	kfree(pool);
 	BREAK_TO_DEBUGGER();
 	return NULL;
 }
drivers/gpu/drm/amd/display/dc/dce112/dce112_resource.c +1 -0
index 3ac4c7e73050..3199d493d13b 100644
@@ -1338,6 +1338,7 @@ struct resource_pool *dce112_create_resource_pool(
 	if (construct(num_virtual_links, dc, pool))
 		return &pool->base;
 
+	kfree(pool);
 	BREAK_TO_DEBUGGER();
 	return NULL;
 }
drivers/gpu/drm/amd/display/dc/dce120/dce120_resource.c +1 -0
index 7d08154e9662..bb497f43f6eb 100644
@@ -1203,6 +1203,7 @@ struct resource_pool *dce120_create_resource_pool(
 	if (construct(num_virtual_links, dc, pool))
 		return &pool->base;
 
+	kfree(pool);
 	BREAK_TO_DEBUGGER();
 	return NULL;
 }
drivers/gpu/drm/amd/display/dc/dcn10/dcn10_resource.c +1 -0
index 5a89e462e7cc..59305e411a66 100644
@@ -1570,6 +1570,7 @@ struct resource_pool *dcn10_create_resource_pool(
 	if (construct(init_data->num_virtual_links, dc, pool))
 		return &pool->base;
 
+	kfree(pool);
 	BREAK_TO_DEBUGGER();
 	return NULL;
 }
Signature · 1 line
2.17.1
Reviewed-by on v1 1/1
#1 lore raw
Quoted 4 lines · Navid Emamdoost

In dcn*_create_resource_pool the allocated memory should be released if construct pool fails.

Harry

Quoted 69 lines
---
 drivers/gpu/drm/amd/display/dc/dce100/dce100_resource.c | 1 +
 drivers/gpu/drm/amd/display/dc/dce110/dce110_resource.c | 1 +
 drivers/gpu/drm/amd/display/dc/dce112/dce112_resource.c | 1 +
 drivers/gpu/drm/amd/display/dc/dce120/dce120_resource.c | 1 +
 drivers/gpu/drm/amd/display/dc/dcn10/dcn10_resource.c   | 1 +
 5 files changed, 5 insertions(+)
drivers/gpu/drm/amd/display/dc/dce100/dce100_resource.c +1 -0
index afc61055eca1..1787b9bf800a 100644
@@ -1091,6 +1091,7 @@ struct resource_pool *dce100_create_resource_pool(
 	if (construct(num_virtual_links, dc, pool))
 		return &pool->base;
 
+	kfree(pool);
 	BREAK_TO_DEBUGGER();
 	return NULL;
 }
drivers/gpu/drm/amd/display/dc/dce110/dce110_resource.c +1 -0
index c66fe170e1e8..318e9c2e2ca8 100644
@@ -1462,6 +1462,7 @@ struct resource_pool *dce110_create_resource_pool(
 	if (construct(num_virtual_links, dc, pool, asic_id))
 		return &pool->base;
 
+	kfree(pool);
 	BREAK_TO_DEBUGGER();
 	return NULL;
 }
drivers/gpu/drm/amd/display/dc/dce112/dce112_resource.c +1 -0
index 3ac4c7e73050..3199d493d13b 100644
@@ -1338,6 +1338,7 @@ struct resource_pool *dce112_create_resource_pool(
 	if (construct(num_virtual_links, dc, pool))
 		return &pool->base;
 
+	kfree(pool);
 	BREAK_TO_DEBUGGER();
 	return NULL;
 }
drivers/gpu/drm/amd/display/dc/dce120/dce120_resource.c +1 -0
index 7d08154e9662..bb497f43f6eb 100644
@@ -1203,6 +1203,7 @@ struct resource_pool *dce120_create_resource_pool(
 	if (construct(num_virtual_links, dc, pool))
 		return &pool->base;
 
+	kfree(pool);
 	BREAK_TO_DEBUGGER();
 	return NULL;
 }
drivers/gpu/drm/amd/display/dc/dcn10/dcn10_resource.c +1 -0
index 5a89e462e7cc..59305e411a66 100644
@@ -1570,6 +1570,7 @@ struct resource_pool *dcn10_create_resource_pool(
 	if (construct(init_data->num_virtual_links, dc, pool))
 		return &pool->base;
 
+	kfree(pool);
 	BREAK_TO_DEBUGGER();
 	return NULL;
 }
Applied
#2 lore raw
Quoted 11 lines · Harry Wentland
Quoted 4 lines · Navid Emamdoost

In dcn*_create_resource_pool the allocated memory should be released if construct pool fails.

Applied. thanks!

Alex

Quoted 75 lines

Harry

Quoted 62 lines
---
 drivers/gpu/drm/amd/display/dc/dce100/dce100_resource.c | 1 +
 drivers/gpu/drm/amd/display/dc/dce110/dce110_resource.c | 1 +
 drivers/gpu/drm/amd/display/dc/dce112/dce112_resource.c | 1 +
 drivers/gpu/drm/amd/display/dc/dce120/dce120_resource.c | 1 +
 drivers/gpu/drm/amd/display/dc/dcn10/dcn10_resource.c   | 1 +
 5 files changed, 5 insertions(+)
drivers/gpu/drm/amd/display/dc/dce100/dce100_resource.c +1 -0
index afc61055eca1..1787b9bf800a 100644
@@ -1091,6 +1091,7 @@ struct resource_pool *dce100_create_resource_pool(
      if (construct(num_virtual_links, dc, pool))
              return &pool->base;
 
+     kfree(pool);
      BREAK_TO_DEBUGGER();
      return NULL;
 }
drivers/gpu/drm/amd/display/dc/dce110/dce110_resource.c +1 -0
index c66fe170e1e8..318e9c2e2ca8 100644
@@ -1462,6 +1462,7 @@ struct resource_pool *dce110_create_resource_pool(
      if (construct(num_virtual_links, dc, pool, asic_id))
              return &pool->base;
 
+     kfree(pool);
      BREAK_TO_DEBUGGER();
      return NULL;
 }
drivers/gpu/drm/amd/display/dc/dce112/dce112_resource.c +1 -0
index 3ac4c7e73050..3199d493d13b 100644
@@ -1338,6 +1338,7 @@ struct resource_pool *dce112_create_resource_pool(
      if (construct(num_virtual_links, dc, pool))
              return &pool->base;
 
+     kfree(pool);
      BREAK_TO_DEBUGGER();
      return NULL;
 }
drivers/gpu/drm/amd/display/dc/dce120/dce120_resource.c +1 -0
index 7d08154e9662..bb497f43f6eb 100644
@@ -1203,6 +1203,7 @@ struct resource_pool *dce120_create_resource_pool(
      if (construct(num_virtual_links, dc, pool))
              return &pool->base;
 
+     kfree(pool);
      BREAK_TO_DEBUGGER();
      return NULL;
 }
drivers/gpu/drm/amd/display/dc/dcn10/dcn10_resource.c +0 -0
index 5a89e462e7cc..59305e411a66 100644

drivers/gpu/drm/amd/display/dc/dcn10/dcn10_resource.c struct resource_pool *dcn10_create_resource_pool( · line 1576

Quoted 7 lines
drivers/gpu/drm/amd/display/dc/dcn10/dcn10_resource.c +1 -0
@@ -1570,6 +1570,7 @@ struct resource_pool *dcn10_create_resource_pool(
      if (construct(init_data->num_virtual_links, dc, pool))
              return &pool->base;
 
+     kfree(pool);
      BREAK_TO_DEBUGGER();
      return NULL;
 }

_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel