libelf: Don't leak memory when out of memory in updatemmap.

We forgot to free scns when returning ELF_E_NOMEM.

Signed-off-by: Mark Wielaard <mjw@redhat.com>

diff --git a/libelf/ChangeLog b/libelf/ChangeLog
index b9669239f9d5545902616373e28cac3ab49d6f5a..350e4eb19207edd5264074ca3d1b681ebb459f42 100644 (file)
--- a/libelf/ChangeLog
+++ b/libelf/ChangeLog
@@ -1,3 +1,7 @@
+2016-02-13  Mark Wielaard  <mjw@redhat.com>
+
+       * elf32_updatefile.c (updatemmap): Free scns when out of memory.
+
 2016-01-28  Mark Wielaard  <mjw@redhat.com>
 
        * elf.h: Update from glibc. Add new i386 and x86_64 relocations.

diff --git a/libelf/elf32_updatefile.c b/libelf/elf32_updatefile.c
index 090921976438fd5fc9fdfca42985193531e182e0..d0fabb16c744c2cc916b510f69f9bfb0cb7745f7 100644 (file)
--- a/libelf/elf32_updatefile.c
+++ b/libelf/elf32_updatefile.c
@@ -1,5 +1,5 @@
 /* Write changed data structures.
-   Copyright (C) 2000-2010, 2014, 2015 Red Hat, Inc.
+   Copyright (C) 2000-2010, 2014, 2015, 2016 Red Hat, Inc.
    This file is part of elfutils.
    Written by Ulrich Drepper <drepper@redhat.com>, 2000.
 
@@ -269,6 +269,7 @@ __elfw2(LIBELFBITS,updatemmap) (Elf *elf, int change_bo, size_t shnum)
              void *p = malloc (sizeof (ElfW2(LIBELFBITS,Shdr)));
              if (unlikely (p == NULL))
                {
+                 free (scns);
                  __libelf_seterrno (ELF_E_NOMEM);
                  return -1;
                }
@@ -295,6 +296,7 @@ __elfw2(LIBELFBITS,updatemmap) (Elf *elf, int change_bo, size_t shnum)
              void *p = malloc (scn->data_list.data.d.d_size);
              if (unlikely (p == NULL))
                {
+                 free (scns);
                  __libelf_seterrno (ELF_E_NOMEM);
                  return -1;
                }