os-k-team/os-k
os-k-team/os-k
1
0
Fork 0
mirror of https://gitlab.os-k.eu/os-k-team/os-k.git synced 2023-08-25 14:03:10 +02:00
Code Releases Activity

Stack Overflow detected !

Browse Source
This commit is contained in:
Adrien Bourmault 2019-05-22 08:11:50 +02:00
parent b6e39d4712
commit a3716901ce
3 changed files with 45 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
include/mm/mm.h
View File

@ -158,6 +158,16 @@ extern void MmLoadGdt(GdtPtr_t *gdtPtr, ushort tssOffset);
//
extern void MmStoreGdt(void);
//
// Returns the address of the stack guard pages
//
void *MmGetStackGuards(char rank);
//
// Translate a virtual address into physical address
//
void *MmTranslateKPageToAddr(void *rank);
//----------------------------------------------------------------------------//
#endif

32
kaleid/kernel/ke/idt.c
View File

@ -26,13 +26,12 @@
#include <init/boot.h>
#include <ke/idt.h>
#include <io/vga.h>
#include <mm/mm.h>
IdtEntry_t idt[256] = { 0 };
IdtPtr_t _KeIdtPtr;
bool KeIdtIsInitialized = 0;
extern ulong *MmStackGuards[2];
static ISRList_t isrList = { 0 };
static char *ExceptionsChar[32] = {
@ -74,9 +73,6 @@ static void EnablePIC(void);
static void EarlyExceptionHandler(ISRFrame_t *regs);
static void DoubleFaultHandler(ISRFrame_t *regs);
//paging.c
ulong *MmGetStackGuards(void);
//
// Registers an isr with his IRQ to handle driver interrupts
//
@ -305,18 +301,30 @@ static void EarlyExceptionHandler(ISRFrame_t *regs)
static void DoubleFaultHandler(ISRFrame_t *regs)
{
bprintf(BStdOut, "test : %p\n", (ulong)(MmGetStackGuards())[0] + 4*KB);
ulong StackGuardOne = (ulong)MmGetStackGuards(0);
ulong StackGuardTwo = (ulong)MmGetStackGuards(1);
if (regs->rsp <= (ulong)(MmGetStackGuards())[0] + 4*KB) {
if (regs->rsp <= StackGuardTwo + 4*KB) {
bprintf(BStdOut,
"\n\n%CPANIC\n[ISR 0x8] Irrecoverable Kernel Stack Overflow%s\n\n"
" Error code : 0x%x (%b)",
"\n\n%CPANIC\n[ISR 0x8] Irrecoverable Kernel Stack Overflow\n\n"
" Double Fault Error code : %#x (%b)\n"
" Stack Guard bypassed : %#x",
VGA_COLOR_LIGHT_RED,
regs->intNo,
ExceptionsChar[regs->intNo],
regs->ErrorCode,
regs->ErrorCode
regs->ErrorCode,
StackGuardTwo
);
} else if (regs->rsp <= StackGuardOne) {
bprintf(BStdOut,
"\n\n%CPANIC\n[ISR 0x8] Irrecoverable Kernel Stack Underflow\n\n"
" Double Fault Error code : %#x (%b)\n"
" Stack Guard bypassed : %#x",
VGA_COLOR_LIGHT_RED,
regs->ErrorCode,
regs->ErrorCode,
StackGuardOne
);
} else {
bprintf(BStdOut,

22
kaleid/kernel/mm/paging.c
View File

@ -20,6 +20,7 @@ typedef ulong pte_t;
void MmLoadPML4(void *);
void MmEnableWriteProtect(void);
void MmDisableWriteProtect(void);
void *MmGetStackGuards(char rank);
enum
{
@ -67,7 +68,7 @@ void MmInitPaging(void)
// STACK GUARD PAGE
if ((ulong)(i*KPAGESIZE) == (ulong)BtLoaderInfo.stackEndAddr) {
MmPT[i] = ((ulong)(i*KPAGESIZE));
MmStackGuards[0] = i;
MmStackGuards[0] = ((ulong)(i*KPAGESIZE));
continue;
}
@ -79,7 +80,7 @@ void MmInitPaging(void)
// STACK GARD PAGE
if ((ulong)(i*KPAGESIZE) == (ulong)BtLoaderInfo.kernelEndAddr) {
MmPT[i] = ((ulong)(i*KPAGESIZE));
MmStackGuards[1] = i;
MmStackGuards[1] = ((ulong)(i*KPAGESIZE));
continue;
}
@ -160,6 +161,18 @@ void MmReloadPaging(void)
DebugLog("Stack Guards at %p, %p\n", MmStackGuards[0], MmStackGuards[1]);
}
// Returns the rank of the Stack Guards
void *MmGetStackGuards(char rank)
{
return (void *)MmStackGuards[(int)rank];
}
// Returns an address corresponding to the PT rank
void *MmTranslateKPageToAddr(void *rank)
{
return (void *)MmPT[(ulong)rank];
}
//
// Page fault handler
//
@ -186,8 +199,3 @@ void MmActivatePageHandler(void)
{
KeRegisterISR(PagingHandler, 0xe);
}
ulong *MmGetStackGuards(void)
{
return &MmStackGuards[0];
}