X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=Kernel%2Fsyscalls.c;h=523b3f2ae3a502f1e9d43382acedfcb67093cab8;hb=156885e938b60fee9d061d989ae7711c9aeea493;hp=877018730e8b42188076a4f631d2d3a4830d01ae;hpb=47e9dfd89189fc6b150bd6b20229cb047c7e0858;p=tpg%2Facess2.git

diff --git a/Kernel/syscalls.c b/Kernel/syscalls.c
index 87701873..523b3f2a 100644
--- a/Kernel/syscalls.c
+++ b/Kernel/syscalls.c
@@ -4,7 +4,7 @@
  */
 #define DEBUG	0
 
-#include <common.h>
+#include <acess.h>
 #include <syscalls.h>
 #include <proc.h>
 #include <errno.h>
@@ -25,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);
@@ -43,13 +42,12 @@ 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)
 		LOG("Syscall %s", cSYSCALL_NAMES[Regs->Num]);
 	LOG("Arg1: 0x%x, Arg2: 0x%x, Arg3: 0x%x, Arg4: 0x%x", Regs->Arg1, Regs->Arg2, Regs->Arg3, Regs->Arg4);
-	//#endif
 	
 	switch(Regs->Num)
 	{
@@ -108,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:
@@ -120,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;
@@ -161,6 +160,7 @@ void SyscallHandler(tSyscallRegs *Regs)
 				}
 			}
 		}
+		LEAVE('s', "Assuming 0");
 		// Path, **Argv, **Envp
 		ret = Proc_Execve((char*)Regs->Arg1, (char**)Regs->Arg2, (char**)Regs->Arg3);
 		break;
@@ -210,7 +210,7 @@ void SyscallHandler(tSyscallRegs *Regs)
 		break;
 	
 	case SYS_FINFO:
-		CHECK_NUM_NONULL( Regs->Arg2, sizeof(struct s_sysFInfo) + Regs->Arg3*sizeof(tVFS_ACL) );
+		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;
@@ -307,7 +307,10 @@ void SyscallHandler(tSyscallRegs *Regs)
 	Regs->Error = err;
 	#if DEBUG
 	LOG("err = %i", err);
-	LEAVE('x', ret);
+	if(Regs->Num != SYS_EXECVE)
+		LEAVE('x', ret);
+	else
+		LOG("Actual %i", ret);
 	#endif
 }