X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=Kernel%2Fsyscalls.c;h=523b3f2ae3a502f1e9d43382acedfcb67093cab8;hb=156885e938b60fee9d061d989ae7711c9aeea493;hp=4275274e6bc1f86751919c8ebbb2480ee9b6807d;hpb=0b1620bcebe5b0c7da24a38f6bae99d3e21c180f;p=tpg%2Facess2.git diff --git a/Kernel/syscalls.c b/Kernel/syscalls.c index 4275274e..523b3f2a 100644 --- a/Kernel/syscalls.c +++ b/Kernel/syscalls.c @@ -4,11 +4,20 @@ */ #define DEBUG 0 -#include +#include #include #include #include +#define CHECK_NUM_NULLOK(v,size) \ + if((v)&&!Syscall_Valid((size),(Uint)(v))){ret=-1;err=-EINVAL;break;} +#define CHECK_STR_NULLOK(v) \ + if((v)&&!Syscall_ValidString((Uint)(v))){ret=-1;err=-EINVAL;break;} +#define CHECK_NUM_NONULL(v,size) \ + if(!(v)||!Syscall_Valid((size),(Uint)(v))){ret=-1;err=-EINVAL;break;} +#define CHECK_STR_NONULL(v) \ + if(!(v)||!Syscall_ValidString((Uint)(v))){ret=-1;err=-EINVAL;break;} + // === IMPORTS === extern int Proc_Clone(Uint *Err, Uint Flags); extern int Threads_WaitTID(int TID, int *status); @@ -16,14 +25,13 @@ extern Uint Proc_SendMessage(Uint *Err, Uint Dest, Uint Length, void *Data); extern int Proc_GetMessage(Uint *Err, Uint *Source, void *Buffer); extern int Proc_Execve(char *File, char **ArgV, char **EnvP); extern Uint Binary_Load(char *file, Uint *entryPoint); -extern int VFS_FInfo(int FD, void *Dest, int MaxACLs); -extern int VFS_GetACL(int FD, void *Dest); -extern int VFS_ChDir(char *Dest); 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); @@ -34,13 +42,12 @@ extern int Threads_GetGID(); void SyscallHandler(tSyscallRegs *Regs) { Uint64 ret = 0; - Uint err = 0; - #if DEBUG + Uint err = -EOK; + ENTER("iThread iNum", Threads_GetTID(), Regs->Num); if(Regs->Num < NUM_SYSCALLS) LOG("Syscall %s", cSYSCALL_NAMES[Regs->Num]); - LOG("Arg1: 0x%x, Arg2: 0x%x, Arg3: 0x%x", Regs->Arg1, Regs->Arg2, Regs->Arg3); - #endif + LOG("Arg1: 0x%x, Arg2: 0x%x, Arg3: 0x%x, Arg4: 0x%x", Regs->Arg1, Regs->Arg2, Regs->Arg3, Regs->Arg4); switch(Regs->Num) { @@ -70,6 +77,9 @@ void SyscallHandler(tSyscallRegs *Regs) // -- Wait for a thread case SYS_WAITTID: + // Sanity Check (Status can be NULL) + CHECK_NUM_NULLOK( Regs->Arg2, sizeof(int) ); + // TID, *Status ret = Threads_WaitTID(Regs->Arg1, (void*)Regs->Arg2); break; @@ -95,29 +105,73 @@ 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: ret = Threads_SetUID(&err, Regs->Arg1); break; + case SYS_SETGID: ret = Threads_SetGID(&err, Regs->Arg1); break; + // -- Send Message case SYS_SENDMSG: + CHECK_NUM_NONULL(Regs->Arg3, Regs->Arg2); + // Destination, Size, *Data ret = Proc_SendMessage(&err, Regs->Arg1, Regs->Arg2, (void*)Regs->Arg3); break; // -- Check for messages case SYS_GETMSG: + CHECK_NUM_NULLOK(Regs->Arg1, sizeof(Uint)); + 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; // -- Set the thread's name case SYS_SETNAME: - // Sanity Check - if(!Regs->Arg1) { ret = -1; err = -EINVAL; break; } - Threads_SetName( (void*)Regs->Arg1 ); + CHECK_STR_NONULL(Regs->Arg1); + Threads_SetName( (char*)Regs->Arg1 ); break; // --- // Binary Control // --- case SYS_EXECVE: + CHECK_STR_NONULL(Regs->Arg1); + //Log(" Regs = {Arg2: %x, Arg3: %x}", Regs->Arg2, Regs->Arg3); + { + int i; + char **tmp = (char**)Regs->Arg2; + // Check ArgV (traverse array checking all string pointers) + CHECK_NUM_NONULL( tmp, sizeof(char**) ); + //Log("tmp = %p", tmp); + for(i=0;tmp[i];i++) { + CHECK_NUM_NONULL( &tmp[i], sizeof(char*) ); + CHECK_STR_NONULL( tmp[i] ); + } + // Check EnvP also + // - EnvP can be NULL + if( Regs->Arg3 ) + { + tmp = (char**)Regs->Arg3; + //Log("tmp = %p", tmp); + for(i=0;tmp[i];i++) { + CHECK_NUM_NULLOK( &tmp[i], sizeof(char*) ); + CHECK_STR_NONULL( tmp[i] ); + } + } + } + LEAVE('s', "Assuming 0"); + // Path, **Argv, **Envp 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; + } + // Path, *Entrypoint ret = Binary_Load((char*)Regs->Arg1, (Uint*)Regs->Arg2); break; @@ -125,6 +179,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; @@ -132,29 +191,33 @@ void SyscallHandler(tSyscallRegs *Regs) VFS_Close( Regs->Arg1 ); break; + case SYS_SEEK: + ret = VFS_Seek( Regs->Arg1, Regs->Arg2, Regs->Arg3 ); + break; + + case SYS_TELL: + ret = VFS_Tell( Regs->Arg1 ); + break; + case SYS_WRITE: - #if BITS < 64 - ret = VFS_Write( Regs->Arg1, Regs->Arg2|((Uint64)Regs->Arg3<<32), (void*)Regs->Arg4 ); - #else + CHECK_NUM_NONULL( Regs->Arg3, Regs->Arg2 ); ret = VFS_Write( Regs->Arg1, Regs->Arg2, (void*)Regs->Arg3 ); - #endif break; case SYS_READ: - #if BITS < 64 - ret = VFS_Read( Regs->Arg1, Regs->Arg2|((Uint64)Regs->Arg3<<32), (void*)Regs->Arg4 ); - #else + CHECK_NUM_NONULL( Regs->Arg3, Regs->Arg2 ); ret = VFS_Read( Regs->Arg1, Regs->Arg2, (void*)Regs->Arg3 ); - #endif break; case SYS_FINFO: + CHECK_NUM_NONULL( Regs->Arg2, sizeof(tFInfo) + Regs->Arg3*sizeof(tVFS_ACL) ); + // FP, Dest, MaxACLs ret = VFS_FInfo( Regs->Arg1, (void*)Regs->Arg2, Regs->Arg3 ); break; // Get ACL Value case SYS_GETACL: - if( !Syscall_Valid(8, Regs->Arg1) ) { + if( !Syscall_Valid(sizeof(tVFS_ACL), Regs->Arg1) ) { err = -EINVAL; ret = -1; break; @@ -164,7 +227,7 @@ void SyscallHandler(tSyscallRegs *Regs) // Read Directory case SYS_READDIR: - if( !Syscall_ValidString(Regs->Arg2) ) { + if( !Syscall_Valid(8, Regs->Arg2) ) { err = -EINVAL; ret = -1; break; @@ -182,11 +245,44 @@ void SyscallHandler(tSyscallRegs *Regs) ret = VFS_ChDir( (void*)Regs->Arg1 ); break; + // IO Control + case SYS_IOCTL: + // All sanity checking should be done by the driver + ret = VFS_IOCtl( Regs->Arg1, Regs->Arg2, (void*)Regs->Arg3 ); + break; + + // Mount a filesystem + case SYS_MOUNT: + // Only root can mount filesystems + if(Threads_GetUID() != 0) { + err = -EACCES; + ret = -1; + break; + } + // Sanity check the paths + if(!Syscall_ValidString(Regs->Arg1) + || !Syscall_ValidString(Regs->Arg2) + || !Syscall_ValidString(Regs->Arg3) + || !Syscall_ValidString(Regs->Arg4) ) { + err = -EINVAL; + ret = -1; + break; + } + ret = VFS_Mount( + (char*)Regs->Arg1, // Device + (char*)Regs->Arg2, // Mount point + (char*)Regs->Arg3, // Filesystem + (char*)Regs->Arg4 // Options + ); + break; + // -- Debug + //#if DEBUG_BUILD case SYS_DEBUG: Log((char*)Regs->Arg1, Regs->Arg2, Regs->Arg3, Regs->Arg4, Regs->Arg5, Regs->Arg6); break; + //#endif // -- Default (Return Error) default: @@ -197,6 +293,11 @@ void SyscallHandler(tSyscallRegs *Regs) ret = -1; break; } + + if(err != 0) { + LOG("ID: %i, Return errno = %i", Regs->Num, err); + } + #if BITS < 64 Regs->Return = ret&0xFFFFFFFF; Regs->RetHi = ret >> 32; @@ -205,8 +306,11 @@ void SyscallHandler(tSyscallRegs *Regs) #endif Regs->Error = err; #if DEBUG - LOG("SyscallHandler: err = %i", err); - LEAVE('x', ret); + LOG("err = %i", err); + if(Regs->Num != SYS_EXECVE) + LEAVE('x', ret); + else + LOG("Actual %i", ret); #endif } @@ -216,18 +320,10 @@ void SyscallHandler(tSyscallRegs *Regs) */ int Syscall_ValidString(Uint Addr) { - // Check 1st page - if(!MM_GetPhysAddr(Addr)) return 0; + // Check if the memory is user memory + if(!MM_IsUser(Addr)) return 0; - // Traverse String - while(*(char*)Addr) - { - if(!MM_GetPhysAddr(Addr)) return 0; - // Increment string pointer - Addr ++; - } - - return 1; + return CheckString( (char*)Addr ); } /** @@ -236,10 +332,7 @@ int Syscall_ValidString(Uint Addr) */ int Syscall_Valid(int Size, Uint Addr) { - while(Size--) - { - if(!MM_GetPhysAddr(Addr)) return 0; - Addr ++; - } - return 1; + if(!MM_IsUser(Addr)) return 0; + + return CheckMem( (void*)Addr, Size ); }