Bananymous/banan-os
1
1
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Kernel: Stack pointer is validated when updated

Browse Source 
This allows us not to fail stack pointer when in syscall since
interrupts use their own stack
This commit is contained in:
Bananymous
2023-04-21 10:40:24 +03:00
parent b1c7af38d0
commit 9c506ef85b
9 changed files with 37 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
kernel/include/kernel/Syscall.h
View File

@@ -10,9 +10,9 @@ namespace Kernel
{
template<typename T1 = void*, typename T2 = void*, typename T3 = void*>
inline int syscall(int syscall, T1 arg1 = nullptr, T2 arg2 = nullptr, T3 arg3 = nullptr)
inline long syscall(int syscall, T1 arg1 = nullptr, T2 arg2 = nullptr, T3 arg3 = nullptr)
{
int ret;
long ret;
asm volatile("int $0x80" : "=a"(ret) : "a"(syscall), "b"((uintptr_t)arg1), "c"((uintptr_t)arg2), "d"((uintptr_t)arg3) : "memory");
return ret;
}

7
kernel/include/kernel/Thread.h
View File

@@ -33,7 +33,7 @@ namespace Kernel
pid_t tid() const { return m_tid; }
void set_rsp(uintptr_t rsp) { m_rsp = rsp; }
void set_rsp(uintptr_t rsp) { m_rsp = rsp; validate_stack(); }
void set_rip(uintptr_t rip) { m_rip = rip; }
uintptr_t rsp() const { return m_rsp; }
uintptr_t rip() const { return m_rip; }
@@ -49,9 +49,13 @@ namespace Kernel
Process& process();
bool has_process() const { return m_process; }
void set_in_syscall(bool b) { m_in_syscall = b; }
private:
Thread(pid_t tid, Process*);
void validate_stack() const { if (!m_in_syscall) ASSERT(stack_base() <= m_rsp && m_rsp <= stack_base() + stack_size()); }
BAN::ErrorOr<void> initialize(entry_t, void*);
void on_exit();
@@ -63,6 +67,7 @@ namespace Kernel
const pid_t m_tid { 0 };
State m_state { State::NotStarted };
Process* m_process { nullptr };
bool m_in_syscall { false };
friend class Scheduler;
};