summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOleg Nesterov <oleg@redhat.com>2012-09-14 18:03:59 +0200
committerAnton Arapov <anton@redhat.com>2012-10-29 11:47:41 +0100
commit008571514135873267d4cfde6bbd517ba865e3a8 (patch)
tree839d88118abe37b48ab3f744dd2a178edd3bddcb
parenta2090395acc7364489484ca743cabc723dd7d7ce (diff)
downloadkernel-uprobes-008571514135873267d4cfde6bbd517ba865e3a8.zip
kernel-uprobes-008571514135873267d4cfde6bbd517ba865e3a8.tar.gz
kernel-uprobes-008571514135873267d4cfde6bbd517ba865e3a8.tar.xz
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>
-rw-r--r--kernel/events/uprobes.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/kernel/events/uprobes.c b/kernel/events/uprobes.c
index 912ef48..2c1ff05 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. */