From: Mark Wielaard <mark@klomp.org>
Date: Wed, 8 Nov 2023 12:50:01 +0000 (+0100)
Subject: libelf: Fix possible memory leak in elf_getdata_rawchunk
X-Git-Tag: elfutils-0.191~43
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=b21b4dfc23c2c812147428a39999be9f3cb4615f;p=thirdparty%2Felfutils.git

libelf: Fix possible memory leak in elf_getdata_rawchunk

If the rawchunk is not properly aligned we'll create a new buffer
that is correctly aligned and put the data in that new buffer with
memcpy or the conversion function. In such cases the rawchunk leaks
because the new buffer is put into the Elf_Data_Chunk.

	* libelf/elf_getdata_rawchunk.c (elf_getdata_rawchunk):
	Call free on the rawchunk if new buffer was allocated.

Signed-off-by: Mark Wielaard <mark@klomp.org>
---

diff --git a/libelf/elf_getdata_rawchunk.c b/libelf/elf_getdata_rawchunk.c
index 05ff329c7..1751878d6 100644
--- a/libelf/elf_getdata_rawchunk.c
+++ b/libelf/elf_getdata_rawchunk.c
@@ -175,6 +175,8 @@ elf_getdata_rawchunk (Elf *elf, int64_t offset, size_t size, Elf_Type type)
 
 	  /* The copy will be appropriately aligned for direct access.  */
 	  memcpy (buffer, rawchunk, size);
+
+	  free (rawchunk);
 	}
     }
   else
@@ -191,6 +193,9 @@ elf_getdata_rawchunk (Elf *elf, int64_t offset, size_t size, Elf_Type type)
 
       /* Call the conversion function.  */
       (*__elf_xfctstom[elf->class - 1][type])(buffer, rawchunk, size, 0);
+
+      if (!flags)
+	free (rawchunk);
     }
 
   /* Allocate the dummy container to point at this buffer.  */