From 96dabdc9b0fbffbdf6fb7099f21924f4702d6f91 Mon Sep 17 00:00:00 2001 From: Gabe Black Date: Sun, 3 Sep 2006 02:04:25 -0400 Subject: Added uid, euid, gid, egid, pid and ppid parameters to a live process. --HG-- extra : convert_revision : 2101be8000bcdaf683730cfc079b4b78e34365d0 --- src/sim/process.cc | 14 +++++++++++++- src/sim/process.hh | 10 ++++++++++ 2 files changed, 23 insertions(+), 1 deletion(-) (limited to 'src/sim') diff --git a/src/sim/process.cc b/src/sim/process.cc index 081a25976..20f7fec2d 100644 --- a/src/sim/process.cc +++ b/src/sim/process.cc @@ -460,6 +460,12 @@ BEGIN_DECLARE_SIM_OBJECT_PARAMS(LiveProcess) Param output; VectorParam env; SimObjectParam system; + Param uid; + Param euid; + Param gid; + Param egid; + Param pid; + Param ppid; END_DECLARE_SIM_OBJECT_PARAMS(LiveProcess) @@ -471,7 +477,13 @@ BEGIN_INIT_SIM_OBJECT_PARAMS(LiveProcess) INIT_PARAM(input, "filename for stdin (dflt: use sim stdin)"), INIT_PARAM(output, "filename for stdout/stderr (dflt: use sim stdout)"), INIT_PARAM(env, "environment settings"), - INIT_PARAM(system, "system") + INIT_PARAM(system, "system"), + INIT_PARAM(uid, "user id"), + INIT_PARAM(euid, "effective user id"), + INIT_PARAM(gid, "group id"), + INIT_PARAM(egid, "effective group id"), + INIT_PARAM(pid, "process id"), + INIT_PARAM(ppid, "parent process id") END_INIT_SIM_OBJECT_PARAMS(LiveProcess) diff --git a/src/sim/process.hh b/src/sim/process.hh index 763deb100..d64cc3cf1 100644 --- a/src/sim/process.hh +++ b/src/sim/process.hh @@ -75,6 +75,16 @@ class Process : public SimObject // number of CPUs (esxec contexts, really) assigned to this process. unsigned int numCpus() { return threadContexts.size(); } + // Id of the owner of the process + uint64_t uid; + uint64_t euid; + uint64_t gid; + uint64_t egid; + + // pid of the process and it's parent + uint64_t pid; + uint64_t ppid; + // record of blocked context struct WaitRec { -- cgit v1.2.3 From b11018ca12ddd8557bddbadaf649253aa5fd8c47 Mon Sep 17 00:00:00 2001 From: Gabe Black Date: Sun, 3 Sep 2006 02:12:11 -0400 Subject: Made system calls use the uid, etc parameters from the live process. --HG-- extra : convert_revision : 2aadb87b4602324423aadb903010f5b49fcef41b --- src/sim/syscall_emul.cc | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) (limited to 'src/sim') diff --git a/src/sim/syscall_emul.cc b/src/sim/syscall_emul.cc index e72890612..6620d95e3 100644 --- a/src/sim/syscall_emul.cc +++ b/src/sim/syscall_emul.cc @@ -401,8 +401,8 @@ getpidPseudoFunc(SyscallDesc *desc, int callnum, Process *process, // fake_syscall mode, so there's no way for a process to know it's // not getting a unique value. - tc->setIntReg(SyscallPseudoReturnReg, 99); - return 100; + tc->setIntReg(SyscallPseudoReturnReg, process->ppid); + return process->pid; } @@ -414,8 +414,8 @@ getuidPseudoFunc(SyscallDesc *desc, int callnum, Process *process, // simulation to be deterministic. // EUID goes in r20. - tc->setIntReg(SyscallPseudoReturnReg, 100); //EUID - return 100; // UID + tc->setIntReg(SyscallPseudoReturnReg, process->euid); //EUID + return process->uid; // UID } @@ -424,8 +424,8 @@ getgidPseudoFunc(SyscallDesc *desc, int callnum, Process *process, ThreadContext *tc) { // Get current group ID. EGID goes in r20. - tc->setIntReg(SyscallPseudoReturnReg, 100); //EGID - return 100; + tc->setIntReg(SyscallPseudoReturnReg, process->egid); //EGID + return process->gid; } @@ -446,43 +446,43 @@ getpidFunc(SyscallDesc *desc, int callnum, Process *process, // fake_syscall mode, so there's no way for a process to know it's // not getting a unique value. - tc->setIntReg(SyscallPseudoReturnReg, 99); //PID - return 100; + tc->setIntReg(SyscallPseudoReturnReg, process->ppid); //PID + return process->pid; } SyscallReturn getppidFunc(SyscallDesc *desc, int callnum, Process *process, ThreadContext *tc) { - return 99; + return process->ppid; } SyscallReturn getuidFunc(SyscallDesc *desc, int callnum, Process *process, ThreadContext *tc) { - return 100; // UID + return process->uid; // UID } SyscallReturn geteuidFunc(SyscallDesc *desc, int callnum, Process *process, ThreadContext *tc) { - return 100; // UID + return process->euid; // UID } SyscallReturn getgidFunc(SyscallDesc *desc, int callnum, Process *process, ThreadContext *tc) { - return 100; + return process->gid; } SyscallReturn getegidFunc(SyscallDesc *desc, int callnum, Process *process, ThreadContext *tc) { - return 100; + return process->egid; } -- cgit v1.2.3