X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=Kernel%2Fsyscalls.c;h=523b3f2ae3a502f1e9d43382acedfcb67093cab8;hb=ca05044548d5c1de87c030d625a305731a6cc665;hp=ba9051a92cb24ff96231fec60a8cdf8ffedf1cb2;hpb=7514bb8053931759b99f77d3f9ad70446b0625ac;p=tpg%2Facess2.git diff --git a/Kernel/syscalls.c b/Kernel/syscalls.c index ba9051a9..523b3f2a 100644 --- a/Kernel/syscalls.c +++ b/Kernel/syscalls.c @@ -28,8 +28,10 @@ extern Uint Binary_Load(char *file, Uint *entryPoint); extern int Threads_SetName(char *NewName); extern int Threads_GetPID(); extern int Threads_GetTID(); -extern int Threads_GetUID(); -extern int Threads_GetGID(); +extern tUID Threads_GetUID(); +extern int Threads_SetUID(Uint *errno, tUID ID); +extern tGID Threads_GetGID(); +extern int Threads_SetGID(Uint *errno, tGID ID); // === PROTOTYPES === int Syscall_ValidString(Uint Addr); @@ -40,7 +42,7 @@ extern int Threads_GetGID(); void SyscallHandler(tSyscallRegs *Regs) { Uint64 ret = 0; - Uint err = 0; + Uint err = -EOK; ENTER("iThread iNum", Threads_GetTID(), Regs->Num); if(Regs->Num < NUM_SYSCALLS) @@ -104,8 +106,8 @@ void SyscallHandler(tSyscallRegs *Regs) 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; + case SYS_SETUID: ret = Threads_SetUID(&err, Regs->Arg1); break; + case SYS_SETGID: ret = Threads_SetGID(&err, Regs->Arg1); break; // -- Send Message case SYS_SENDMSG: @@ -116,9 +118,10 @@ void SyscallHandler(tSyscallRegs *Regs) // -- Check for messages case SYS_GETMSG: CHECK_NUM_NULLOK(Regs->Arg1, sizeof(Uint)); - //NOTE: Uncertain due to length being unknown - // (Proc_GetMessage should check itself) - CHECK_NUM_NULLOK(Regs->Arg2, sizeof(Uint)*4); + if( Regs->Arg2 && Regs->Arg2 != -1 && !MM_IsUser(Regs->Arg2) ) + { + err = -EINVAL; ret = -1; break; + } // *Source, *Data ret = Proc_GetMessage(&err, (Uint*)Regs->Arg1, (void*)Regs->Arg2); break;