Messages in this thread Patch in this message | | | Date | Sun, 12 Apr 2009 10:06:59 GMT | From | Li Zefan <> | Subject | [tip:tracing/urgent] tracing/filters: allow user input integer to be oct or hex |
| |
Commit-ID: a3e0ab050774117d4a6173087c8bf3888662a83f Gitweb: http://git.kernel.org/tip/a3e0ab050774117d4a6173087c8bf3888662a83f Author: Li Zefan <lizf@cn.fujitsu.com> AuthorDate: Sat, 11 Apr 2009 15:52:51 +0800 Committer: Ingo Molnar <mingo@elte.hu> CommitDate: Sun, 12 Apr 2009 11:59:28 +0200
tracing/filters: allow user input integer to be oct or hex
Before patch:
# echo 'parent_pid == 0x10' > events/sched/sched_process_fork/filter # cat sched/sched_process_fork/filter parent_pid == 0
After patch:
# cat sched/sched_process_fork/filter parent_pid == 16
Also check the input more strictly.
Signed-off-by: Li Zefan <lizf@cn.fujitsu.com> Acked-by: Tom Zanussi <tzanussi@gmail.com> Acked-by: Frederic Weisbecker <fweisbec@gmail.com> Cc: Steven Rostedt <rostedt@goodmis.org> LKML-Reference: <49E04C53.4010600@cn.fujitsu.com> Signed-off-by: Ingo Molnar <mingo@elte.hu>
--- kernel/trace/trace_events_filter.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/kernel/trace/trace_events_filter.c b/kernel/trace/trace_events_filter.c index 9d2162f..49b3ef5 100644 --- a/kernel/trace/trace_events_filter.c +++ b/kernel/trace/trace_events_filter.c @@ -419,12 +419,13 @@ int filter_parse(char **pbuf, struct filter_pred *pred) if (!pred->field_name) return -ENOMEM; - pred->val = simple_strtoull(val_str, &tmp, 10); + pred->val = simple_strtoull(val_str, &tmp, 0); if (tmp == val_str) { pred->str_val = kstrdup(val_str, GFP_KERNEL); if (!pred->str_val) return -ENOMEM; - } + } else if (*tmp != '\0') + return -EINVAL; return 0; }
| |