Skip to content

Commit

Permalink
tracing/stack-tracer: fix locking and refcounts
Browse files Browse the repository at this point in the history
Impact: fix refcounting/object-access bug

Hold mmap_sem while looking up/accessing vma.
Hold the RCU lock while using the task we looked up.

Signed-off-by: Török Edwin <edwintorok@gmail.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
  • Loading branch information
Török Edwin authored and Ingo Molnar committed Nov 23, 2008
1 parent 8d7c6a9 commit cffa10a
Showing 1 changed file with 6 additions and 3 deletions.
9 changes: 6 additions & 3 deletions kernel/trace/trace.c
Original file line number Diff line number Diff line change
Expand Up @@ -1462,11 +1462,15 @@ static inline int seq_print_user_ip(struct trace_seq *s, struct mm_struct *mm,
int ret = 1;

if (mm) {
const struct vm_area_struct *vma = find_vma(mm, ip);
const struct vm_area_struct *vma;

down_read(&mm->mmap_sem);
vma = find_vma(mm, ip);
if (vma) {
file = vma->vm_file;
vmstart = vma->vm_start;
}
up_read(&mm->mmap_sem);
}
if (file) {
ret = trace_seq_path(s, &file->f_path);
Expand Down Expand Up @@ -1494,10 +1498,9 @@ seq_print_userip_objs(const struct userstack_entry *entry, struct trace_seq *s,
*/
rcu_read_lock();
task = find_task_by_vpid(entry->ent.tgid);
rcu_read_unlock();

if (task)
mm = get_task_mm(task);
rcu_read_unlock();
}

for (i = 0; i < FTRACE_STACK_ENTRIES; i++) {
Expand Down

0 comments on commit cffa10a

Please sign in to comment.