git: 14d828a2ff6e - main - link_elf_obj: guard reltab/relatab frees in link_elf_unload_file()
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Sun, 08 Nov 2026 16:18:30 UTC
The branch main has been updated by markj:
URL: https://cgit.FreeBSD.org/src/commit/?id=14d828a2ff6e130b76754fd6e9947e332469fd09
commit 14d828a2ff6e130b76754fd6e9947e332469fd09
Author: Osvaldo Janeri Filho <ojanerif@amd.com>
AuthorDate: 2026-11-08 15:45:19 +0000
Commit: Mark Johnston <markj@FreeBSD.org>
CommitDate: 2026-11-08 16:18:13 +0000
link_elf_obj: guard reltab/relatab frees in link_elf_unload_file()
link_elf_unload_file() frees the per-section relocation tables by iterating
ef->nreltab / ef->nrelatab, but dereferences ef->reltab / ef->relatab
unconditionally. The counts are set while scanning the section headers, before
the tables are allocated, so an error on the load path reaches it with a
non-zero count and a NULL table, faulting on ef->relatab[0].rela. Reachable
from link_elf_load_file() once a valid relocation section has been counted,
e.g. a later section with sh_info >= e_shnum (D60937).
Guard the loops with the table pointer, as is already done for ef->progtab
above.
MFC after: 1 week
Reviewed by: markj, kib
Differential Revision: https://reviews.freebsd.org/D61140
---
sys/kern/link_elf_obj.c | 16 ++++++++++------
1 file changed, 10 insertions(+), 6 deletions(-)
diff --git a/sys/kern/link_elf_obj.c b/sys/kern/link_elf_obj.c
index 5be78aa147bd..e80b2798c37f 100644
--- a/sys/kern/link_elf_obj.c
+++ b/sys/kern/link_elf_obj.c
@@ -1349,12 +1349,16 @@ link_elf_unload_file(linker_file_t file)
return;
}
- for (i = 0; i < ef->nreltab; i++)
- free(ef->reltab[i].rel, M_LINKER);
- for (i = 0; i < ef->nrelatab; i++)
- free(ef->relatab[i].rela, M_LINKER);
- free(ef->reltab, M_LINKER);
- free(ef->relatab, M_LINKER);
+ if (ef->reltab != NULL) {
+ for (i = 0; i < ef->nreltab; i++)
+ free(ef->reltab[i].rel, M_LINKER);
+ free(ef->reltab, M_LINKER);
+ }
+ if (ef->relatab != NULL) {
+ for (i = 0; i < ef->nrelatab; i++)
+ free(ef->relatab[i].rela, M_LINKER);
+ free(ef->relatab, M_LINKER);
+ }
free(ef->progtab, M_LINKER);
if (ef->object != NULL)