]>
Commit | Line | Data |
---|---|---|
28056e7e GKH |
1 | From ed6f1c996bfe4b6e520cf7a74b51cd6988d84420 Mon Sep 17 00:00:00 2001 |
2 | From: Namhyung Kim <namhyung.kim@lge.com> | |
3 | Date: Wed, 10 Apr 2013 09:18:12 +0900 | |
4 | Subject: tracing: Check return value of tracing_init_dentry() | |
5 | ||
6 | From: Namhyung Kim <namhyung.kim@lge.com> | |
7 | ||
8 | commit ed6f1c996bfe4b6e520cf7a74b51cd6988d84420 upstream. | |
9 | ||
10 | Check return value and bail out if it's NULL. | |
11 | ||
12 | Link: http://lkml.kernel.org/r/1365553093-10180-2-git-send-email-namhyung@kernel.org | |
13 | ||
14 | Signed-off-by: Namhyung Kim <namhyung@kernel.org> | |
15 | Cc: Frederic Weisbecker <fweisbec@gmail.com> | |
16 | Cc: Namhyung Kim <namhyung.kim@lge.com> | |
17 | Signed-off-by: Steven Rostedt <rostedt@goodmis.org> | |
18 | Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> | |
19 | ||
20 | --- | |
21 | kernel/trace/trace.c | 2 ++ | |
22 | kernel/trace/trace_stack.c | 2 ++ | |
23 | kernel/trace/trace_stat.c | 2 ++ | |
24 | 3 files changed, 6 insertions(+) | |
25 | ||
26 | --- a/kernel/trace/trace.c | |
27 | +++ b/kernel/trace/trace.c | |
28 | @@ -4717,6 +4717,8 @@ static __init int tracer_init_debugfs(vo | |
29 | trace_access_lock_init(); | |
30 | ||
31 | d_tracer = tracing_init_dentry(); | |
32 | + if (!d_tracer) | |
33 | + return 0; | |
34 | ||
35 | trace_create_file("tracing_enabled", 0644, d_tracer, | |
36 | &global_trace, &tracing_ctrl_fops); | |
37 | --- a/kernel/trace/trace_stack.c | |
38 | +++ b/kernel/trace/trace_stack.c | |
39 | @@ -433,6 +433,8 @@ static __init int stack_trace_init(void) | |
40 | struct dentry *d_tracer; | |
41 | ||
42 | d_tracer = tracing_init_dentry(); | |
43 | + if (!d_tracer) | |
44 | + return 0; | |
45 | ||
46 | trace_create_file("stack_max_size", 0644, d_tracer, | |
47 | &max_stack_size, &stack_max_size_fops); | |
48 | --- a/kernel/trace/trace_stat.c | |
49 | +++ b/kernel/trace/trace_stat.c | |
50 | @@ -307,6 +307,8 @@ static int tracing_stat_init(void) | |
51 | struct dentry *d_tracing; | |
52 | ||
53 | d_tracing = tracing_init_dentry(); | |
54 | + if (!d_tracing) | |
55 | + return 0; | |
56 | ||
57 | stat_dir = debugfs_create_dir("trace_stat", d_tracing); | |
58 | if (!stat_dir) |