upstream/opnsense-src
1
0
Fork 0
mirror of https://github.com/opnsense/src.git synced 2026-06-11 09:41:03 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

kldxref: Workaround incorrect PT_DYNAMIC in existing powerpc kernels

Browse source 
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

(cherry picked from commit 6631e2f9b4)
This commit is contained in:
John Baldwin 2024-01-09 10:57:48 -08:00
parent b1a3aa4eec
commit cec0bae09e
2 changed files with 11 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
usr.sbin/kldxref/ef.c
View file

@ -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;

1
usr.sbin/kldxref/ef.h
View file

@ -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])