diff options
| author | Luis Henriques <luis.henriques@canonical.com> | 2014-09-09 22:49:41 +0100 |
|---|---|---|
| committer | Ben Hutchings <ben@decadent.org.uk> | 2020-05-22 21:19:34 +0100 |
| commit | f9f06c52359ad1acb7ac4c81466d652c9f06fc64 (patch) | |
| tree | b101115af97ed0b7b193e36c04a03fb31eb3b5ff | |
| parent | 153e1d6d38d491ada8f0a0205c51bdd790ccac2c (diff) | |
| download | linux-stable-f9f06c52359ad1acb7ac4c81466d652c9f06fc64.tar.gz | |
tracing: Fix tracing_stat return values in error handling paths
commit afccc00f75bbbee4e4ae833a96c2d29a7259c693 upstream.
tracing_stat_init() was always returning '0', even on the error paths. It
now returns -ENODEV if tracing_init_dentry() fails or -ENOMEM if it fails
to created the 'trace_stat' debugfs directory.
Link: http://lkml.kernel.org/r/1410299381-20108-1-git-send-email-luis.henriques@canonical.com
Fixes: ed6f1c996bfe4 ("tracing: Check return value of tracing_init_dentry()")
Signed-off-by: Luis Henriques <luis.henriques@canonical.com>
[ Pulled from the archeological digging of my INBOX ]
Signed-off-by: Steven Rostedt (VMware) <rostedt@goodmis.org>
[bwh: Backported to 3.16: adjust context]
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
| -rw-r--r-- | kernel/trace/trace_stat.c | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/kernel/trace/trace_stat.c b/kernel/trace/trace_stat.c index 4f2f38e4726d0e..9457c39e8d3c16 100644 --- a/kernel/trace/trace_stat.c +++ b/kernel/trace/trace_stat.c @@ -277,19 +277,23 @@ static int tracing_stat_init(void) d_tracing = tracing_init_dentry(); if (!d_tracing) - return 0; + return -ENODEV; stat_dir = debugfs_create_dir("trace_stat", d_tracing); - if (!stat_dir) + if (!stat_dir) { pr_warning("Could not create debugfs " "'trace_stat' entry\n"); + return -ENOMEM; + } return 0; } static int init_stat_file(struct stat_session *session) { - if (!stat_dir && tracing_stat_init()) - return -ENODEV; + int ret; + + if (!stat_dir && (ret = tracing_stat_init())) + return ret; session->file = debugfs_create_file(session->ts->name, 0644, stat_dir, |