diff options
| author |   Robert Yang <liezhi.yang@windriver.com> | 2018-08-16 10:25:46 +0800 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2018-08-16 10:44:07 +0100 |
| commit | b7c291ee6532cba845ee6bfbbaa21076a2b2cbe5 (patch) | |
| tree | 3c1f19e7128d4da4ab40f77a3a6cf9196b664439 /meta/recipes-devtools/prelink/prelink | |
| parent | 83cb0938b90bab9ba727f883b8955b0b40d49a01 (diff) | |
| download | openembedded-core-contrib-b7c291ee6532cba845ee6bfbbaa21076a2b2cbe5.tar.gz | |
prelink: use ehdr.e_shstrndx as index rather than ehdr.e_shnum
[YOCTO #12791]
According to struct elf32_hd, the e_shnum is section header number, and the
index is e_shstrndx, not e_shnum.
This can fix segmention fault when handle libqb.so.0.18.2 from libqb_1.0.3.
It fails to handle libqb.so.0.18.2 and get errors:
Symbol section index outside of section numbers
Then segmentation fault, this is because the e_shnum is 34, while e_shstrndx is
27 (it would be 33 when no errors), I've checked several elf files to confirm
that the ones after e_shstrndx is NULL, so use e_shstrndx should be correct.
Fixed:
MACHINE="qemux86-64"
IMAGE_INSTALL_append = " libqb" #libqp is from meta-openembedded
$ bitbake core-image-minimal
Segmention fault
Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
Diffstat (limited to 'meta/recipes-devtools/prelink/prelink')
| -rw-r--r-- | meta/recipes-devtools/prelink/prelink/0001-src-dso.c-use-ehdr.e_shstrndx-as-index.patch | 39 |
1 files changed, 39 insertions, 0 deletions
diff --git a/meta/recipes-devtools/prelink/prelink/0001-src-dso.c-use-ehdr.e_shstrndx-as-index.patch b/meta/recipes-devtools/prelink/prelink/0001-src-dso.c-use-ehdr.e_shstrndx-as-index.patch new file mode 100644 index 0000000000..d2cd1a70e2 --- /dev/null +++ b/meta/recipes-devtools/prelink/prelink/0001-src-dso.c-use-ehdr.e_shstrndx-as-index.patch @@ -0,0 +1,39 @@ +From 107290910ff846532d944ddb78edda436bb6ae63 Mon Sep 17 00:00:00 2001 +From: Robert Yang <liezhi.yang@windriver.com> +Date: Wed, 15 Aug 2018 17:53:43 +0800 +Subject: [PATCH] src/dso.c: use ehdr.e_shstrndx as index + +According to struct elf32_hd, the e_shnum is section header number, and the +index is e_shstrndx, not e_shnum. + +This can fix segmention fault when handle libqb.so.0.18.2 from libqb_1.0.3. +It fails to handle libqb.so.0.18.2 and get errors: +Symbol section index outside of section numbers + +Then segmentation fault, this is because the e_shnum is 34, while e_shstrndx is +27 (it would be 33 when no errors), I've checked several elf files to confirm +that the ones after e_shstrndx is NULL, so use e_shstrndx should be correct. + +Upstream-Status: Submitted [https://lists.yoctoproject.org/pipermail/yocto/2018-August/042240.html] + +Signed-off-by: Robert Yang <liezhi.yang@windriver.com> +--- + src/dso.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/dso.c b/src/dso.c +index ae5e04d..c59d81f 100644 +--- a/src/dso.c ++++ b/src/dso.c +@@ -1659,7 +1659,7 @@ close_dso_1 (DSO *dso) + { + int i; + +- for (i = 1; i < dso->ehdr.e_shnum; ++i) ++ for (i = 1; i < dso->ehdr.e_shstrndx; ++i) + { + Elf_Scn *scn = dso->scn[i]; + Elf_Data *data = NULL; +-- +2.7.4 + |