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

loader: fix multiboot loading on UEFI

Browse Source 
The Xen kernel has no symbol tables, so calling lookup_symbol against
it triggers the following Divide by Zero fault:

Loading Xen kernel...
/boot/xen data=0x2809c8+0x149638 |
!!!! X64 Exception Type - 00(#DE - Divide Error)  CPU Apic ID - 00000000 !!!!

Fix lookup_symbol to prevent the #DE fault from happening if the
symbol table is not loaded and also fix loadfile_raw to mark multiboot
kernels as relocatable, since the only multiboot kernel supported is
Xen and was already unconditionally booted as relocatable.

Fixes: f75caed644 ('amd64 UEFI loader: stop copying staging area to 2M physical')
Reviewed by: imp, kib
Differential Revision: https://reviews.freebsd.org/D31507
This commit is contained in:
Roger Pau Monné 2021-08-11 16:55:10 +02:00
parent f4c6843ec2
commit 5e4279a8f3
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
stand/common/load_elf.c
View File

@ -447,7 +447,7 @@ __elfN(loadfile_raw)(char *filename, uint64_t dest,
*result = (struct preloaded_file *)fp;
err = 0;
#ifdef __amd64__
fp->f_kernphys_relocatable = is_kernphys_relocatable(&ef);
fp->f_kernphys_relocatable = multiboot || is_kernphys_relocatable(&ef);
#endif
goto out;
@ -1253,6 +1253,11 @@ __elfN(lookup_symbol)(elf_file_t ef, const char* name, Elf_Sym *symp,
char *strp;
unsigned long hash;
if (ef->nbuckets == 0) {
printf(__elfN(bad_symtable));
return ENOENT;
}
hash = elf_hash(name);
COPYOUT(&ef->buckets[hash % ef->nbuckets], &symnum, sizeof(symnum));