summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFrederic Weisbecker <fweisbec@gmail.com>2009-11-26 05:35:40 +0100
committerIngo Molnar <mingo@elte.hu>2009-11-26 09:29:20 +0100
commitd99be40aff88722ab03ee295e4f6c13a4cca9a3d (patch)
tree53b362f02793d2cf1ca78f1d60ad26c1c5a1450e
parent470dda7417f284b9cfc96560b2acd98df63798a2 (diff)
ksym_tracer: Fix breakpoint removal after modification
The error path of a breakpoint modification is broken in the ksym tracer. A modified breakpoint hlist node is immediately released after its removal. Also we leak a breakpoint in this case. Fix the path. Signed-off-by: Frederic Weisbecker <fweisbec@gmail.com> Cc: Steven Rostedt <rostedt@goodmis.org> Cc: Prasad <prasad@linux.vnet.ibm.com> LKML-Reference: <1259210142-5714-1-git-send-regression-fweisbec@gmail.com> Signed-off-by: Ingo Molnar <mingo@elte.hu>
-rw-r--r--kernel/trace/trace_ksym.c10
1 files changed, 8 insertions, 2 deletions
diff --git a/kernel/trace/trace_ksym.c b/kernel/trace/trace_ksym.c
index 11935b53a6c..9f040e42f51 100644
--- a/kernel/trace/trace_ksym.c
+++ b/kernel/trace/trace_ksym.c
@@ -339,14 +339,20 @@ static ssize_t ksym_trace_filter_write(struct file *file,
ksym_hbp_handler, true);
if (IS_ERR(entry->ksym_hbp))
entry->ksym_hbp = NULL;
- if (!entry->ksym_hbp)
+
+ /* modified without problem */
+ if (entry->ksym_hbp) {
+ ret = 0;
goto out;
+ }
+ } else {
+ ret = 0;
}
+ /* Error or "symbol:---" case: drop it */
ksym_filter_entry_count--;
hlist_del_rcu(&(entry->ksym_hlist));
synchronize_rcu();
kfree(entry);
- ret = 0;
goto out;
} else {
/* Check for malformed request: (4) */