kldxref: Workaround incorrect PT_DYNAMIC in existing powerpc kernels
Existing powerpc kernels include additional sections beyond .dynamic in the PT_DYNAMIC segment. Relax the requirement for an exact size match of the section and segment for PowerPC files as a workaround. Reported by: jrtc27 Sponsored by: DARPA Differential Revision: https://reviews.freebsd.org/D43123
This commit is contained in:
parent
731704f5ea
commit
6631e2f9b4
|
@ -248,8 +248,17 @@ ef_parse_dynamic(elf_file_t ef, const GElf_Phdr *phdyn)
|
|||
dynamic_idx = -1;
|
||||
for (i = 0; i < nshdr; i++) {
|
||||
if (shdr[i].sh_type == SHT_DYNAMIC) {
|
||||
/*
|
||||
* PowerPC kernels contain additional sections
|
||||
* beyond .dynamic in PT_DYNAMIC due to a linker
|
||||
* script bug. Permit a section with a smaller
|
||||
* size as a workaround.
|
||||
*/
|
||||
if (shdr[i].sh_offset != phdyn->p_offset ||
|
||||
shdr[i].sh_size != phdyn->p_filesz) {
|
||||
((elf_machine(ef->ef_efile) == EM_PPC ||
|
||||
elf_machine(ef->ef_efile) == EM_PPC64) ?
|
||||
shdr[i].sh_size > phdyn->p_filesz :
|
||||
shdr[i].sh_size != phdyn->p_filesz)) {
|
||||
warnx(".dynamic section doesn't match phdr");
|
||||
error = EFTYPE;
|
||||
goto out;
|
||||
|
|
|
@ -100,6 +100,7 @@ struct elf_file {
|
|||
int ef_fd;
|
||||
};
|
||||
|
||||
#define elf_machine(ef) ((ef)->ef_hdr.e_machine)
|
||||
#define elf_class(ef) ((ef)->ef_hdr.e_ident[EI_CLASS])
|
||||
#define elf_encoding(ef) ((ef)->ef_hdr.e_ident[EI_DATA])
|
||||
|
||||
|
|
Loading…
Reference in New Issue