| Message ID | 20190925042407.31383-1-navid.emamdoost@gmail.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | drm/amd/display: prevent memory leak | expand |
On 2019-09-25 12:23 a.m., Navid Emamdoost wrote: > In dcn*_create_resource_pool the allocated memory should be released if > construct pool fails. > > Signed-off-by: Navid Emamdoost <navid.emamdoost@gmail.com> Reviewed-by: Harry Wentland <harry.wentland@amd.com> Harry > --- > 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(+) > > diff --git a/drivers/gpu/drm/amd/display/dc/dce100/dce100_resource.c b/drivers/gpu/drm/amd/display/dc/dce100/dce100_resource.c > index afc61055eca1..1787b9bf800a 100644 > --- a/drivers/gpu/drm/amd/display/dc/dce100/dce100_resource.c > +++ b/drivers/gpu/drm/amd/display/dc/dce100/dce100_resource.c > @@ -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; > } > diff --git a/drivers/gpu/drm/amd/display/dc/dce110/dce110_resource.c b/drivers/gpu/drm/amd/display/dc/dce110/dce110_resource.c > index c66fe170e1e8..318e9c2e2ca8 100644 > --- a/drivers/gpu/drm/amd/display/dc/dce110/dce110_resource.c > +++ b/drivers/gpu/drm/amd/display/dc/dce110/dce110_resource.c > @@ -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; > } > diff --git a/drivers/gpu/drm/amd/display/dc/dce112/dce112_resource.c b/drivers/gpu/drm/amd/display/dc/dce112/dce112_resource.c > index 3ac4c7e73050..3199d493d13b 100644 > --- a/drivers/gpu/drm/amd/display/dc/dce112/dce112_resource.c > +++ b/drivers/gpu/drm/amd/display/dc/dce112/dce112_resource.c > @@ -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; > } > diff --git a/drivers/gpu/drm/amd/display/dc/dce120/dce120_resource.c b/drivers/gpu/drm/amd/display/dc/dce120/dce120_resource.c > index 7d08154e9662..bb497f43f6eb 100644 > --- a/drivers/gpu/drm/amd/display/dc/dce120/dce120_resource.c > +++ b/drivers/gpu/drm/amd/display/dc/dce120/dce120_resource.c > @@ -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; > } > diff --git a/drivers/gpu/drm/amd/display/dc/dcn10/dcn10_resource.c b/drivers/gpu/drm/amd/display/dc/dcn10/dcn10_resource.c > index 5a89e462e7cc..59305e411a66 100644 > --- a/drivers/gpu/drm/amd/display/dc/dcn10/dcn10_resource.c > +++ b/drivers/gpu/drm/amd/display/dc/dcn10/dcn10_resource.c > @@ -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; > } >
On Wed, Sep 25, 2019 at 9:54 AM Harry Wentland <hwentlan@amd.com> wrote: > > > > On 2019-09-25 12:23 a.m., Navid Emamdoost wrote: > > In dcn*_create_resource_pool the allocated memory should be released if > > construct pool fails. > > > > Signed-off-by: Navid Emamdoost <navid.emamdoost@gmail.com> > > Reviewed-by: Harry Wentland <harry.wentland@amd.com> > Applied. thanks! Alex > Harry > > > --- > > 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(+) > > > > diff --git a/drivers/gpu/drm/amd/display/dc/dce100/dce100_resource.c b/drivers/gpu/drm/amd/display/dc/dce100/dce100_resource.c > > index afc61055eca1..1787b9bf800a 100644 > > --- a/drivers/gpu/drm/amd/display/dc/dce100/dce100_resource.c > > +++ b/drivers/gpu/drm/amd/display/dc/dce100/dce100_resource.c > > @@ -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; > > } > > diff --git a/drivers/gpu/drm/amd/display/dc/dce110/dce110_resource.c b/drivers/gpu/drm/amd/display/dc/dce110/dce110_resource.c > > index c66fe170e1e8..318e9c2e2ca8 100644 > > --- a/drivers/gpu/drm/amd/display/dc/dce110/dce110_resource.c > > +++ b/drivers/gpu/drm/amd/display/dc/dce110/dce110_resource.c > > @@ -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; > > } > > diff --git a/drivers/gpu/drm/amd/display/dc/dce112/dce112_resource.c b/drivers/gpu/drm/amd/display/dc/dce112/dce112_resource.c > > index 3ac4c7e73050..3199d493d13b 100644 > > --- a/drivers/gpu/drm/amd/display/dc/dce112/dce112_resource.c > > +++ b/drivers/gpu/drm/amd/display/dc/dce112/dce112_resource.c > > @@ -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; > > } > > diff --git a/drivers/gpu/drm/amd/display/dc/dce120/dce120_resource.c b/drivers/gpu/drm/amd/display/dc/dce120/dce120_resource.c > > index 7d08154e9662..bb497f43f6eb 100644 > > --- a/drivers/gpu/drm/amd/display/dc/dce120/dce120_resource.c > > +++ b/drivers/gpu/drm/amd/display/dc/dce120/dce120_resource.c > > @@ -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; > > } > > diff --git a/drivers/gpu/drm/amd/display/dc/dcn10/dcn10_resource.c b/drivers/gpu/drm/amd/display/dc/dcn10/dcn10_resource.c > > index 5a89e462e7cc..59305e411a66 100644 > > --- a/drivers/gpu/drm/amd/display/dc/dcn10/dcn10_resource.c > > +++ b/drivers/gpu/drm/amd/display/dc/dcn10/dcn10_resource.c > > @@ -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 > dri-devel@lists.freedesktop.org > https://lists.freedesktop.org/mailman/listinfo/dri-devel
diff --git a/drivers/gpu/drm/amd/display/dc/dce100/dce100_resource.c b/drivers/gpu/drm/amd/display/dc/dce100/dce100_resource.c index afc61055eca1..1787b9bf800a 100644 --- a/drivers/gpu/drm/amd/display/dc/dce100/dce100_resource.c +++ b/drivers/gpu/drm/amd/display/dc/dce100/dce100_resource.c @@ -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; } diff --git a/drivers/gpu/drm/amd/display/dc/dce110/dce110_resource.c b/drivers/gpu/drm/amd/display/dc/dce110/dce110_resource.c index c66fe170e1e8..318e9c2e2ca8 100644 --- a/drivers/gpu/drm/amd/display/dc/dce110/dce110_resource.c +++ b/drivers/gpu/drm/amd/display/dc/dce110/dce110_resource.c @@ -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; } diff --git a/drivers/gpu/drm/amd/display/dc/dce112/dce112_resource.c b/drivers/gpu/drm/amd/display/dc/dce112/dce112_resource.c index 3ac4c7e73050..3199d493d13b 100644 --- a/drivers/gpu/drm/amd/display/dc/dce112/dce112_resource.c +++ b/drivers/gpu/drm/amd/display/dc/dce112/dce112_resource.c @@ -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; } diff --git a/drivers/gpu/drm/amd/display/dc/dce120/dce120_resource.c b/drivers/gpu/drm/amd/display/dc/dce120/dce120_resource.c index 7d08154e9662..bb497f43f6eb 100644 --- a/drivers/gpu/drm/amd/display/dc/dce120/dce120_resource.c +++ b/drivers/gpu/drm/amd/display/dc/dce120/dce120_resource.c @@ -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; } diff --git a/drivers/gpu/drm/amd/display/dc/dcn10/dcn10_resource.c b/drivers/gpu/drm/amd/display/dc/dcn10/dcn10_resource.c index 5a89e462e7cc..59305e411a66 100644 --- a/drivers/gpu/drm/amd/display/dc/dcn10/dcn10_resource.c +++ b/drivers/gpu/drm/amd/display/dc/dcn10/dcn10_resource.c @@ -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; }
In dcn*_create_resource_pool the allocated memory should be released if construct pool fails. Signed-off-by: Navid Emamdoost <navid.emamdoost@gmail.com> --- 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(+)