git.ucc.asn.au
/
tpg
/
acess2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Added sanity checking to VFS_OPEN
[tpg/acess2.git]
/
Kernel
/
syscalls.c
diff --git
a/Kernel/syscalls.c
b/Kernel/syscalls.c
index
b9473f9
..
dd1f4b3
100644
(file)
--- a/
Kernel/syscalls.c
+++ b/
Kernel/syscalls.c
@@
-45,7
+45,7
@@
void SyscallHandler(tSyscallRegs *Regs)
switch(Regs->Num)
{
// -- Exit the current thread
switch(Regs->Num)
{
// -- Exit the current thread
- case SYS_EXIT: Threads_Exit(
);
break;
+ case SYS_EXIT: Threads_Exit(
0, Regs->Arg1);
break;
// -- Put the current thread to sleep
case SYS_SLEEP: Threads_Sleep(); break;
// -- Put the current thread to sleep
case SYS_SLEEP: Threads_Sleep(); break;
@@
-57,10
+57,8
@@
void SyscallHandler(tSyscallRegs *Regs)
case SYS_CLONE:
// Call clone system call
ret = Proc_Clone(&err, Regs->Arg1);
case SYS_CLONE:
// Call clone system call
ret = Proc_Clone(&err, Regs->Arg1);
- Log("ret = %i", ret);
- __asm__ __volatile__("xchg %bx, %bx");
- // Change user stack if requested
- if(ret == 0 && !(Regs->Arg1 & CLONE_VM))
+ // Change user stack if a new stack address is passed
+ if(ret == 0 && Regs->Arg2)
Regs->StackPointer = Regs->Arg2;
break;
Regs->StackPointer = Regs->Arg2;
break;
@@
-97,6
+95,10
@@
void SyscallHandler(tSyscallRegs *Regs)
case SYS_GETUID: ret = Threads_GetUID(); break;
case SYS_GETGID: ret = Threads_GetGID(); break;
case SYS_GETUID: ret = Threads_GetUID(); break;
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;
+
// -- Send Message
case SYS_SENDMSG:
ret = Proc_SendMessage(&err, Regs->Arg1, Regs->Arg2, (void*)Regs->Arg3);
// -- Send Message
case SYS_SENDMSG:
ret = Proc_SendMessage(&err, Regs->Arg1, Regs->Arg2, (void*)Regs->Arg3);
@@
-120,6
+122,12
@@
void SyscallHandler(tSyscallRegs *Regs)
ret = Proc_Execve((char*)Regs->Arg1, (char**)Regs->Arg2, (char**)Regs->Arg3);
break;
case SYS_LOADBIN:
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;
+ }
ret = Binary_Load((char*)Regs->Arg1, (Uint*)Regs->Arg2);
break;
ret = Binary_Load((char*)Regs->Arg1, (Uint*)Regs->Arg2);
break;
@@
-127,6
+135,11
@@
void SyscallHandler(tSyscallRegs *Regs)
// Virtual Filesystem
// ---
case SYS_OPEN:
// 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;
ret = VFS_Open((char*)Regs->Arg1, Regs->Arg2 | VFS_OPENFLAG_USER);
break;
@@
-136,17
+149,17
@@
void SyscallHandler(tSyscallRegs *Regs)
case SYS_WRITE:
#if BITS < 64
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
#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
#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
#else
- VFS_Read( Regs->Arg1, Regs->Arg2, (void*)Regs->Arg3 );
+
ret =
VFS_Read( Regs->Arg1, Regs->Arg2, (void*)Regs->Arg3 );
#endif
break;
#endif
break;
UCC
git Repository :: git.ucc.asn.au