X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;ds=sidebyside;f=Kernel%2Fsyscalls.c;h=35e48902566bc1a846a134ebfb7af3d98d88334d;hb=3de85568b7c3e6245521e3c27cf5593247e4012b;hp=00f031feead95f828495f4098b05254e929662f3;hpb=28eafc7611ec3d3f840845ec2b54025affd7bc1e;p=tpg%2Facess2.git diff --git a/Kernel/syscalls.c b/Kernel/syscalls.c index 00f031fe..35e48902 100644 --- a/Kernel/syscalls.c +++ b/Kernel/syscalls.c @@ -68,9 +68,6 @@ void SyscallHandler(tSyscallRegs *Regs) case SYS_CLONE: // Call clone system call ret = Proc_Clone(Regs->Arg1); - // Change user stack if a new stack address is passed - if(ret == 0 && Regs->Arg2) - Regs->StackPointer = Regs->Arg2; break; // -- Send a signal @@ -159,16 +156,18 @@ void SyscallHandler(tSyscallRegs *Regs) CHECK_NUM_NONULL( &tmp[i], sizeof(char*) ); CHECK_STR_NONULL( tmp[i] ); } + if(ret == -1) break; // Check EnvP also // - EnvP can be NULL if( Regs->Arg3 ) { tmp = (char**)Regs->Arg3; - //Log("tmp = %p", tmp); + CHECK_NUM_NONULL(tmp, sizeof(char**)); for(i=0;tmp[i];i++) { - CHECK_NUM_NULLOK( &tmp[i], sizeof(char*) ); + CHECK_NUM_NONULL( &tmp[i], sizeof(char*) ); CHECK_STR_NONULL( tmp[i] ); } + if(ret == -1) break; } } LEAVE('s', "Assuming 0"); @@ -315,8 +314,9 @@ void SyscallHandler(tSyscallRegs *Regs) // -- Debug //#if DEBUG_BUILD case SYS_DEBUG: - LogF("Log: [%i] ", Threads_GetTID()); - LogF((char*)Regs->Arg1, + CHECK_STR_NONULL( (char*)Regs->Arg1 ); + LogF("Log: %08lli [%i] ", now(), Threads_GetTID()); + LogF((const char*)Regs->Arg1, Regs->Arg2, Regs->Arg3, Regs->Arg4, Regs->Arg5, Regs->Arg6); LogF("\r\n"); break; @@ -350,10 +350,10 @@ void SyscallHandler(tSyscallRegs *Regs) if( callNum != SYS_READ && callNum != SYS_WRITE ) { # endif LOG("err = %i", err); - if(Regs->Num != SYS_EXECVE) - LEAVE('x', ret); - else + if( callNum == SYS_EXECVE ) LOG("Actual %i", ret); + else + LEAVE('x', ret); # if DEBUG < 2 } # endif