Fixed bug where system would lock if a user task segfaulted (forgot to sti)

[tpg/acess2.git] / Kernel / syscalls.c

diff --git a/Kernel/syscalls.c b/Kernel/syscalls.c
index e6d8ed3..5774dbe 100644 (file)
--- a/Kernel/syscalls.c
+++ b/Kernel/syscalls.c
@@ -45,7 +45,7 @@ void SyscallHandler(tSyscallRegs *Regs)
        switch(Regs->Num)
        {
        // -- Exit the current thread
-       case SYS_EXIT:  Threads_Exit(); break;
+       case SYS_EXIT:  Threads_Exit(0, Regs->Arg1);    break;
        
        // -- Put the current thread to sleep
        case SYS_SLEEP: Threads_Sleep();        break;
@@ -57,7 +57,7 @@ void SyscallHandler(tSyscallRegs *Regs)
        case SYS_CLONE:
                // Call clone system call
                ret = Proc_Clone(&err, Regs->Arg1);
-               // Change user stack if requested
+               // Change user stack if a new stack address is passed
                if(ret == 0 && Regs->Arg2)
                        Regs->StackPointer = Regs->Arg2;
                break;
@@ -95,6 +95,10 @@ void SyscallHandler(tSyscallRegs *Regs)
        case SYS_GETUID:        ret = Threads_GetUID(); break;
        case SYS_GETGID:        ret = Threads_GetGID(); break;
        
+       // -- Set User/Group IDs
+       case SYS_SETUID:        Log("Setting User ID to %i", Regs->Arg1);       break;
+       case SYS_SETGID:        Log("Setting Group ID to %i", Regs->Arg1);      break;
+       
        // -- Send Message
        case SYS_SENDMSG:
                ret = Proc_SendMessage(&err, Regs->Arg1, Regs->Arg2, (void*)Regs->Arg3);
@@ -115,9 +119,20 @@ void SyscallHandler(tSyscallRegs *Regs)
        // Binary Control
        // ---
        case SYS_EXECVE:
+               if( !Syscall_ValidString(Regs->Arg1) ) {
+                       err = -EINVAL;
+                       ret = -1;
+                       break;
+               }
                ret = Proc_Execve((char*)Regs->Arg1, (char**)Regs->Arg2, (char**)Regs->Arg3);
                break;
        case SYS_LOADBIN:
+               if( !Syscall_ValidString(Regs->Arg1)
+               ||  !Syscall_Valid(sizeof(Uint), Regs->Arg2) ) {
+                       err = -EINVAL;
+                       ret = -1;
+                       break;
+               }
                ret = Binary_Load((char*)Regs->Arg1, (Uint*)Regs->Arg2);
                break;
        
@@ -125,6 +140,11 @@ void SyscallHandler(tSyscallRegs *Regs)
        // Virtual Filesystem
        // ---
        case SYS_OPEN:
+               if( !Syscall_ValidString(Regs->Arg1) ) {
+                       err = -EINVAL;
+                       ret = -1;
+                       break;
+               }
                ret = VFS_Open((char*)Regs->Arg1, Regs->Arg2 | VFS_OPENFLAG_USER);
                break;
        
@@ -134,17 +154,17 @@ void SyscallHandler(tSyscallRegs *Regs)
        
        case SYS_WRITE:
                #if BITS < 64
-               VFS_Write( Regs->Arg1, Regs->Arg2|((Uint64)Regs->Arg3<<32), (void*)Regs->Arg4 );
+               ret = VFS_Write( Regs->Arg1, Regs->Arg2|((Uint64)Regs->Arg3<<32), (void*)Regs->Arg4 );
                #else
-               VFS_Write( Regs->Arg1, Regs->Arg2, (void*)Regs->Arg3 );
+               ret = VFS_Write( Regs->Arg1, Regs->Arg2, (void*)Regs->Arg3 );
                #endif
                break;
        
        case SYS_READ:
                #if BITS < 64
-               VFS_Read( Regs->Arg1, Regs->Arg2|((Uint64)Regs->Arg3<<32), (void*)Regs->Arg4 );
+               ret = VFS_Read( Regs->Arg1, Regs->Arg2|((Uint64)Regs->Arg3<<32), (void*)Regs->Arg4 );
                #else
-               VFS_Read( Regs->Arg1, Regs->Arg2, (void*)Regs->Arg3 );
+               ret = VFS_Read( Regs->Arg1, Regs->Arg2, (void*)Regs->Arg3 );
                #endif
                break;