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 kernel vnsprintf
[tpg/acess2.git]
/
Kernel
/
syscalls.c
diff --git
a/Kernel/syscalls.c
b/Kernel/syscalls.c
index
e6e828e
..
14950dd
100644
(file)
--- a/
Kernel/syscalls.c
+++ b/
Kernel/syscalls.c
@@
-40,11
+40,18
@@
void SyscallHandler(tSyscallRegs *Regs)
{
Uint64 ret = 0;
Uint err = -EOK;
+ int callNum = Regs->Num;
- ENTER("iThread iNum", Threads_GetTID(), Regs->Num);
- if(Regs->Num < NUM_SYSCALLS)
- LOG("Syscall %s", cSYSCALL_NAMES[Regs->Num]);
+ #if DEBUG < 2
+ if(callNum != SYS_READ && callNum != SYS_WRITE) {
+ #endif
+ ENTER("iThread iNum", Threads_GetTID(), callNum);
+ if(callNum < NUM_SYSCALLS)
+ LOG("Syscall %s", cSYSCALL_NAMES[callNum]);
LOG("Arg1: 0x%x, Arg2: 0x%x, Arg3: 0x%x, Arg4: 0x%x", Regs->Arg1, Regs->Arg2, Regs->Arg3, Regs->Arg4);
+ #if DEBUG < 2
+ }
+ #endif
switch(Regs->Num)
{
@@
-120,14
+127,18
@@
void SyscallHandler(tSyscallRegs *Regs)
// -- Check for messages
case SYS_GETMSG:
CHECK_NUM_NULLOK(Regs->Arg1, sizeof(Uint));
- if( Regs->Arg2 && Regs->Arg2 != -1 && !MM_IsUser(Regs->Arg2) )
- {
+ 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;
+ // -- Get the current timestamp
+ case SYS_GETTIME:
+ ret = now();
+ break;
+
// -- Set the thread's name
case SYS_SETNAME:
CHECK_STR_NONULL(Regs->Arg1);
@@
-137,9
+148,10
@@
void SyscallHandler(tSyscallRegs *Regs)
// ---
// Binary Control
// ---
+ // -- Replace the current process with another
case SYS_EXECVE:
CHECK_STR_NONULL(Regs->Arg1);
- //
Log(" Regs = {Arg2: %x, Arg3: %x}", Regs->Arg2, Regs->Arg3);
+ //
Check the argument arrays
{
int i;
char **tmp = (char**)Regs->Arg2;
@@
-164,8
+176,9
@@
void SyscallHandler(tSyscallRegs *Regs)
}
LEAVE('s', "Assuming 0");
// Path, **Argv, **Envp
- ret = Proc_Execve(
(char*)Regs->Arg1, (char**)Regs->Arg2, (char**)Regs->Arg3
);
+ ret = Proc_Execve(
(char*)Regs->Arg1, (char**)Regs->Arg2, (char**)Regs->Arg3
);
break;
+ // -- Load a binary into the current process
case SYS_LOADBIN:
if( !Syscall_ValidString(Regs->Arg1)
|| !Syscall_Valid(sizeof(Uint), Regs->Arg2) ) {
@@
-186,10
+199,12
@@
void SyscallHandler(tSyscallRegs *Regs)
ret = -1;
break;
}
+ LOG("VFS_Open(\"%s\", 0x%x)", (char*)Regs->Arg1, Regs->Arg2 | VFS_OPENFLAG_USER);
ret = VFS_Open((char*)Regs->Arg1, Regs->Arg2 | VFS_OPENFLAG_USER);
break;
case SYS_CLOSE:
+ LOG("VFS_Close(%i)", Regs->Arg1);
VFS_Close( Regs->Arg1 );
break;
@@
-233,6
+248,8
@@
void SyscallHandler(tSyscallRegs *Regs)
// Read Directory
case SYS_READDIR:
+ // TODO: What if the filename is longer?
+ // Maybe force it to be a 256 byte buffer
if( !Syscall_Valid(8, Regs->Arg2) ) {
err = -EINVAL;
ret = -1;
@@
-322,11
+339,17
@@
void SyscallHandler(tSyscallRegs *Regs)
#endif
Regs->Error = err;
#if DEBUG
+ # if DEBUG < 2
+ if( callNum != SYS_READ && callNum != SYS_WRITE ) {
+ # endif
LOG("err = %i", err);
if(Regs->Num != SYS_EXECVE)
LEAVE('x', ret);
else
LOG("Actual %i", ret);
+ # if DEBUG < 2
+ }
+ # endif
#endif
}
UCC
git Repository :: git.ucc.asn.au