Re: [PATCH] uml: free resources

[Richard Weinberger]

Am Donnerstag 07 Juli 2011, 15:08:22 schrieb Vitaliy Ivanov:
> On Thu, Jul 7, 2011 at 7:02 AM, Davidlohr Bueso <dave@xxxxxxx> wrote:
> > From: Davidlohr Bueso <dave@xxxxxxx>
> > 
> > When creating the temp file there's a memory and file descriptor leak
> > upon error.
> > 
> > Signed-off-by: Davidlohr Bueso <dave@xxxxxxx>
> > ---
> >  arch/um/os-Linux/mem.c |    6 ++++--
> >  1 files changed, 4 insertions(+), 2 deletions(-)
> > 
> > diff --git a/arch/um/os-Linux/mem.c b/arch/um/os-Linux/mem.c
> > index e696144..62878cf 100644
> > --- a/arch/um/os-Linux/mem.c
> > +++ b/arch/um/os-Linux/mem.c
> > @@ -176,7 +176,7 @@ static int __init make_tempfile(const char *template,
> > char **out_tempname,
> > 
> >        find_tempdir();
> >        if ((tempdir == NULL) || (strlen(tempdir) >= MAXPATHLEN))
> > -               return -1;
> > +               goto out;
> > 
> >        if (template[0] != '/')
> >                strcpy(tempname, tempdir);
> > @@ -191,13 +191,15 @@ static int __init make_tempfile(const char
> > *template, char **out_tempname, }
> >        if (do_unlink && (unlink(tempname) < 0)) {
> >                perror("unlink");
> > -               goto out;
> > +               goto close;
> >        }
> >        if (out_tempname) {
> >                *out_tempname = tempname;
> >        } else
> >                free(tempname);
> >        return fd;
> > +close:
> > +       close(fd);
> >  out:
> >        free(tempname);
> >        return -1;
> > --
> 
> Reviewed-by: Vitaliy Ivanov <vitalivanov@xxxxxxxxx>

Applied!

Thanks,
//richard

P.s: Dave, your patch did not show up on user-mode-linux-devel@xxxxxxxxxxxxxxxxxxxxx nor 
richard@xxxxxx, is your mailer broken?
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/