RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-05-22 16:15:08 +00:00
Code Issues Activity Actions

Kernel: Disable KASLR on i686

Browse source 
The 32-bit CI runners don't seem to happy with KASLR, so let's make it
x86-64 only for now.
This commit is contained in:
Andreas Kling 2022-03-22 02:47:27 +01:00
parent 9b9d32dfb2
commit b6e767f953
1 changed files with 3 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

3
Kernel/Prekernel/init.cpp
View file

@ -95,10 +95,13 @@ extern "C" [[noreturn]] void init()
#else #else
FlatPtr kernel_load_base = 0x2000200000; FlatPtr kernel_load_base = 0x2000200000;
#endif #endif
#if ARCH(X86_64)
// KASLR // KASLR
static constexpr auto maximum_offset = 256 * MiB; static constexpr auto maximum_offset = 256 * MiB;
kernel_load_base = kernel_load_base + (generate_secure_seed() % maximum_offset); kernel_load_base = kernel_load_base + (generate_secure_seed() % maximum_offset);
kernel_load_base = kernel_load_base & ~(PAGE_SIZE - 1); kernel_load_base = kernel_load_base & ~(PAGE_SIZE - 1);
#endif
FlatPtr kernel_load_end = 0; FlatPtr kernel_load_end = 0;
for (size_t i = 0; i < kernel_elf_header.e_phnum; i++) { for (size_t i = 0; i < kernel_elf_header.e_phnum; i++) {