|
 |
1db854 |
From 8c30fba366c6814c7bb1795fdda16265eb48efb0 Mon Sep 17 00:00:00 2001
|
|
|
1db854 |
From: Alan Modra <amodra@gmail.com>
|
|
|
1db854 |
Date: Sun, 8 Nov 2015 09:29:00 -0800
|
|
|
1db854 |
Subject: [PATCH 06/11] ELF unexec: _OBJC_ symbols in bss sections
|
|
|
1db854 |
|
|
|
1db854 |
This code assumed that there was only one bss section. Rather than
|
|
|
1db854 |
checking for a particular index, check the section type. Also, handle
|
|
|
1db854 |
the possibility that the section was SHT_NOBITS originally and is
|
|
|
1db854 |
unchanged, in which case no clearing is needed (and sh_offset isn't
|
|
|
1db854 |
necessarily valid, which can lead to a wild memset).
|
|
|
1db854 |
|
|
|
1db854 |
* unexelf.c (unexec): Properly handle _OBJC_ symbols in bss sections.
|
|
|
1db854 |
---
|
|
|
1db854 |
src/unexelf.c | 31 ++++++++++++++++++-------------
|
|
|
1db854 |
1 file changed, 18 insertions(+), 13 deletions(-)
|
|
|
1db854 |
|
|
|
1db854 |
diff --git a/src/unexelf.c b/src/unexelf.c
|
|
|
1db854 |
index 286ba2e..df99f92 100644
|
|
|
1db854 |
--- a/src/unexelf.c
|
|
|
1db854 |
+++ b/src/unexelf.c
|
|
|
1db854 |
@@ -1176,20 +1176,25 @@ temacs:
|
|
|
1db854 |
"_OBJC_", sizeof ("_OBJC_") - 1) == 0)
|
|
|
1db854 |
{
|
|
|
1db854 |
ElfW (Shdr) *new_shdr = &NEW_SECTION_H (symp->st_shndx);
|
|
|
1db854 |
- ptrdiff_t reladdr = symp->st_value - new_shdr->sh_addr;
|
|
|
1db854 |
- ptrdiff_t newoff = reladdr + new_shdr->sh_offset;
|
|
|
1db854 |
-
|
|
|
1db854 |
- /* "Unpatch" index. */
|
|
|
1db854 |
- nn = symp->st_shndx;
|
|
|
1db854 |
- if (nn > old_bss_index)
|
|
|
1db854 |
- nn--;
|
|
|
1db854 |
- if (nn == old_bss_index)
|
|
|
1db854 |
- memset (new_base + newoff, 0, symp->st_size);
|
|
|
1db854 |
- else
|
|
|
1db854 |
+ if (new_shdr->sh_type != SHT_NOBITS)
|
|
|
1db854 |
{
|
|
|
1db854 |
- ElfW (Shdr) *old_shdr = &OLD_SECTION_H (nn);
|
|
|
1db854 |
- ptrdiff_t oldoff = reladdr + old_shdr->sh_offset;
|
|
|
1db854 |
- memcpy (new_base + newoff, old_base + oldoff, symp->st_size);
|
|
|
1db854 |
+ ElfW (Shdr) *old_shdr;
|
|
|
1db854 |
+ ptrdiff_t reladdr = symp->st_value - new_shdr->sh_addr;
|
|
|
1db854 |
+ ptrdiff_t newoff = reladdr + new_shdr->sh_offset;
|
|
|
1db854 |
+
|
|
|
1db854 |
+ /* "Unpatch" index. */
|
|
|
1db854 |
+ nn = symp->st_shndx;
|
|
|
1db854 |
+ if (nn > old_bss_index)
|
|
|
1db854 |
+ nn--;
|
|
|
1db854 |
+ old_shdr = &OLD_SECTION_H (nn);
|
|
|
1db854 |
+ if (old_shdr->sh_type == SHT_NOBITS)
|
|
|
1db854 |
+ memset (new_base + newoff, 0, symp->st_size);
|
|
|
1db854 |
+ else
|
|
|
1db854 |
+ {
|
|
|
1db854 |
+ ptrdiff_t oldoff = reladdr + old_shdr->sh_offset;
|
|
|
1db854 |
+ memcpy (new_base + newoff, old_base + oldoff,
|
|
|
1db854 |
+ symp->st_size);
|
|
|
1db854 |
+ }
|
|
|
1db854 |
}
|
|
|
1db854 |
}
|
|
|
1db854 |
#endif
|
|
|
1db854 |
--
|
|
|
1db854 |
2.7.4
|
|
|
1db854 |
|