diff options
| author | Tom Zanussi <tzanussi@gmail.com> | 2009-03-24 07:14:42 (GMT) |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-03-24 07:26:52 (GMT) |
| commit | 9f58a159d022c8f2533a27708aa267adf4f0e3ce (patch) | |
| tree | 471fb100abead729ccfbfcc206fb0d5daa03f1c5 /kernel/trace/trace_events_filter.c | |
| parent | 4bda2d517bfa3ce3d7044e06988cdddae7adffe2 (diff) | |
| download | linux-fsl-qoriq-9f58a159d022c8f2533a27708aa267adf4f0e3ce.tar.xz | |
tracing/filters: disallow integer values for string filters and vice versa
Impact: fix filter use boundary condition / crash
Make sure filters for string fields don't use integer values and vice
versa. Getting it wrong can crash the system or produce bogus
results.
Signed-off-by: Tom Zanussi <tzanussi@gmail.com>
Cc: Steven Rostedt <rostedt@goodmis.org>
Cc: =?ISO-8859-1?Q?Fr=E9d=E9ric?= Weisbecker <fweisbec@gmail.com>
LKML-Reference: <1237878882.8339.61.camel@charm-linux>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'kernel/trace/trace_events_filter.c')
| -rw-r--r-- | kernel/trace/trace_events_filter.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/kernel/trace/trace_events_filter.c b/kernel/trace/trace_events_filter.c index 9fca8bb..026be41 100644 --- a/kernel/trace/trace_events_filter.c +++ b/kernel/trace/trace_events_filter.c @@ -237,9 +237,14 @@ int filter_add_pred(struct ftrace_event_call *call, struct filter_pred *pred) pred->offset = field->offset; if (is_string_field(field->type)) { + if (!pred->str_val) + return -EINVAL; pred->fn = filter_pred_string; pred->str_len = field->size; return __filter_add_pred(call, pred); + } else { + if (pred->str_val) + return -EINVAL; } switch (field->size) { |