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
Fixed bug where system would lock if a user task segfaulted (forgot to sti)
[tpg/acess2.git]
/
Kernel
/
syscalls.c
diff --git
a/Kernel/syscalls.c
b/Kernel/syscalls.c
index
4275274
..
5774dbe
100644
(file)
--- a/
Kernel/syscalls.c
+++ b/
Kernel/syscalls.c
@@
-95,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);
@@
-115,9
+119,20
@@
void SyscallHandler(tSyscallRegs *Regs)
// Binary Control
// ---
case SYS_EXECVE:
// Binary Control
// ---
case SYS_EXECVE:
+ if( !Syscall_ValidString(Regs->Arg1) ) {
+ err = -EINVAL;
+ ret = -1;
+ break;
+ }
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;
@@
-125,6
+140,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;
UCC
git Repository :: git.ucc.asn.au