From: Oleg Nesterov <oleg@redhat.com>
To: Ingo Molnar <mingo@elte.hu>,
Peter Zijlstra <peterz@infradead.org>,
Srikar Dronamraju <srikar@linux.vnet.ibm.com>
Cc: Ananth N Mavinakayanahalli <ananth@in.ibm.com>,
Anton Arapov <anton@redhat.com>,
Sebastian Andrzej Siewior <bigeasy@linutronix.de>,
linux-kernel@vger.kernel.org
Subject: [PATCH 1/5] uprobes: Do not leak UTASK_BP_HIT if find_active_uprobe() fails
Date: Fri, 14 Sep 2012 19:15:51 +0200 [thread overview]
Message-ID: <20120914171551.GA29632@redhat.com> (raw)
In-Reply-To: <20120914171513.GA29599@redhat.com>
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>
---
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 26f06a6..760acc1 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. */
--
1.5.5.1
next prev parent reply other threads:[~2012-09-14 17:13 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-09-14 17:15 [PATCH 0/5] uprobes: handle_swbp() fixes Oleg Nesterov
2012-09-14 17:15 ` Oleg Nesterov [this message]
2012-09-14 17:35 ` [PATCH 1/5] uprobes: Do not leak UTASK_BP_HIT if find_active_uprobe() fails Oleg Nesterov
2012-09-20 13:53 ` Srikar Dronamraju
2012-09-14 17:15 ` [PATCH 2/5] uprobes: Do not setup ->active_uprobe/state prematurely Oleg Nesterov
2012-09-20 13:55 ` Srikar Dronamraju
2012-09-14 17:15 ` [PATCH 3/5] uprobes: Fix UPROBE_SKIP_SSTEP checks in handle_swbp() Oleg Nesterov
2012-09-15 7:39 ` Ananth N Mavinakayanahalli
2012-09-15 15:01 ` Oleg Nesterov
2012-09-17 17:20 ` Srikar Dronamraju
2012-09-18 16:07 ` Oleg Nesterov
2012-09-20 14:43 ` Srikar Dronamraju
2012-09-24 20:08 ` Oleg Nesterov
2012-09-29 17:42 ` Oleg Nesterov
2012-09-20 14:05 ` Srikar Dronamraju
2012-09-14 17:16 ` [PATCH 4/5] uprobes: Kill UTASK_BP_HIT state Oleg Nesterov
2012-09-16 14:38 ` Oleg Nesterov
2012-09-20 14:06 ` Srikar Dronamraju
2012-09-14 17:16 ` [PATCH 5/5] uprobes: Move clear_thread_flag(TIF_UPROBE) to uprobe_notify_resume() Oleg Nesterov
2012-09-20 14:06 ` Srikar Dronamraju
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20120914171551.GA29632@redhat.com \
--to=oleg@redhat.com \
--cc=ananth@in.ibm.com \
--cc=anton@redhat.com \
--cc=bigeasy@linutronix.de \
--cc=linux-kernel@vger.kernel.org \
--cc=mingo@elte.hu \
--cc=peterz@infradead.org \
--cc=srikar@linux.vnet.ibm.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).