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

Fix loader detection of vbefb support on !amd64

Browse Source 
On i386, after 6c7a932d0b, the vbefb vt
driver was no longer detected by the loader, if any kernel module was
loaded after the kernel itself.

This was caused by the parse_vt_drv_set() function being called multiple
times, resetting the detection flag. (It was called multiple times,
becuase i386 .ko files are shared objects like the kernel proper, while
this is not the case on amd64.)

Fix this by skipping the set_vt_drv_set lookup if vbefb was already
detected.

Reviewed by:	tsoome
This commit is contained in:
Dimitry Andric 2021-01-27 22:28:43 +01:00
parent 2fccd4f9b6
commit 6e26189be4
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
stand/common/load_elf.c
View File

@ -875,8 +875,8 @@ __elfN(loadimage)(struct preloaded_file *fp, elf_file_t ef, uint64_t off)
ef->buckets = ef->hashtab + 2; ef->buckets = ef->hashtab + 2;
ef->chains = ef->buckets + ef->nbuckets; ef->chains = ef->buckets + ef->nbuckets;
gfx_state.tg_kernel_supported = false; if (!gfx_state.tg_kernel_supported &&
if (__elfN(lookup_symbol)(ef, "__start_set_vt_drv_set", &sym, __elfN(lookup_symbol)(ef, "__start_set_vt_drv_set", &sym,
STT_NOTYPE) == 0) { STT_NOTYPE) == 0) {
p_start = sym.st_value + ef->off; p_start = sym.st_value + ef->off;
if (__elfN(lookup_symbol)(ef, "__stop_set_vt_drv_set", &sym, if (__elfN(lookup_symbol)(ef, "__stop_set_vt_drv_set", &sym,