mirrors/Astral
1
0
Fork 0
mirror of https://github.com/Mathewnd/Astral.git synced 2026-11-01 15:08:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

x86-64: switch order of user code and data segments for syscall instruction

Browse Source
This commit is contained in:
Matheus
2023-05-07 17:46:26 -03:00
parent 42b28716a4
commit 9c1e92831d
4 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
kernel-src/arch/x86-64/context.asm
+1 -1
View File
@@ -27,7 +27,7 @@ arch_context_switch:
add rsp,8 ; remove error code add rsp,8 ; remove error code
; check if swapgs is needed ; check if swapgs is needed
cmp qword [rsp+8], 0x18 cmp qword [rsp+8], 0x23
jne .notneeded2 jne .notneeded2
swapgs swapgs
.notneeded2: .notneeded2:
kernel-src/arch/x86-64/gdt.c
+2 -2
View File
@@ -9,8 +9,8 @@ static uint64_t template[7] = {
0, // NULL 0x0 0, // NULL 0x0
0x00af9b000000ffff, // code64 0x8 0x00af9b000000ffff, // code64 0x8
0x00af93000000ffff, // data64 0x10 0x00af93000000ffff, // data64 0x10
0x00affb000000ffff, // ucode64 0x18 0x00aff3000000ffff, // udata64 0x18
0x00aff3000000ffff, // udata64 0x20 0x00affb000000ffff, // ucode64 0x20
0x0020890000000000, // low ist 0x28 0x0020890000000000, // low ist 0x28
0x0000000000000000 // high ist 0x0000000000000000 // high ist
}; };
kernel-src/arch/x86-64/isr.asm
+2 -2
View File
@@ -9,7 +9,7 @@ isr_%+ i:
; check if swapgs is needed ; check if swapgs is needed
cmp qword [rsp+16], 0x18 cmp qword [rsp+16], 0x23
jne .notneeded1 jne .notneeded1
swapgs swapgs
.notneeded1: .notneeded1:
@@ -73,7 +73,7 @@ isr_%+ i:
add rsp,8 ; remove error code add rsp,8 ; remove error code
; check if swapgs is needed ; check if swapgs is needed
cmp qword [rsp+8], 0x18 cmp qword [rsp+8], 0x23
jne .notneeded2 jne .notneeded2
swapgs swapgs
.notneeded2: .notneeded2:
kernel-src/include/x86-64/arch/context.h
+2 -2
View File
@@ -44,8 +44,8 @@ typedef struct {
#define CTX_INIT(x,u) \ #define CTX_INIT(x,u) \
if (u) { \ if (u) { \
(x)->cs = 0x1b; \ (x)->cs = 0x23; \
(x)->ds = (x)->es = (x)->ss = 0x23; \ (x)->ds = (x)->es = (x)->ss = 0x1b; \
} else { \ } else { \
(x)->cs = 0x8; \ (x)->cs = 0x8; \
(x)->ds = (x)->es = (x)->ss = 0x10; \ (x)->ds = (x)->es = (x)->ss = 0x10; \