Skip to contentSkip to conversation

uprobes: Fix the wrong usage of current->utask in uprobe_copy_process()

PATCH New Oleg Nesterov 1 participant 2 messages Nov 8, 2013

Subsystems (2)
lore
Share & tools
lore

Oleg Nesterov

author maintainer
#0 lore raw

cover uprobes: Fix the wrong usage of current->utask in uprobe_copy_process()

Ingo,

I am stupid. aa59c53fd459 "uprobes: Change uprobe_copy_process() to dup xol_area" needs the trivial fix, see 1/1. Sorry.

Perhaps I should add this patch to my tree and ask you to pull this one-liner? Probably I can also add another "uprobes: Fix the memory out of bound overwrite in copy_insn()" fix I sent yesterday...

Oleg.

author maintainer
#1 lore raw

PATCH 1/1 uprobes: Fix the wrong usage of current->utask in uprobe_copy_process()

Commit aa59c53fd459 "uprobes: Change uprobe_copy_process() to dup xol_area" has a stupid typo, we need to setup t->utask->vaddr but the code wrongly uses current->utask.

Even with this bug dup_xol_work() works "in practice", but only because get_unmapped_area(NULL, TASK_SIZE - PAGE_SIZE) likely returns the same address every time.

---
 kernel/events/uprobes.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
kernel/events/uprobes.c +1 -1
index 26fdd65..847201f 100644
@@ -1446,7 +1446,7 @@ void uprobe_copy_process(struct task_struct *t, unsigned long flags)
 	if (!work)
 		return uprobe_warn(t, "dup xol area");
 
-	utask->vaddr = area->vaddr;
+	t->utask->vaddr = area->vaddr;
 	init_task_work(work, dup_xol_work);
 	task_work_add(t, work, true);
 }
Signature · 1 line
1.5.5.1