mirror of
https://github.com/LadybirdBrowser/ladybird.git
synced 2024-11-27 01:50:24 +00:00
Kernel: Add a random offset to kernel stacks upon syscall entry
When entering the kernel from a syscall, we now insert a small bit of stack padding after the RegisterDump. This makes kernel stacks less deterministic across syscalls and may make some bugs harder to exploit. Inspired by Elena Reshetova's talk on kernel stack exploitation.
This commit is contained in:
parent
f23dc4ea69
commit
1d94b5eb04
Notes:
sideshowbarker
2024-07-19 10:27:32 +09:00
Author: https://github.com/awesomekling Commit: https://github.com/SerenityOS/serenity/commit/1d94b5eb040
2 changed files with 14 additions and 0 deletions
|
@ -447,6 +447,14 @@ inline void read_tsc(u32& lsw, u32& msw)
|
|||
: "=d"(msw), "=a"(lsw));
|
||||
}
|
||||
|
||||
inline u64 read_tsc()
|
||||
{
|
||||
u32 lsw;
|
||||
u32 msw;
|
||||
read_tsc(lsw, msw);
|
||||
return ((u64)msw << 32) | lsw;
|
||||
}
|
||||
|
||||
struct Stopwatch {
|
||||
union SplitQword {
|
||||
struct {
|
||||
|
|
|
@ -92,6 +92,12 @@ int handle(RegisterDump& regs, u32 function, u32 arg1, u32 arg2, u32 arg3)
|
|||
|
||||
void syscall_handler(RegisterDump regs)
|
||||
{
|
||||
// Apply a random offset in the range 0-255 to the stack pointer,
|
||||
// to make kernel stacks a bit less deterministic.
|
||||
auto* ptr = (char*)__builtin_alloca(read_tsc() & 0xff);
|
||||
asm volatile(""
|
||||
: "=m"(*ptr));
|
||||
|
||||
auto& process = current->process();
|
||||
|
||||
if (!MM.validate_user_stack(process, VirtualAddress(regs.esp_if_crossRing))) {
|
||||
|
|
Loading…
Reference in a new issue