[for-next][PATCH 5/7] tracing: Check return value of tracing_init_dentry()

From: Steven Rostedt
Date: Fri Apr 19 2013 - 10:08:39 EST


From: Namhyung Kim <namhyung.kim@xxxxxxx>

Check return value and bail out if it's NULL.

Link: http://lkml.kernel.org/r/1365553093-10180-2-git-send-email-namhyung@xxxxxxxxxx

Cc: Frederic Weisbecker <fweisbec@xxxxxxxxx>
Cc: Namhyung Kim <namhyung.kim@xxxxxxx>
Cc: stable@xxxxxxxxxxxxxxx
Signed-off-by: Namhyung Kim <namhyung@xxxxxxxxxx>
Signed-off-by: Steven Rostedt <rostedt@xxxxxxxxxxx>
---
kernel/trace/trace.c | 2 ++
kernel/trace/trace_stack.c | 2 ++
kernel/trace/trace_stat.c | 2 ++
3 files changed, 6 insertions(+)

diff --git a/kernel/trace/trace.c b/kernel/trace/trace.c
index 07860b9..7297079 100644
--- a/kernel/trace/trace.c
+++ b/kernel/trace/trace.c
@@ -5953,6 +5953,8 @@ static __init int tracer_init_debugfs(void)
trace_access_lock_init();

d_tracer = tracing_init_dentry();
+ if (!d_tracer)
+ return 0;

init_tracer_debugfs(&global_trace, d_tracer);

diff --git a/kernel/trace/trace_stack.c b/kernel/trace/trace_stack.c
index aab277b..8c3f37e 100644
--- a/kernel/trace/trace_stack.c
+++ b/kernel/trace/trace_stack.c
@@ -431,6 +431,8 @@ static __init int stack_trace_init(void)
struct dentry *d_tracer;

d_tracer = tracing_init_dentry();
+ if (!d_tracer)
+ return 0;

trace_create_file("stack_max_size", 0644, d_tracer,
&max_stack_size, &stack_max_size_fops);
diff --git a/kernel/trace/trace_stat.c b/kernel/trace/trace_stat.c
index 96cffb2..847f88a 100644
--- a/kernel/trace/trace_stat.c
+++ b/kernel/trace/trace_stat.c
@@ -307,6 +307,8 @@ static int tracing_stat_init(void)
struct dentry *d_tracing;

d_tracing = tracing_init_dentry();
+ if (!d_tracing)
+ return 0;

stat_dir = debugfs_create_dir("trace_stat", d_tracing);
if (!stat_dir)
--
1.7.10.4


Attachment: signature.asc
Description: This is a digitally signed message part