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

loader: fix elf lookup_symbol type filtering

Browse Source 
The existing logic doesn't seem to make much sense, as we won't filter
on the type if st_shndx != SHN_UNDEF.  In practice, this breaks booting
12.3 kernels on newer loaders, as they do have a `kernphys` symbol of
the wrong type (NOTYPE, rather than OBJECT) -- we end up deriving the
wrong value for copy_staging.

It's unclear if this version makes any more sense, but it seems to match
what rtld's matched_symbol() does.  Loader doesn't need to care about
STT_FUNC w/ UND shndx, because we won't encounter those; in kmods,
undefined (kernel) functions are NOTYPE.

Reported by:	Christian McDonald <cmcdonald netgate com>
Reviewed by:	imp, kib, tsoome

(cherry picked from commit 0701dbda94)
This commit is contained in:
Kyle Evans 2022-10-13 22:06:13 -05:00
parent 63d9ad6e46
commit 2b31059ea7
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
stand/common/load_elf.c
View File

@ -1258,9 +1258,8 @@ __elfN(lookup_symbol)(elf_file_t ef, const char* name, Elf_Sym *symp,
strp = strdupout((vm_offset_t)(ef->strtab + sym.st_name)); strp = strdupout((vm_offset_t)(ef->strtab + sym.st_name));
if (strcmp(name, strp) == 0) { if (strcmp(name, strp) == 0) {
free(strp); free(strp);
if (sym.st_shndx != SHN_UNDEF || if (sym.st_shndx != SHN_UNDEF && sym.st_value != 0 &&
(sym.st_value != 0 && ELF_ST_TYPE(sym.st_info) == type) {
ELF_ST_TYPE(sym.st_info) == type)) {
*symp = sym; *symp = sym;
return 0; return 0;
} }