d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Ignore relocation tables for non-memory-resident sections.

Browse Source 
As a followup to r328101, ignore relocation tables for ELF object
sections that are not memory resident.  For modules loaded by the
loader, ignore relocation tables whose associated section was not
loaded by the loader (sh_addr is zero).  For modules loaded at runtime
via kldload(2), ignore relocation tables whose associated section is
not marked with SHF_ALLOC.

Reported by:	Mori Hiroki <yamori813@yahoo.co.jp>, adrian
Tested on:	mips, mips64
MFC after:	1 month
Sponsored by:	DARPA / AFRL
This commit is contained in:
John Baldwin 2018-02-05 23:35:33 +00:00
parent d56b465cd5
commit 15746ef43a
2 changed files with 26 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
stand/common/load_elf_obj.c
View File

@ -282,6 +282,8 @@ __elfN(obj_loadimage)(struct preloaded_file *fp, elf_file_t ef, u_int64_t off)
switch (shdr[i].sh_type) {
case SHT_REL:
case SHT_RELA:
if ((shdr[shdr[i].sh_info].sh_flags & SHF_ALLOC) == 0)
break;
lastaddr = roundup(lastaddr, shdr[i].sh_addralign);
shdr[i].sh_addr = (Elf_Addr)lastaddr;
lastaddr += shdr[i].sh_size;

24
sys/kern/link_elf_obj.c
View File

@ -272,9 +272,17 @@ link_elf_link_preload(linker_class_t cls, const char *filename,
symstrindex = shdr[i].sh_link;
break;
case SHT_REL:
/*
* Ignore relocation tables for sections not
* loaded by the loader.
*/
if (shdr[shdr[i].sh_info].sh_addr == 0)
break;
ef->nreltab++;
break;
case SHT_RELA:
if (shdr[shdr[i].sh_info].sh_addr == 0)
break;
ef->nrelatab++;
break;
}
@ -398,12 +406,16 @@ link_elf_link_preload(linker_class_t cls, const char *filename,
pb++;
break;
case SHT_REL:
if (shdr[shdr[i].sh_info].sh_addr == 0)
break;
ef->reltab[rl].rel = (Elf_Rel *)shdr[i].sh_addr;
ef->reltab[rl].nrel = shdr[i].sh_size / sizeof(Elf_Rel);
ef->reltab[rl].sec = shdr[i].sh_info;
rl++;
break;
case SHT_RELA:
if (shdr[shdr[i].sh_info].sh_addr == 0)
break;
ef->relatab[ra].rela = (Elf_Rela *)shdr[i].sh_addr;
ef->relatab[ra].nrela =
shdr[i].sh_size / sizeof(Elf_Rela);
@ -620,9 +632,17 @@ link_elf_load_file(linker_class_t cls, const char *filename,
symstrindex = shdr[i].sh_link;
break;
case SHT_REL:
/*
* Ignore relocation tables for unallocated
* sections.
*/
if ((shdr[shdr[i].sh_info].sh_flags & SHF_ALLOC) == 0)
break;
ef->nreltab++;
break;
case SHT_RELA:
if ((shdr[shdr[i].sh_info].sh_flags & SHF_ALLOC) == 0)
break;
ef->nrelatab++;
break;
case SHT_STRTAB:
@ -880,6 +900,8 @@ link_elf_load_file(linker_class_t cls, const char *filename,
pb++;
break;
case SHT_REL:
if ((shdr[shdr[i].sh_info].sh_flags & SHF_ALLOC) == 0)
break;
ef->reltab[rl].rel = malloc(shdr[i].sh_size, M_LINKER,
M_WAITOK);
ef->reltab[rl].nrel = shdr[i].sh_size / sizeof(Elf_Rel);
@ -898,6 +920,8 @@ link_elf_load_file(linker_class_t cls, const char *filename,
rl++;
break;
case SHT_RELA:
if ((shdr[shdr[i].sh_info].sh_flags & SHF_ALLOC) == 0)
break;
ef->relatab[ra].rela = malloc(shdr[i].sh_size, M_LINKER,
M_WAITOK);
ef->relatab[ra].nrela =