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

ELF note parser: provide more info on failure

Browse source 
Print reasons when parser declined to parse notes, due to mis-alignment,
invalid length, or too many notes (the later typically means that there
is a loop).  Also increase the loop limit to 4096, which gives enough
iterations for notes to fill whole notes' page.

Sponsored by:	The FreeBSD Foundation
MFC after:	3 days
This commit is contained in:
Konstantin Belousov 2024-02-10 03:36:58 +02:00
parent a67edb5616
commit 29d4f8bfc6
1 changed files with 12 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
sys/kern/imgact_elf.c
View file

@ -2709,6 +2709,7 @@ __elfN(note_procstat_auxv)(void *arg, struct sbuf *sb, size_t *sizep)
}
}
#define MAX_NOTES_LOOP 4096
bool
__elfN(parse_notes)(struct image_params *imgp, Elf_Note *checknote,
const char *note_vendor, const Elf_Phdr *pnote,
@ -2748,9 +2749,15 @@ __elfN(parse_notes)(struct image_params *imgp, Elf_Note *checknote,
pnote->p_offset + pnote->p_filesz);
buf = NULL;
}
for (i = 0; i < 100 && note >= note0 && note < note_end; i++) {
if (!aligned(note, Elf32_Addr) || (const char *)note_end -
(const char *)note < sizeof(Elf_Note)) {
for (i = 0; i < MAX_NOTES_LOOP && note >= note0 && note < note_end;
i++) {
if (!aligned(note, Elf32_Addr)) {
uprintf("Unaligned ELF note\n");
goto retf;
}
if ((const char *)note_end - (const char *)note <
sizeof(Elf_Note)) {
uprintf("ELF note to short\n");
goto retf;
}
if (note->n_namesz != checknote->n_namesz ||
@ -2770,6 +2777,8 @@ nextnote:
roundup2(note->n_namesz, ELF_NOTE_ROUNDSIZE) +
roundup2(note->n_descsz, ELF_NOTE_ROUNDSIZE));
}
if (i >= MAX_NOTES_LOOP)
uprintf("ELF note parser reached %d notes\n", i);
retf:
res = false;
ret: