diff options
| author | Steven Rostedt (VMware) <rostedt@goodmis.org> | 2019-08-30 16:30:01 -0400 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2019-09-06 10:23:39 +0200 |
| commit | e56b7b3b92561a4284f4f93a4648890f477aeac8 (patch) | |
| tree | 973d129f6e401cd7854389f674c179b5519cd22a /kernel | |
| parent | d784aa1a0f136740cbd3b94163b66022336342ca (diff) | |
| download | linux-stable-e56b7b3b92561a4284f4f93a4648890f477aeac8.tar.gz linux-stable-e56b7b3b92561a4284f4f93a4648890f477aeac8.tar.bz2 linux-stable-e56b7b3b92561a4284f4f93a4648890f477aeac8.zip | |
ftrace: Check for empty hash and comment the race with registering probes
commit 372e0d01da71c84dcecf7028598a33813b0d5256 upstream.
The race between adding a function probe and reading the probes that exist
is very subtle. It needs a comment. Also, the issue can also happen if the
probe has has the EMPTY_HASH as its func_hash.
Cc: stable@vger.kernel.org
Fixes: 7b60f3d876156 ("ftrace: Dynamically create the probe ftrace_ops for the trace_array")
Signed-off-by: Steven Rostedt (VMware) <rostedt@goodmis.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'kernel')
| -rw-r--r-- | kernel/trace/ftrace.c | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/kernel/trace/ftrace.c b/kernel/trace/ftrace.c index 6af4a459dfca..2373311b4a43 100644 --- a/kernel/trace/ftrace.c +++ b/kernel/trace/ftrace.c @@ -3096,7 +3096,11 @@ t_probe_next(struct seq_file *m, loff_t *pos) hash = iter->probe->ops.func_hash->filter_hash; - if (!hash) + /* + * A probe being registered may temporarily have an empty hash + * and it's at the end of the func_probes list. + */ + if (!hash || hash == EMPTY_HASH) return NULL; size = 1 << hash->size_bits; @@ -4324,6 +4328,10 @@ register_ftrace_function_probe(char *glob, struct trace_array *tr, mutex_unlock(&ftrace_lock); + /* + * Note, there's a small window here that the func_hash->filter_hash + * may be NULL or empty. Need to be carefule when reading the loop. + */ mutex_lock(&probe->ops.func_hash->regex_lock); orig_hash = &probe->ops.func_hash->filter_hash; |