aboutsummaryrefslogtreecommitdiffstats
path: root/kernel
diff options
context:
space:
mode:
authorNamhyung Kim2013-04-09 19:18:12 -0500
committerGreg Kroah-Hartman2013-05-07 22:08:19 -0500
commitfbf7a3f498a9aecd68b3bd6047435d5d859e6868 (patch)
tree006534455c6ccd3de3bcd05f94267518b1d314ae /kernel
parent3c90dc77f2bcf0ce2ac6cd31522b3833713112bc (diff)
downloadkernel-omap-fbf7a3f498a9aecd68b3bd6047435d5d859e6868.tar.gz
kernel-omap-fbf7a3f498a9aecd68b3bd6047435d5d859e6868.tar.xz
kernel-omap-fbf7a3f498a9aecd68b3bd6047435d5d859e6868.zip
tracing: Check return value of tracing_init_dentry()
commit ed6f1c996bfe4b6e520cf7a74b51cd6988d84420 upstream. Check return value and bail out if it's NULL. Link: http://lkml.kernel.org/r/1365553093-10180-2-git-send-email-namhyung@kernel.org Signed-off-by: Namhyung Kim <namhyung@kernel.org> Cc: Frederic Weisbecker <fweisbec@gmail.com> Cc: Namhyung Kim <namhyung.kim@lge.com> Signed-off-by: Steven Rostedt <rostedt@goodmis.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'kernel')
-rw-r--r--kernel/trace/trace.c2
-rw-r--r--kernel/trace/trace_stack.c2
-rw-r--r--kernel/trace/trace_stat.c2
3 files changed, 6 insertions, 0 deletions
diff --git a/kernel/trace/trace.c b/kernel/trace/trace.c
index fe1d581a150a..1c8285240152 100644
--- a/kernel/trace/trace.c
+++ b/kernel/trace/trace.c
@@ -4885,6 +4885,8 @@ static __init int tracer_init_debugfs(void)
4885 trace_access_lock_init(); 4885 trace_access_lock_init();
4886 4886
4887 d_tracer = tracing_init_dentry(); 4887 d_tracer = tracing_init_dentry();
4888 if (!d_tracer)
4889 return 0;
4888 4890
4889 trace_create_file("trace_options", 0644, d_tracer, 4891 trace_create_file("trace_options", 0644, d_tracer,
4890 NULL, &tracing_iter_fops); 4892 NULL, &tracing_iter_fops);
diff --git a/kernel/trace/trace_stack.c b/kernel/trace/trace_stack.c
index 4141973061a3..b20428c5efe2 100644
--- a/kernel/trace/trace_stack.c
+++ b/kernel/trace/trace_stack.c
@@ -431,6 +431,8 @@ static __init int stack_trace_init(void)
431 struct dentry *d_tracer; 431 struct dentry *d_tracer;
432 432
433 d_tracer = tracing_init_dentry(); 433 d_tracer = tracing_init_dentry();
434 if (!d_tracer)
435 return 0;
434 436
435 trace_create_file("stack_max_size", 0644, d_tracer, 437 trace_create_file("stack_max_size", 0644, d_tracer,
436 &max_stack_size, &stack_max_size_fops); 438 &max_stack_size, &stack_max_size_fops);
diff --git a/kernel/trace/trace_stat.c b/kernel/trace/trace_stat.c
index 96cffb269e73..847f88a6194b 100644
--- a/kernel/trace/trace_stat.c
+++ b/kernel/trace/trace_stat.c
@@ -307,6 +307,8 @@ static int tracing_stat_init(void)
307 struct dentry *d_tracing; 307 struct dentry *d_tracing;
308 308
309 d_tracing = tracing_init_dentry(); 309 d_tracing = tracing_init_dentry();
310 if (!d_tracing)
311 return 0;
310 312
311 stat_dir = debugfs_create_dir("trace_stat", d_tracing); 313 stat_dir = debugfs_create_dir("trace_stat", d_tracing);
312 if (!stat_dir) 314 if (!stat_dir)