diff options
author | Robert Yang <liezhi.yang@windriver.com> | 2018-08-16 10:38:22 +0800 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2018-08-16 22:40:27 +0100 |
commit | 1faa551931e061367bb5ba8047dfa7badf726aff (patch) | |
tree | e2f4dc5ecdf93ff422207408ba9b0f9c434e678d /meta/recipes-devtools/elfutils/files | |
parent | 0f327c393f613dabf4535a71638e47e57b21c521 (diff) | |
download | poky-1faa551931e061367bb5ba8047dfa7badf726aff.tar.gz |
elfutils: check data_list.data.d.d_buf before free it
[YOCTO #12791]
The one which actually saves the data is data_list.data.d.d_buf, so check it
before free rawdata_base.
This can fix a segmentation fault when prelink libqb_1.0.3:
prelink: /usr/lib/libqb.so.0.18.2: Symbol section index outside of section numbers
The segmentation fault happens when prelink call elf_end().
Fixed:
MACHINE="qemux86-64"
IMAGE_INSTALL_append = " libqb" #libqp is from meta-openembedded
$ bitbake core-image-minimal
Segmention fault
(From OE-Core rev: 560154e8525dce4beb8199ffc0d7c964da9d665a)
Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools/elfutils/files')
-rw-r--r-- | meta/recipes-devtools/elfutils/files/0001-libelf-elf_end.c-check-data_list.data.d.d_buf-before.patch | 39 |
1 files changed, 39 insertions, 0 deletions
diff --git a/meta/recipes-devtools/elfutils/files/0001-libelf-elf_end.c-check-data_list.data.d.d_buf-before.patch b/meta/recipes-devtools/elfutils/files/0001-libelf-elf_end.c-check-data_list.data.d.d_buf-before.patch new file mode 100644 index 0000000000..8b03c0ea6b --- /dev/null +++ b/meta/recipes-devtools/elfutils/files/0001-libelf-elf_end.c-check-data_list.data.d.d_buf-before.patch | |||
@@ -0,0 +1,39 @@ | |||
1 | From d68822e93c57c3fbb77b93eada5986d2240157c2 Mon Sep 17 00:00:00 2001 | ||
2 | From: Robert Yang <liezhi.yang@windriver.com> | ||
3 | Date: Thu, 16 Aug 2018 09:58:26 +0800 | ||
4 | Subject: [PATCH] libelf/elf_end.c: check data_list.data.d.d_buf before free it | ||
5 | |||
6 | The one which actually saves the data is data_list.data.d.d_buf, so check it | ||
7 | before free rawdata_base. | ||
8 | |||
9 | This can fix a segmentation fault when prelink libqb_1.0.3: | ||
10 | prelink: /usr/lib/libqb.so.0.18.2: Symbol section index outside of section numbers | ||
11 | |||
12 | The segmentation fault happens when prelink call elf_end(). | ||
13 | |||
14 | Upstream-Status: Submitted [https://sourceware.org/ml/elfutils-devel/2018-q3/msg00065.html] | ||
15 | |||
16 | Signed-off-by: Robert Yang <liezhi.yang@windriver.com> | ||
17 | --- | ||
18 | libelf/elf_end.c | 3 ++- | ||
19 | 1 file changed, 2 insertions(+), 1 deletion(-) | ||
20 | |||
21 | diff --git a/libelf/elf_end.c b/libelf/elf_end.c | ||
22 | index 160f0b8..5388e80 100644 | ||
23 | --- a/libelf/elf_end.c | ||
24 | +++ b/libelf/elf_end.c | ||
25 | @@ -165,9 +165,10 @@ elf_end (Elf *elf) | ||
26 | |||
27 | /* The section data is allocated if we couldn't mmap | ||
28 | the file. Or if we had to decompress. */ | ||
29 | - if (elf->map_address == NULL | ||
30 | + if ((elf->map_address == NULL | ||
31 | || scn->rawdata_base == scn->zdata_base | ||
32 | || (scn->flags & ELF_F_MALLOCED) != 0) | ||
33 | + && (scn->data_list.data.d.d_buf != NULL)) | ||
34 | free (scn->rawdata_base); | ||
35 | |||
36 | /* Free the list of data buffers for the section. | ||
37 | -- | ||
38 | 2.7.4 | ||
39 | |||