Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix KASAN, init_xen_early must be called after kasan_early_init.

This commit is contained in:
maxv 2020-05-05 06:32:43 +00:00
parent 2af01421ec
commit be6e844aa3
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
sys/arch/amd64/amd64/locore.S
View File

@ -1,4 +1,4 @@
/* $NetBSD: locore.S,v 1.207 2020/05/02 19:01:08 christos Exp $ */
/* $NetBSD: locore.S,v 1.208 2020/05/05 06:32:43 maxv Exp $ */
/*
* Copyright-o-rama!
@ -991,13 +991,14 @@ longmode_hi:
#endif /* XENPV */
pushq %rdi
#if defined(XEN) && !defined(XENPV)
call _C_LABEL(init_xen_early)
#endif
call _C_LABEL(init_bootspace)
#ifdef KASAN
movq _C_LABEL(lwp0uarea)(%rip),%rdi
call _C_LABEL(kasan_early_init)
#endif
/* <-- DO NOT INSERT C CALLS BEFORE THIS POINT --> */
#if defined(XEN) && !defined(XENPV)
call _C_LABEL(init_xen_early)
#endif
call _C_LABEL(init_slotspace)
popq %rdi