tracing fixes
Linus,
Please pull the latest tracing-fixes-for-linus git tree from:
git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip.git tracing-fixes-for-linus
Thanks,
Ingo
------------------>
Anton Blanchard (1):
tracing/workqueue: Use %pf in workqueue trace events
Ingo Molnar (1):
modules, tracing: Remove stale struct marker signature from module_layout()
Li Hong (1):
tracing: Fix a comment and a trivial format issue in tracepoint.h
Li Zefan (4):
tracing: Fix off-by-one in trace_get_user()
tracing: Check the return value of trace_get_user()
tracing: Fix failure path in ftrace_graph_write()
tracing: Fix failure path in ftrace_regex_open()
include/linux/tracepoint.h | 4 ++-- include/trace/events/workqueue.h | 4 ++-- kernel/module.c | 1 - kernel/trace/ftrace.c | 23 +++++++++++++---------- kernel/trace/trace.c | 2 +- kernel/trace/trace_events.c | 7 +++---- 6 files changed, 21 insertions(+), 20 deletions(-)
include/linux/tracepoint.h +2 -2
@@ -4,7 +4,7 @@/* * Kernel Tracepoint API. * -* See Documentation/tracepoint.txt. +* See Documentation/trace/tracepoints.txt. * * (C) Copyright 2008 Mathieu Desnoyers <[email protected]> *
@@ -36,7 +36,7 @@ struct tracepoint {#ifndef DECLARE_TRACE #define TP_PROTO(args...) args -#define TP_ARGS(args...) args +#define TP_ARGS(args...) args#ifdef CONFIG_TRACEPOINTS
include/trace/events/workqueue.h +2 -2
@@ -26,7 +26,7 @@ TRACE_EVENT(workqueue_insertion, __entry->func = work->func; ), -TP_printk ("thread=%s:%d func=%pF" , __entry->thread_comm, +TP_printk ("thread=%s:%d func=%pf" , __entry->thread_comm, __entry->thread_pid, __entry->func) );
@@ -48,7 +48,7 @@ TRACE_EVENT(workqueue_execution, __entry->func = work->func; ), -TP_printk ("thread=%s:%d func=%pF" , __entry->thread_comm, +TP_printk ("thread=%s:%d func=%pf" , __entry->thread_comm, __entry->thread_pid, __entry->func) );
kernel/module.c +0 -1
@@ -2947,7 +2947,6 @@ void module_layout(struct module *mod,struct modversion_info *ver, struct kernel_param *kp, struct kernel_symbol *ks, - struct marker *marker, struct tracepoint *tp) { }
kernel/trace/ftrace.c +13 -10
@@ -1621,8 +1621,10 @@ ftrace_regex_open(struct inode *inode, struct file *file, int enable)if (!ret) {struct seq_file *m = file->private_data; m->private = iter; - }else + }else { +trace_parser_put (&iter->parser);kfree (iter); + } }else file->private_data = iter;mutex_unlock (&ftrace_regex_lock);
@@ -2202,7 +2204,7 @@ ftrace_regex_write(struct file *file, const char __user *ubuf,struct trace_parser *parser;ssize_t ret, read; -if (!cnt || cnt <0 ) +if (!cnt)return 0 ;mutex_lock (&ftrace_regex_lock);
@@ -2216,7 +2218,7 @@ ftrace_regex_write(struct file *file, const char __user *ubuf, parser = &iter->parser; read =trace_get_user (parser, ubuf, cnt, ppos); -if (trace_parser_loaded (parser) && +if (read >=0 &&trace_parser_loaded (parser) && !trace_parser_cont (parser)) { ret =ftrace_process_regex (parser->buffer, parser->idx, enable);
@@ -2552,8 +2554,7 @@ ftrace_graph_write(struct file *file, const char __user *ubuf, size_t cnt, loff_t *ppos) { struct trace_parser parser; -size_t read =0 ; -ssize_t ret; +ssize_t read, ret;if (!cnt || cnt <0 )return 0 ;
@@ -2562,29 +2563,31 @@ ftrace_graph_write(struct file *file, const char __user *ubuf,if (ftrace_graph_count >=FTRACE_GRAPH_MAX_FUNCS ) { ret = -EBUSY ; - goto out; + goto out_unlock; }if (trace_parser_get_init (&parser,FTRACE_BUFF_MAX )) { ret = -ENOMEM ; - goto out; + goto out_unlock; } read =trace_get_user (&parser, ubuf, cnt, ppos); -if (trace_parser_loaded ((&parser))) { +if (read >=0 &&trace_parser_loaded ((&parser))) { parser.buffer[parser.idx] =0 ;/* we allow only one expression at a time */ ret =ftrace_set_func (ftrace_graph_funcs, &ftrace_graph_count, parser.buffer);if (ret) - goto out; + goto out_free; } ret = read; - out: + +out_free:trace_parser_put (&parser); +out_unlock:mutex_unlock (&graph_lock);return ret;
kernel/trace/trace.c +1 -1
@@ -415,7 +415,7 @@ int trace_get_user(struct trace_parser *parser, const char __user *ubuf,/* read the non-space input */ while (cnt && !isspace (ch)) { -if (parser->idx < parser->size) +if (parser->idx < parser->size -1 ) parser->buffer[parser->idx++] = ch;else { ret = -EINVAL ;
kernel/trace/trace_events.c +3 -4
@@ -232,10 +232,9 @@ ftrace_event_write(struct file *file, const char __user *ubuf, size_t cnt, loff_t *ppos) { struct trace_parser parser; -size_t read =0 ; -ssize_t ret; +ssize_t read, ret; -if (!cnt || cnt <0 ) +if (!cnt)return 0 ; ret =tracing_update_buffers ();
@@ -247,7 +246,7 @@ ftrace_event_write(struct file *file, const char __user *ubuf, read =trace_get_user (&parser, ubuf, cnt, ppos); -if (trace_parser_loaded ((&parser))) { +if (read >=0 &&trace_parser_loaded ((&parser))) {int set =1 ;if (*parser.buffer =='!' )