From 8a8bbcba88ba7097bd44da461e47cd0f6dd22cb1 Mon Sep 17 00:00:00 2001 From: Oleg Nesterov Date: Thu, 28 Jul 2011 18:26:32 -0700 Subject: [PATCH] --- yaml --- r: 262441 b: refs/heads/master c: 9e8f90dfe58eb19140bc66655170c7aef9eadbf2 h: refs/heads/master i: 262439: d050776c97920f0ec3ec06c45a5a5bb6de12fe5f v: v3 --- [refs] | 2 +- trunk/drivers/connector/cn_proc.c | 8 ++++++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 45891f0cf4ae..b1fcca86f3ca 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 177c27bf05d0ea508e65afdbe4b6998c81e46af5 +refs/heads/master: 9e8f90dfe58eb19140bc66655170c7aef9eadbf2 diff --git a/trunk/drivers/connector/cn_proc.c b/trunk/drivers/connector/cn_proc.c index 3ee1fdb31ea7..e55814bc0d06 100644 --- a/trunk/drivers/connector/cn_proc.c +++ b/trunk/drivers/connector/cn_proc.c @@ -57,6 +57,7 @@ void proc_fork_connector(struct task_struct *task) struct proc_event *ev; __u8 buffer[CN_PROC_MSG_SIZE]; struct timespec ts; + struct task_struct *parent; if (atomic_read(&proc_event_num_listeners) < 1) return; @@ -67,8 +68,11 @@ void proc_fork_connector(struct task_struct *task) ktime_get_ts(&ts); /* get high res monotonic timestamp */ put_unaligned(timespec_to_ns(&ts), (__u64 *)&ev->timestamp_ns); ev->what = PROC_EVENT_FORK; - ev->event_data.fork.parent_pid = task->real_parent->pid; - ev->event_data.fork.parent_tgid = task->real_parent->tgid; + rcu_read_lock(); + parent = rcu_dereference(task->real_parent); + ev->event_data.fork.parent_pid = parent->pid; + ev->event_data.fork.parent_tgid = parent->tgid; + rcu_read_unlock(); ev->event_data.fork.child_pid = task->pid; ev->event_data.fork.child_tgid = task->tgid;