mirror of
https://git.yoctoproject.org/poky
synced 2026-02-10 02:33:02 +01:00
70de26076f
The 0.170 Fixed CVE issues - CVE-2017-7608 - CVE-2017-7612 - CVE-2017-7611 - CVE-2017-7610 - CVE-2016-10255 - CVE-2017-7613 - CVE-2017-7609 - CVE-2016-10254 - CVE-2017-7607 Rebase patches to 0.170 - dso-link-change.patch -> 0001 - Fix_elf_cvt_gunhash.patch -> 0002 - fixheadercheck.patch -> 0003 - 0001-remove-the-unneed-checking.patch -> 0004 - 0001-fix-a-stack-usage-warning.patch -> 0005 - aarch64_uio.patch -> 0006 - shadow.patch -> 0007 - 0001-build-Provide-alternatives-for-glibc-assumptions-hel.patch -> 0008 - debian/mips_backend.diff -> debian/mips_backend.patch Drop obsolete patches - 0001-elf_getarsym-Silence-Werror-maybe-uninitialized-fals.patch Upstream fixed it https://sourceware.org/git/?p=elfutils.git;a=commit;h=7114c513fbebcca8b76796b7f64b57447ba383e1 - Fix_one_GCC7_warning.patch It is a backported patch https://sourceware.org/git/?p=elfutils.git;a=commit;h=93c51144c3f664d4e9709da75a1d0fa00ea0fe95 - Drop debian patches, they modify test case. debian/testsuite-ignore-elflint.diff debian/kfreebsd_path.patch debian/hurd_path.patch debian/ignore_strmerge.diff (From OE-Core rev: 4ca17f9275c81f27498b7ac07d9fe7e8193fdd71) Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
230 lines
7.5 KiB
Diff
230 lines
7.5 KiB
Diff
From 59d4b8c48e5040af7e02b34eb26ea602ec82a38e Mon Sep 17 00:00:00 2001
|
|
From: James Cowgill <james410@cowgill.org.uk>
|
|
Date: Mon, 5 Jan 2015 15:17:02 +0000
|
|
Subject: [PATCH 3/3] Add mips n64 relocation format hack
|
|
|
|
MIPSEL N64 ELF files use a slightly different format for storing relocation
|
|
entries which is incompatible with the normal R_SYM / R_INFO macros.
|
|
To workaround this, we rearrange the bytes in the relocation's r_info field
|
|
when reading and writing the relocations.
|
|
|
|
This patch also ensures that strip.c sets the correct value of e_machine
|
|
before manipulating relocations so that these changes take effect.
|
|
|
|
Signed-off-by: James Cowgill <james410@cowgill.org.uk>
|
|
|
|
Upstream-Status: Backport [from debian]
|
|
Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
|
|
---
|
|
libelf/gelf_getrel.c | 25 +++++++++++++++++++++++--
|
|
libelf/gelf_getrela.c | 25 +++++++++++++++++++++++--
|
|
libelf/gelf_update_rel.c | 20 +++++++++++++++++++-
|
|
libelf/gelf_update_rela.c | 20 +++++++++++++++++++-
|
|
src/strip.c | 17 +++++++++++++++++
|
|
5 files changed, 101 insertions(+), 6 deletions(-)
|
|
|
|
Index: b/libelf/gelf_getrel.c
|
|
===================================================================
|
|
--- a/libelf/gelf_getrel.c
|
|
+++ b/libelf/gelf_getrel.c
|
|
@@ -36,6 +36,7 @@
|
|
|
|
#include "libelfP.h"
|
|
|
|
+#define EF_MIPS_ABI 0x0000F000
|
|
|
|
GElf_Rel *
|
|
gelf_getrel (Elf_Data *data, int ndx, GElf_Rel *dst)
|
|
@@ -89,8 +90,28 @@ gelf_getrel (Elf_Data *data, int ndx, GE
|
|
result = NULL;
|
|
}
|
|
else
|
|
- result = memcpy (dst, &((Elf64_Rel *) data_scn->d.d_buf)[ndx],
|
|
- sizeof (Elf64_Rel));
|
|
+ {
|
|
+ GElf_Ehdr hdr;
|
|
+ result = memcpy (dst, &((Elf64_Rel *) data_scn->d.d_buf)[ndx],
|
|
+ sizeof (Elf64_Rel));
|
|
+
|
|
+ if (gelf_getehdr(scn->elf, &hdr) != NULL &&
|
|
+ hdr.e_ident[EI_DATA] == ELFDATA2LSB &&
|
|
+ hdr.e_machine == EM_MIPS &&
|
|
+ (hdr.e_flags & EF_MIPS_ABI) == 0)
|
|
+ {
|
|
+ /*
|
|
+ * The relocation format is mangled on MIPSEL N64
|
|
+ * We'll adjust it so at least R_SYM will work on it
|
|
+ */
|
|
+ GElf_Xword r_info = dst->r_info;
|
|
+ dst->r_info = (r_info << 32) |
|
|
+ ((r_info >> 8) & 0xFF000000) |
|
|
+ ((r_info >> 24) & 0x00FF0000) |
|
|
+ ((r_info >> 40) & 0x0000FF00) |
|
|
+ ((r_info >> 56) & 0x000000FF);
|
|
+ }
|
|
+ }
|
|
}
|
|
|
|
rwlock_unlock (scn->elf->lock);
|
|
Index: b/libelf/gelf_getrela.c
|
|
===================================================================
|
|
--- a/libelf/gelf_getrela.c
|
|
+++ b/libelf/gelf_getrela.c
|
|
@@ -36,6 +36,7 @@
|
|
|
|
#include "libelfP.h"
|
|
|
|
+#define EF_MIPS_ABI 0x0000F000
|
|
|
|
GElf_Rela *
|
|
gelf_getrela (Elf_Data *data, int ndx, GElf_Rela *dst)
|
|
@@ -90,8 +91,28 @@ gelf_getrela (Elf_Data *data, int ndx, G
|
|
result = NULL;
|
|
}
|
|
else
|
|
- result = memcpy (dst, &((Elf64_Rela *) data_scn->d.d_buf)[ndx],
|
|
- sizeof (Elf64_Rela));
|
|
+ {
|
|
+ GElf_Ehdr hdr;
|
|
+ result = memcpy (dst, &((Elf64_Rela *) data_scn->d.d_buf)[ndx],
|
|
+ sizeof (Elf64_Rela));
|
|
+
|
|
+ if (gelf_getehdr(scn->elf, &hdr) != NULL &&
|
|
+ hdr.e_ident[EI_DATA] == ELFDATA2LSB &&
|
|
+ hdr.e_machine == EM_MIPS &&
|
|
+ (hdr.e_flags & EF_MIPS_ABI) == 0)
|
|
+ {
|
|
+ /*
|
|
+ * The relocation format is mangled on MIPSEL N64
|
|
+ * We'll adjust it so at least R_SYM will work on it
|
|
+ */
|
|
+ GElf_Xword r_info = dst->r_info;
|
|
+ dst->r_info = (r_info << 32) |
|
|
+ ((r_info >> 8) & 0xFF000000) |
|
|
+ ((r_info >> 24) & 0x00FF0000) |
|
|
+ ((r_info >> 40) & 0x0000FF00) |
|
|
+ ((r_info >> 56) & 0x000000FF);
|
|
+ }
|
|
+ }
|
|
}
|
|
|
|
rwlock_unlock (scn->elf->lock);
|
|
Index: b/libelf/gelf_update_rel.c
|
|
===================================================================
|
|
--- a/libelf/gelf_update_rel.c
|
|
+++ b/libelf/gelf_update_rel.c
|
|
@@ -36,6 +36,7 @@
|
|
|
|
#include "libelfP.h"
|
|
|
|
+#define EF_MIPS_ABI 0x0000F000
|
|
|
|
int
|
|
gelf_update_rel (Elf_Data *dst, int ndx, GElf_Rel *src)
|
|
@@ -86,6 +87,9 @@ gelf_update_rel (Elf_Data *dst, int ndx,
|
|
}
|
|
else
|
|
{
|
|
+ GElf_Ehdr hdr;
|
|
+ GElf_Rel value = *src;
|
|
+
|
|
/* Check whether we have to resize the data buffer. */
|
|
if (INVALID_NDX (ndx, Elf64_Rel, &data_scn->d))
|
|
{
|
|
@@ -93,7 +97,21 @@ gelf_update_rel (Elf_Data *dst, int ndx,
|
|
goto out;
|
|
}
|
|
|
|
- ((Elf64_Rel *) data_scn->d.d_buf)[ndx] = *src;
|
|
+ if (gelf_getehdr(scn->elf, &hdr) != NULL &&
|
|
+ hdr.e_ident[EI_DATA] == ELFDATA2LSB &&
|
|
+ hdr.e_machine == EM_MIPS &&
|
|
+ (hdr.e_flags & EF_MIPS_ABI) == 0)
|
|
+ {
|
|
+ /* Undo the MIPSEL N64 hack from gelf_getrel */
|
|
+ GElf_Xword r_info = value.r_info;
|
|
+ value.r_info = (r_info >> 32) |
|
|
+ ((r_info << 8) & 0x000000FF00000000) |
|
|
+ ((r_info << 24) & 0x0000FF0000000000) |
|
|
+ ((r_info << 40) & 0x00FF000000000000) |
|
|
+ ((r_info << 56) & 0xFF00000000000000);
|
|
+ }
|
|
+
|
|
+ ((Elf64_Rel *) data_scn->d.d_buf)[ndx] = value;
|
|
}
|
|
|
|
result = 1;
|
|
Index: b/libelf/gelf_update_rela.c
|
|
===================================================================
|
|
--- a/libelf/gelf_update_rela.c
|
|
+++ b/libelf/gelf_update_rela.c
|
|
@@ -36,6 +36,7 @@
|
|
|
|
#include "libelfP.h"
|
|
|
|
+#define EF_MIPS_ABI 0x0000F000
|
|
|
|
int
|
|
gelf_update_rela (Elf_Data *dst, int ndx, GElf_Rela *src)
|
|
@@ -89,6 +90,9 @@ gelf_update_rela (Elf_Data *dst, int ndx
|
|
}
|
|
else
|
|
{
|
|
+ GElf_Ehdr hdr;
|
|
+ GElf_Rela value = *src;
|
|
+
|
|
/* Check whether we have to resize the data buffer. */
|
|
if (INVALID_NDX (ndx, Elf64_Rela, &data_scn->d))
|
|
{
|
|
@@ -96,7 +100,21 @@ gelf_update_rela (Elf_Data *dst, int ndx
|
|
goto out;
|
|
}
|
|
|
|
- ((Elf64_Rela *) data_scn->d.d_buf)[ndx] = *src;
|
|
+ if (gelf_getehdr(scn->elf, &hdr) != NULL &&
|
|
+ hdr.e_ident[EI_DATA] == ELFDATA2LSB &&
|
|
+ hdr.e_machine == EM_MIPS &&
|
|
+ (hdr.e_flags & EF_MIPS_ABI) == 0)
|
|
+ {
|
|
+ /* Undo the MIPSEL N64 hack from gelf_getrel */
|
|
+ GElf_Xword r_info = value.r_info;
|
|
+ value.r_info = (r_info >> 32) |
|
|
+ ((r_info << 8) & 0x000000FF00000000) |
|
|
+ ((r_info << 24) & 0x0000FF0000000000) |
|
|
+ ((r_info << 40) & 0x00FF000000000000) |
|
|
+ ((r_info << 56) & 0xFF00000000000000);
|
|
+ }
|
|
+
|
|
+ ((Elf64_Rela *) data_scn->d.d_buf)[ndx] = value;
|
|
}
|
|
|
|
result = 1;
|
|
Index: b/src/strip.c
|
|
===================================================================
|
|
--- a/src/strip.c
|
|
+++ b/src/strip.c
|
|
@@ -532,6 +532,23 @@ handle_elf (int fd, Elf *elf, const char
|
|
goto fail;
|
|
}
|
|
|
|
+ /* Copy identity part of the ELF header now */
|
|
+ newehdr = gelf_getehdr (newelf, &newehdr_mem);
|
|
+ if (newehdr == NULL)
|
|
+ INTERNAL_ERROR (fname);
|
|
+
|
|
+ memcpy (newehdr->e_ident, ehdr->e_ident, EI_NIDENT);
|
|
+ newehdr->e_type = ehdr->e_type;
|
|
+ newehdr->e_machine = ehdr->e_machine;
|
|
+ newehdr->e_version = ehdr->e_version;
|
|
+
|
|
+ if (gelf_update_ehdr (newelf, newehdr) == 0)
|
|
+ {
|
|
+ error (0, 0, gettext ("%s: error while creating ELF header: %s"),
|
|
+ fname, elf_errmsg (-1));
|
|
+ return 1;
|
|
+ }
|
|
+
|
|
/* Copy over the old program header if needed. */
|
|
if (ehdr->e_type != ET_REL)
|
|
for (cnt = 0; cnt < phnum; ++cnt)
|