X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=Kernel%2Fsyscalls.c;h=ff472941a5e9db907c5d4962200f21e23a72f62f;hb=7180d8e33801a3205012d27ea5ccb80f70695b5d;hp=47200c62846d2b7cd0a62c129ff5e3239e61bee0;hpb=f119d0e5b18b7286d04fc536a94e0f96e3c51714;p=tpg%2Facess2.git

diff --git a/Kernel/syscalls.c b/Kernel/syscalls.c
index 47200c62..ff472941 100644
--- a/Kernel/syscalls.c
+++ b/Kernel/syscalls.c
@@ -17,23 +17,31 @@ 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();
 
+// === PROTOTYPES ===
+ int	Syscall_ValidString(Uint Addr);
+ int	Syscall_Valid(int Size, Uint Addr);
+
 // === CODE ===
+// TODO: Do sanity checking on arguments, ATM the user can really fuck with the kernel
 void SyscallHandler(tSyscallRegs *Regs)
 {
 	Uint64	ret = 0;
 	Uint	err = 0;
 	#if DEBUG
-	ENTER("iThread iNum", gCurrentThread->TID, Regs->Num);
+	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
+	
 	switch(Regs->Num)
 	{
 	// -- Exit the current thread
@@ -49,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;
@@ -65,19 +73,24 @@ void SyscallHandler(tSyscallRegs *Regs)
 		ret = Threads_WaitTID(Regs->Arg1, (void*)Regs->Arg2);
 		break;
 	
+	// -- Get the physical address of a page
 	case SYS_GETPHYS:
 		ret = MM_GetPhysAddr(Regs->Arg1);
 		break;
+	
 	// -- Map an address
 	case SYS_MAP:	MM_Map(Regs->Arg1, Regs->Arg2);	break;
+	
 	// -- Allocate an address
 	case SYS_ALLOCATE:	ret = MM_Allocate(Regs->Arg1);	break;
+	
 	// -- Unmap an address
 	case SYS_UNMAP:		MM_Deallocate(Regs->Arg1);	break;
 	
 	// -- Get Thread/Process IDs
 	case SYS_GETTID:	ret = Threads_GetTID();	break;
 	case SYS_GETPID:	ret = Threads_GetPID();	break;
+	
 	// -- Get User/Group IDs
 	case SYS_GETUID:	ret = Threads_GetUID();	break;
 	case SYS_GETGID:	ret = Threads_GetGID();	break;
@@ -121,17 +134,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;
 	
@@ -139,6 +152,36 @@ void SyscallHandler(tSyscallRegs *Regs)
 		ret = VFS_FInfo( Regs->Arg1, (void*)Regs->Arg2, Regs->Arg3 );
 		break;
 	
+	// Get ACL Value
+	case SYS_GETACL:
+		if( !Syscall_Valid(8, Regs->Arg1) ) {
+			err = -EINVAL;
+			ret = -1;
+			break;
+		}
+		ret = VFS_GetACL( Regs->Arg1, (void*)Regs->Arg2 );
+		break;
+	
+	// Read Directory
+	case SYS_READDIR:
+		if( !Syscall_ValidString(Regs->Arg2) ) {
+			err = -EINVAL;
+			ret = -1;
+			break;
+		}
+		ret = VFS_ReadDir( Regs->Arg1, (void*)Regs->Arg2 );
+		break;
+	
+	// Change Directory
+	case SYS_CHDIR:
+		if( !Syscall_ValidString(Regs->Arg1) ) {
+			err = -EINVAL;
+			ret = -1;
+			break;
+		}
+		ret = VFS_ChDir( (void*)Regs->Arg1 );
+		break;
+	
 	// -- Debug
 	case SYS_DEBUG:
 		Log((char*)Regs->Arg1,
@@ -167,3 +210,36 @@ void SyscallHandler(tSyscallRegs *Regs)
 	#endif
 }
 
+/**
+ * \fn int Syscall_ValidString(Uint Addr)
+ * \brief Checks if a memory address contains a valid string
+ */
+int Syscall_ValidString(Uint Addr)
+{
+	// Check 1st page
+	if(!MM_GetPhysAddr(Addr))	return 0;
+	
+	// Traverse String
+	while(*(char*)Addr)
+	{
+		if(!MM_GetPhysAddr(Addr))	return 0;
+		// Increment string pointer
+		Addr ++;
+	}
+	
+	return 1;
+}
+
+/**
+ * \fn int Syscall_Valid(int Size, Uint Addr)
+ * \brief Checks if a memory address is valid
+ */
+int Syscall_Valid(int Size, Uint Addr)
+{
+	while(Size--)
+	{
+		if(!MM_GetPhysAddr(Addr))	return 0;
+		Addr ++;
+	}
+	return 1;
+}