[PATCH] uml: free resources

[PATCH] uml: free resources

[Davidlohr Bueso]

From: Davidlohr Bueso <dave@gnu.org>

When creating the temp file there's a memory and file descriptor leak upon error.

Signed-off-by: Davidlohr Bueso <dave@gnu.org>
---
 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;
-- 
1.7.4.1

Re: [PATCH] uml: free resources

[Vitaliy Ivanov]

On Thu, Jul 7, 2011 at 7:02 AM, Davidlohr Bueso <dave@gnu.org> wrote:
> From: Davidlohr Bueso <dave@gnu.org>
>
> When creating the temp file there's a memory and file descriptor leak upon error.
>
> Signed-off-by: Davidlohr Bueso <dave@gnu.org>
> ---
>  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@gmail.com>

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@gnu.org> wrote:
> > From: Davidlohr Bueso <dave@gnu.org>
> > 
> > When creating the temp file there's a memory and file descriptor leak
> > upon error.
> > 
> > Signed-off-by: Davidlohr Bueso <dave@gnu.org>
> > ---
> >  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@gmail.com>

Applied!

Thanks,
//richard

P.s: Dave, your patch did not show up on user-mode-linux-devel@lists.sourceforge.net nor 
richard@nod.at, is your mailer broken?