From b8772cce090adb3d27cdd8b49d236662b526424e Mon Sep 17 00:00:00 2001 From: jistone Date: Wed, 7 Feb 2007 02:54:30 +0000 Subject: 2007-02-06 Josh Stone * aux_syscalls.stp, inet_sock.stp, ioblock.stp, ioscheduler.stp, nfs.stp, nfs_proc.stp, nfsd.stp, rpc.stp, scsi.stp, signal.stp, socket.stp, task.stp, tcp.stp, vfs.stp: Protect pointer dereferences with kread wherever possible. Some places still have hazards, as marked with FIXMEs. * errno.stp (returnstr): Don't use return in tapset C functions. * aux_syscalls.stp (__uget_timex_m): Ditto. * nfsd.stp (__get_fh): Ditto. * nfs.stp, vfs.stp (): Ditto. * string.stp (substr): Ditto. Also make sure start index is valid. * syscalls.stp (syscall.execve): Change __string to kernel_string. LKET/ * nfs.stp, nfs_proc.stp, nfsd.stp, process.stp, tskdispatch.stp: Protect pointer dereferences with kread wherever possible. Some places still have hazards, as marked with FIXMEs. * aio.stp (log_io_getevents): Don't use return in tapset C functions. * timestamp.stp (set_timing_method): Ditto. * utils.stp (filter_by_pid): Ditto. --- tapset/LKET/process.stp | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) (limited to 'tapset/LKET/process.stp') diff --git a/tapset/LKET/process.stp b/tapset/LKET/process.stp index fb02614b..41f6d3f1 100755 --- a/tapset/LKET/process.stp +++ b/tapset/LKET/process.stp @@ -14,7 +14,8 @@ function log_execve_tracedata(var:long) long tmp=(long)THIS->var; _lket_trace(_GROUP_PROCESS, _HOOKID_PROCESS_EXECVE, "%4b%4b%4b%0s", (_FMT_)current->pid, (_FMT_)current->tgid, - (_FMT_)current->parent->tgid, (char *)tmp); + (_FMT_)current->parent->tgid, + (char *)tmp /* FIXME: deref hazard! */); %} @@ -26,8 +27,12 @@ function log_fork_tracedata(task:long) _lket_trace(_GROUP_PROCESS, THIS->var_id, "%4b", (_FMT_)pid); */ struct task_struct *task = (struct task_struct *)((long)THIS->task); - _lket_trace(_GROUP_PROCESS, _HOOKID_PROCESS_FORK, "%4b%4b%4b", (_FMT_)task->pid, - (_FMT_)task->tgid, (_FMT_)task->parent->tgid); + struct task_struct *parent = kread(&(task->parent)); + _lket_trace(_GROUP_PROCESS, _HOOKID_PROCESS_FORK, "%4b%4b%4b", + (_FMT_)kread(&(task->pid)), + (_FMT_)kread(&(task->tgid)), + (_FMT_)kread(&(parent->tgid))); + CATCH_DEREF_FAULT(); %} @@ -47,6 +52,7 @@ function process_snapshot() /* iterate all the processes, and record the pid and process name for each entry */ + /* FIXME: need some sort of lock before doing this! */ for_each_process(tsk) { _lket_trace(_GROUP_PROCESS, _HOOKID_PROCESS_SNAPSHOT, "%4b%4b%4b%0s", (_FMT_)tsk->pid, (_FMT_)tsk->tgid, (_FMT_)tsk->parent->tgid, tsk->comm); -- cgit