X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=Kernel%2Fsyscalls.c;h=cafe7c28e1bb58e63927ed9aa21df10290c865d2;hb=5c9451f7e03edf59a3066853ae544c9d120bf90a;hp=a555720f2336660cc2ff1e8633d88c24937bc086;hpb=56b770130dc830c6a9dccb6c50e6442a8bdb0b6c;p=tpg%2Facess2.git

diff --git a/Kernel/syscalls.c b/Kernel/syscalls.c
index a555720f..cafe7c28 100644
--- a/Kernel/syscalls.c
+++ b/Kernel/syscalls.c
@@ -118,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;
@@ -167,7 +168,7 @@ void SyscallHandler(tSyscallRegs *Regs)
 		if( !Syscall_ValidString(Regs->Arg1)
 		||  !Syscall_Valid(sizeof(Uint), Regs->Arg2) ) {
 			err = -EINVAL;
-			ret = -1;
+			ret = 0;
 			break;
 		}
 		// Path, *Entrypoint