Re: [uml-devel] [PATCH] uml: free resources

2011-07-07 Thread Richard Weinberger
Am Donnerstag 07 Juli 2011, 15:08:22 schrieb Vitaliy Ivanov:
> On Thu, Jul 7, 2011 at 7:02 AM, Davidlohr Bueso  wrote:
> > From: Davidlohr Bueso 
> > 
> > When creating the temp file there's a memory and file descriptor leak
> > upon error.
> > 
> > Signed-off-by: Davidlohr Bueso 
> > ---
> >  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 

Applied!

Thanks,
//richard

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

--
All of the data generated in your IT infrastructure is seriously valuable.
Why? It contains a definitive record of application performance, security 
threats, fraudulent activity, and more. Splunk takes this data and makes 
sense of it. IT sense. And common sense.
http://p.sf.net/sfu/splunk-d2d-c2
___
User-mode-linux-devel mailing list
User-mode-linux-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/user-mode-linux-devel


Re: [uml-devel] [PATCH] uml: free resources

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

--
All of the data generated in your IT infrastructure is seriously valuable.
Why? It contains a definitive record of application performance, security 
threats, fraudulent activity, and more. Splunk takes this data and makes 
sense of it. IT sense. And common sense.
http://p.sf.net/sfu/splunk-d2d-c2
___
User-mode-linux-devel mailing list
User-mode-linux-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/user-mode-linux-devel