Skip to content

Commit

Permalink
ftrace: Fix locking in register_ftrace_function_probe()
Browse files Browse the repository at this point in the history
The iteration of the ftrace function list and the call to
ftrace_match_record() need to be protected by the ftrace_lock.

Signed-off-by: Steven Rostedt <rostedt@goodmis.org>
  • Loading branch information
Steven Rostedt (Red Hat) committed May 10, 2013
1 parent da511bf commit 5ae0bf5
Showing 1 changed file with 6 additions and 4 deletions.
10 changes: 6 additions & 4 deletions kernel/trace/ftrace.c
Original file line number Diff line number Diff line change
Expand Up @@ -3017,14 +3017,16 @@ register_ftrace_function_probe(char *glob, struct ftrace_probe_ops *ops,
hash = alloc_and_copy_ftrace_hash(FTRACE_HASH_DEFAULT_BITS, *orig_hash);
if (!hash) {
count = -ENOMEM;
goto out_unlock;
goto out;
}

if (unlikely(ftrace_disabled)) {
count = -ENODEV;
goto out_unlock;
goto out;
}

mutex_lock(&ftrace_lock);

do_for_each_ftrace_rec(pg, rec) {

if (!ftrace_match_record(rec, NULL, search, len, type))
Expand Down Expand Up @@ -3070,15 +3072,15 @@ register_ftrace_function_probe(char *glob, struct ftrace_probe_ops *ops,

} while_for_each_ftrace_rec();

mutex_lock(&ftrace_lock);
ret = ftrace_hash_move(&trace_probe_ops, 1, orig_hash, hash);
if (ret < 0)
count = ret;

__enable_ftrace_function_probe();
mutex_unlock(&ftrace_lock);

out_unlock:
mutex_unlock(&ftrace_lock);
out:
mutex_unlock(&trace_probe_ops.regex_lock);
free_ftrace_hash(hash);

Expand Down

0 comments on commit 5ae0bf5

Please sign in to comment.