aboutsummaryrefslogtreecommitdiffstats
path: root/kernel
diff options
context:
space:
mode:
authorOleg Nesterov <oleg@redhat.com>2012-09-14 12:03:59 -0400
committerOleg Nesterov <oleg@redhat.com>2012-09-29 15:21:52 -0400
commit79d54b249c176ba4abb9a580951400246dd974b1 (patch)
treee3efd0adcd88f476c775b9b77b58e58424739174 /kernel
parent1d787d37c8ff6612b8151c6dff15bfa7347bcbdf (diff)
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')
-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 912ef48d28ab..2c1ff05af6f5 100644
--- a/kernel/events/uprobes.c
+++ b/kernel/events/uprobes.c
@@ -1468,6 +1468,10 @@ static void handle_swbp(struct pt_regs *regs)
1468 bp_vaddr = uprobe_get_swbp_addr(regs); 1468 bp_vaddr = uprobe_get_swbp_addr(regs);
1469 uprobe = find_active_uprobe(bp_vaddr, &is_swbp); 1469 uprobe = find_active_uprobe(bp_vaddr, &is_swbp);
1470 1470
1471 utask = current->utask;
1472 if (utask)
1473 utask->state = UTASK_RUNNING;
1474
1471 if (!uprobe) { 1475 if (!uprobe) {
1472 if (is_swbp > 0) { 1476 if (is_swbp > 0) {
1473 /* No matching uprobe; signal SIGTRAP. */ 1477 /* No matching uprobe; signal SIGTRAP. */
@@ -1486,7 +1490,6 @@ static void handle_swbp(struct pt_regs *regs)
1486 return; 1490 return;
1487 } 1491 }
1488 1492
1489 utask = current->utask;
1490 if (!utask) { 1493 if (!utask) {
1491 utask = add_utask(); 1494 utask = add_utask();
1492 /* Cannot allocate; re-execute the instruction. */ 1495 /* Cannot allocate; re-execute the instruction. */