diff options
| author | Oleg Nesterov <oleg@redhat.com> | 2012-09-14 18:03:59 +0200 |
|---|---|---|
| committer | Anton Arapov <anton@redhat.com> | 2012-10-29 11:50:11 +0100 |
| commit | f8f2b15a1ba940e7e6fe026f50e92499cda1b986 (patch) | |
| tree | 5f1d374c695e591e7a913c5b79392eb10f86fa99 /kernel/events/uprobes.c | |
| parent | e4d06a782f8e092ed3f60b69cd0b61033b5202bd (diff) | |
| download | kernel-uprobes-f8f2b15a1ba940e7e6fe026f50e92499cda1b986.tar.gz kernel-uprobes-f8f2b15a1ba940e7e6fe026f50e92499cda1b986.tar.xz kernel-uprobes-f8f2b15a1ba940e7e6fe026f50e92499cda1b986.zip | |
uprobes: Do not leak UTASK_BP_HIT if find_active_uprobe() fails
If handle_swbp()->find_active_uprobe() fails we return with
utask->state = UTASK_BP_HIT.
Change handle_swbp() to reset utask->state at the start. Note
that we do this unconditionally, see the next patch(es).
Signed-off-by: Oleg Nesterov <oleg@redhat.com>
Acked-by: Srikar Dronamraju <srikar@linux.vnet.ibm.com>
Diffstat (limited to 'kernel/events/uprobes.c')
| -rw-r--r-- | kernel/events/uprobes.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/kernel/events/uprobes.c b/kernel/events/uprobes.c index 912ef48d28a..2c1ff05af6f 100644 --- a/kernel/events/uprobes.c +++ b/kernel/events/uprobes.c @@ -1468,6 +1468,10 @@ static void handle_swbp(struct pt_regs *regs) bp_vaddr = uprobe_get_swbp_addr(regs); uprobe = find_active_uprobe(bp_vaddr, &is_swbp); + utask = current->utask; + if (utask) + utask->state = UTASK_RUNNING; + if (!uprobe) { if (is_swbp > 0) { /* No matching uprobe; signal SIGTRAP. */ @@ -1486,7 +1490,6 @@ static void handle_swbp(struct pt_regs *regs) return; } - utask = current->utask; if (!utask) { utask = add_utask(); /* Cannot allocate; re-execute the instruction. */ |