|
 |
fe681c3 |
From 104c307147ad379617472dd91a5bcb368d72bd6d Mon Sep 17 00:00:00 2001
|
|
|
fe681c3 |
From: Navid Emamdoost <navid.emamdoost@gmail.com>
|
|
|
fe681c3 |
Date: Tue, 24 Sep 2019 23:23:56 -0500
|
|
|
fe681c3 |
Subject: [PATCH] drm/amd/display: prevent memory leak
|
|
|
fe681c3 |
|
|
|
fe681c3 |
In dcn*_create_resource_pool the allocated memory should be released if
|
|
|
fe681c3 |
construct pool fails.
|
|
|
fe681c3 |
|
|
|
fe681c3 |
Reviewed-by: Harry Wentland <harry.wentland@amd.com>
|
|
|
fe681c3 |
Signed-off-by: Navid Emamdoost <navid.emamdoost@gmail.com>
|
|
|
fe681c3 |
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
|
|
|
fe681c3 |
---
|
|
|
fe681c3 |
drivers/gpu/drm/amd/display/dc/dce100/dce100_resource.c | 1 +
|
|
|
fe681c3 |
drivers/gpu/drm/amd/display/dc/dce110/dce110_resource.c | 1 +
|
|
|
fe681c3 |
drivers/gpu/drm/amd/display/dc/dce112/dce112_resource.c | 1 +
|
|
|
fe681c3 |
drivers/gpu/drm/amd/display/dc/dce120/dce120_resource.c | 1 +
|
|
|
fe681c3 |
drivers/gpu/drm/amd/display/dc/dcn10/dcn10_resource.c | 1 +
|
|
|
fe681c3 |
5 files changed, 5 insertions(+)
|
|
|
fe681c3 |
|
|
|
fe681c3 |
diff --git a/drivers/gpu/drm/amd/display/dc/dce100/dce100_resource.c b/drivers/gpu/drm/amd/display/dc/dce100/dce100_resource.c
|
|
|
fe681c3 |
index afc61055eca1..1787b9bf800a 100644
|
|
|
fe681c3 |
--- a/drivers/gpu/drm/amd/display/dc/dce100/dce100_resource.c
|
|
|
fe681c3 |
+++ b/drivers/gpu/drm/amd/display/dc/dce100/dce100_resource.c
|
|
|
fe681c3 |
@@ -1091,6 +1091,7 @@ struct resource_pool *dce100_create_resource_pool(
|
|
|
fe681c3 |
if (construct(num_virtual_links, dc, pool))
|
|
|
fe681c3 |
return &pool->base;
|
|
|
fe681c3 |
|
|
|
fe681c3 |
+ kfree(pool);
|
|
|
fe681c3 |
BREAK_TO_DEBUGGER();
|
|
|
fe681c3 |
return NULL;
|
|
|
fe681c3 |
}
|
|
|
fe681c3 |
diff --git a/drivers/gpu/drm/amd/display/dc/dce110/dce110_resource.c b/drivers/gpu/drm/amd/display/dc/dce110/dce110_resource.c
|
|
|
fe681c3 |
index c66fe170e1e8..318e9c2e2ca8 100644
|
|
|
fe681c3 |
--- a/drivers/gpu/drm/amd/display/dc/dce110/dce110_resource.c
|
|
|
fe681c3 |
+++ b/drivers/gpu/drm/amd/display/dc/dce110/dce110_resource.c
|
|
|
fe681c3 |
@@ -1462,6 +1462,7 @@ struct resource_pool *dce110_create_resource_pool(
|
|
|
fe681c3 |
if (construct(num_virtual_links, dc, pool, asic_id))
|
|
|
fe681c3 |
return &pool->base;
|
|
|
fe681c3 |
|
|
|
fe681c3 |
+ kfree(pool);
|
|
|
fe681c3 |
BREAK_TO_DEBUGGER();
|
|
|
fe681c3 |
return NULL;
|
|
|
fe681c3 |
}
|
|
|
fe681c3 |
diff --git a/drivers/gpu/drm/amd/display/dc/dce112/dce112_resource.c b/drivers/gpu/drm/amd/display/dc/dce112/dce112_resource.c
|
|
|
fe681c3 |
index 2b3a2917c168..83e1878161c9 100644
|
|
|
fe681c3 |
--- a/drivers/gpu/drm/amd/display/dc/dce112/dce112_resource.c
|
|
|
fe681c3 |
+++ b/drivers/gpu/drm/amd/display/dc/dce112/dce112_resource.c
|
|
|
fe681c3 |
@@ -1342,6 +1342,7 @@ struct resource_pool *dce112_create_resource_pool(
|
|
|
fe681c3 |
if (construct(num_virtual_links, dc, pool))
|
|
|
fe681c3 |
return &pool->base;
|
|
|
fe681c3 |
|
|
|
fe681c3 |
+ kfree(pool);
|
|
|
fe681c3 |
BREAK_TO_DEBUGGER();
|
|
|
fe681c3 |
return NULL;
|
|
|
fe681c3 |
}
|
|
|
fe681c3 |
diff --git a/drivers/gpu/drm/amd/display/dc/dce120/dce120_resource.c b/drivers/gpu/drm/amd/display/dc/dce120/dce120_resource.c
|
|
|
fe681c3 |
index 236c4c0324b1..8b85e5274bba 100644
|
|
|
fe681c3 |
--- a/drivers/gpu/drm/amd/display/dc/dce120/dce120_resource.c
|
|
|
fe681c3 |
+++ b/drivers/gpu/drm/amd/display/dc/dce120/dce120_resource.c
|
|
|
fe681c3 |
@@ -1208,6 +1208,7 @@ struct resource_pool *dce120_create_resource_pool(
|
|
|
fe681c3 |
if (construct(num_virtual_links, dc, pool))
|
|
|
fe681c3 |
return &pool->base;
|
|
|
fe681c3 |
|
|
|
fe681c3 |
+ kfree(pool);
|
|
|
fe681c3 |
BREAK_TO_DEBUGGER();
|
|
|
fe681c3 |
return NULL;
|
|
|
fe681c3 |
}
|
|
|
fe681c3 |
diff --git a/drivers/gpu/drm/amd/display/dc/dcn10/dcn10_resource.c b/drivers/gpu/drm/amd/display/dc/dcn10/dcn10_resource.c
|
|
|
fe681c3 |
index 5a89e462e7cc..59305e411a66 100644
|
|
|
fe681c3 |
--- a/drivers/gpu/drm/amd/display/dc/dcn10/dcn10_resource.c
|
|
|
fe681c3 |
+++ b/drivers/gpu/drm/amd/display/dc/dcn10/dcn10_resource.c
|
|
|
fe681c3 |
@@ -1570,6 +1570,7 @@ struct resource_pool *dcn10_create_resource_pool(
|
|
|
fe681c3 |
if (construct(init_data->num_virtual_links, dc, pool))
|
|
|
fe681c3 |
return &pool->base;
|
|
|
fe681c3 |
|
|
|
fe681c3 |
+ kfree(pool);
|
|
|
fe681c3 |
BREAK_TO_DEBUGGER();
|
|
|
fe681c3 |
return NULL;
|
|
|
fe681c3 |
}
|
|
|
fe681c3 |
--
|
|
|
fe681c3 |
2.23.0
|
|
|
fe681c3 |
|