lkml.org 
[lkml]   [2017]   [Nov]   [30]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
SubjectRe: [PATCH] of: overlay: fix memory leak of ovcs on error exit path
On Thu, Nov 30, 2017 at 07:14:45AM -0500, Frank Rowand wrote:
> On 11/29/17 14:17, Colin King wrote:
> > From: Colin Ian King <colin.king@canonical.com>
> >
> > Currently if the call to of_resolve_phandles fails then then ovcs
> > is not kfree'd on the error exit path. Rather than try and make
> > the clean up exit path more convoluted, fix this by just kfree'ing
> > ovcs at the point of error detection and exit via the same exit
> > path.
> >
> > Detected by CoverityScan, CID#1462296 ("Resource Leak")
> >
> > Fixes: f948d6d8b792 ("of: overlay: avoid race condition between applying multiple overlays")

The Fixes tag is wrong. It should be:

Fixes: bd80e2555c5c ("of: overlay: Fix cleanup order in of_overlay_apply()")

> > Signed-off-by: Colin Ian King <colin.king@canonical.com>
> > ---
> > drivers/of/overlay.c | 4 +++-
> > 1 file changed, 3 insertions(+), 1 deletion(-)
> >
> > diff --git a/drivers/of/overlay.c b/drivers/of/overlay.c
> > index 53bc9e3f0b98..6c8efe7d8cbb 100644
> > --- a/drivers/of/overlay.c
> > +++ b/drivers/of/overlay.c
> > @@ -708,8 +708,10 @@ int of_overlay_apply(struct device_node *tree, int *ovcs_id)
> > of_overlay_mutex_lock();
> >
> > ret = of_resolve_phandles(tree);
> > - if (ret)
> > + if (ret) {
> > + kfree(ovcs);
> > goto err_overlay_unlock;
> > + }
> >
> > mutex_lock(&of_mutex);
> >
> >
>
> False coverity warning. ovcs is freed in free_overlay_changeset().

You're looking at an older version of the code and Colin is looking at
linux-next.

regards,
dan carpenter

\
 
 \ /
  Last update: 2017-11-30 13:51    [W:0.100 / U:0.364 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site