[Qemu-devel] [PATCH] linux-user: Protect against allocation failure in load_symbols.

[Qemu-devel] [PATCH] linux-user: Protect against allocation failure in load_symbols.

[Richard Henderson]

Cc: malc <av1474@comtv.ru>
Signed-off-by: Richard Henderson <rth@twiddle.net>
---
 linux-user/elfload.c |   10 ++++++++++
 1 files changed, 10 insertions(+), 0 deletions(-)

diff --git a/linux-user/elfload.c b/linux-user/elfload.c
index a53285a..33d776d 100644
--- a/linux-user/elfload.c
+++ b/linux-user/elfload.c
@@ -1546,7 +1546,17 @@ static void load_symbols(struct elfhdr *hdr, int fd, abi_ulong load_bias)
         }
     }
 
+    /* Attempt to free the storage associated with the local symbols
+       that we threw away.  Whether or not this has any effect on the
+       memory allocation depends on the malloc implementation and how
+       many symbols we managed to discard.  */
     syms = realloc(syms, nsyms * sizeof(*syms));
+    if (syms == NULL) {
+        free(s);
+        free(strings);
+        return;
+    }
+
     qsort(syms, nsyms, sizeof(*syms), symcmp);
 
     s->disas_num_syms = nsyms;
-- 
1.7.2

[Qemu-devel] Re: [PATCH] linux-user: Protect against allocation failure in load_symbols.

[malc]

On Thu, 29 Jul 2010, Richard Henderson wrote:

> Cc: malc <av1474@comtv.ru>
> Signed-off-by: Richard Henderson <rth@twiddle.net>
> ---

Thanks. Applied.

-- 
mailto:av1474@comtv.ru

Re: [Qemu-devel] [PATCH] linux-user: Protect against allocation failure in load_symbols.

[Jay Foad]

> +    /* Attempt to free the storage associated with the local symbols
> +       that we threw away.  Whether or not this has any effect on the
> +       memory allocation depends on the malloc implementation and how
> +       many symbols we managed to discard.  */
>      syms = realloc(syms, nsyms * sizeof(*syms));
> +    if (syms == NULL) {
> +        free(s);
> +        free(strings);
> +        return;
> +    }

If realloc() fails it leaves the original object unchanged, so can't
you just write:

    t = realloc(syms, nsyms * sizeof(*syms));
    if (t != NULL) {
        syms = t;
    }

?

Jay.

Re: [Qemu-devel] [PATCH] linux-user: Protect against allocation failure in load_symbols.

[malc]

On Fri, 30 Jul 2010, Jay Foad wrote:

> > +    /* Attempt to free the storage associated with the local symbols
> > +       that we threw away.  Whether or not this has any effect on the
> > +       memory allocation depends on the malloc implementation and how
> > +       many symbols we managed to discard.  */
> >      syms = realloc(syms, nsyms * sizeof(*syms));
> > +    if (syms == NULL) {
> > +        free(s);
> > +        free(strings);
> > +        return;
> > +    }
> 
> If realloc() fails it leaves the original object unchanged, so can't
> you just write:

Life is not as simple as one would like it to be.
http://www.mail-archive.com/qemu-devel@nongnu.org/msg22137.html

> 
>     t = realloc(syms, nsyms * sizeof(*syms));
>     if (t != NULL) {
>         syms = t;
>     }
> 
> ?
> 
> Jay.
> 

-- 
mailto:av1474@comtv.ru