diff options
| author | Kyle Evans <kevans@FreeBSD.org> | 2022-10-14 06:06:13 +0300 |
|---|---|---|
| committer | Mark Johnston <markj@FreeBSD.org> | 2022-11-01 21:03:25 +0300 |
| commit | 1ee7e4ba70e10e0ac0c9c144ad0301ffeca8824d (patch) | |
| tree | f915a6e6bf74b1b36a91aec85b1104b0e2178c5b | |
| parent | 0bcdf24a7cf33272d1ea08d3ad7e4b95f0308e33 (diff) | |
loader: fix elf lookup_symbol type filtering
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.
Approved by: so
Security: FreeBSD-EN-22:27.loader
Reported by: Christian McDonald <cmcdonald netgate com>
Reviewed by: imp, kib, tsoome
(cherry picked from commit 0701dbda94f21de8ddab3113f79262a26cc7b96c)
(cherry picked from commit 2b31059ea701957584e68a75857206d80a230211)
| -rw-r--r-- | stand/common/load_elf.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/stand/common/load_elf.c b/stand/common/load_elf.c index c75567b4a560..9e47d3db3828 100644 --- a/stand/common/load_elf.c +++ b/stand/common/load_elf.c @@ -1259,9 +1259,8 @@ __elfN(lookup_symbol)(elf_file_t ef, const char* name, Elf_Sym *symp, strp = strdupout((vm_offset_t)(ef->strtab + sym.st_name)); if (strcmp(name, strp) == 0) { free(strp); - if (sym.st_shndx != SHN_UNDEF || - (sym.st_value != 0 && - ELF_ST_TYPE(sym.st_info) == type)) { + if (sym.st_shndx != SHN_UNDEF && sym.st_value != 0 && + ELF_ST_TYPE(sym.st_info) == type) { *symp = sym; return 0; } |