tracing: Another fix by Namhyung
Subsystems (3)
Steven Rostedt
maintainerLinus,
Namhyung found and fixed another nasty bug, where you can crash the kernel with: echo 1234 | tee -a /sys/kernel/debug/tracing/set_ftrace_pid
Luckily, only root has permissions to write to that file.
I also added a fix on top of Namhyung's as his patch added a reference outside of the DYNAMIC_FTRACE to a function that is only defined in DYNAMIC_FTRACE. This fixes compiling with FUNCTION_TRACING and without DYNAMIC_FTRACE (although I don't know who does that anymore).
-- Steve
Please pull the latest trace-fixes-v3.9-rc-v3 tree, which can be found at:
git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace.git
trace-fixes-v3.9-rc-v3
Head SHA1: 0e1bb617b40659414778baf3203c2ea0dcda1ca7
Namhyung Kim (1):
tracing: Fix possible NULL pointer dereferences
Steven Rostedt (Red Hat) (1):
ftrace: Move ftrace_filter_lseek out of CONFIG_DYNAMIC_FTRACE section
----
include/linux/ftrace.h | 3 ++- kernel/trace/ftrace.c | 36 ++++++++++++++++++------------------ kernel/trace/trace_stack.c | 2 +- 3 files changed, 21 insertions(+), 20 deletions(-)
Steven Rostedt
maintainerPATCH 1/2 tracing: Fix possible NULL pointer dereferences
From: Namhyung Kim <[email protected]>
Currently set_ftrace_pid and set_graph_function files use seq_lseek for their fops. However seq_open() is called only for FMODE_READ in the fops->open() so that if an user tries to seek one of those file when she open it for writing, it sees NULL seq_file and then panic.
It can be easily reproduced with following command:
$ cd /sys/kernel/debug/tracing $ echo 1234 | sudo tee -a set_ftrace_pid
In this example, GNU coreutils' tee opens the file with fopen(, "a") and then the fopen() internally calls lseek().
--- include/linux/ftrace.h | 2 +- kernel/trace/ftrace.c | 10 +++++----- kernel/trace/trace_stack.c | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-)
include/linux/ftrace.h +1 -1
@@ -396,7 +396,7 @@ ssize_t ftrace_filter_write(struct file *file, const char __user *ubuf, size_t cnt, loff_t *ppos);ssize_t ftrace_notrace_write (struct file *file,const char __user *ubuf,size_t cnt,loff_t *ppos); -loff_t ftrace_regex_lseek (struct file *file,loff_t offset,int whence); +loff_t ftrace_filter_lseek (struct file *file,loff_t offset,int whence);int ftrace_regex_release (struct inode *inode,struct file *file);void __init
kernel/trace/ftrace.c +5 -5
@@ -2697,7 +2697,7 @@ ftrace_notrace_open(struct inode *inode, struct file *file) }loff_t -ftrace_regex_lseek (struct file *file,loff_t offset,int whence) +ftrace_filter_lseek (struct file *file,loff_t offset,int whence) {loff_t ret;
@@ -3570,7 +3570,7 @@ static const struct file_operations ftrace_filter_fops = { .open = ftrace_filter_open, .read = seq_read, .write = ftrace_filter_write, - .llseek = ftrace_regex_lseek, + .llseek = ftrace_filter_lseek, .release = ftrace_regex_release, };
@@ -3578,7 +3578,7 @@ static const struct file_operations ftrace_notrace_fops = { .open = ftrace_notrace_open, .read = seq_read, .write = ftrace_notrace_write, - .llseek = ftrace_regex_lseek, + .llseek = ftrace_filter_lseek, .release = ftrace_regex_release, };
@@ -3783,8 +3783,8 @@ static const struct file_operations ftrace_graph_fops = { .open = ftrace_graph_open, .read = seq_read, .write = ftrace_graph_write, + .llseek = ftrace_filter_lseek, .release = ftrace_graph_release, - .llseek = seq_lseek, };#endif /* CONFIG_FUNCTION_GRAPH_TRACER */
@@ -4439,7 +4439,7 @@ static const struct file_operations ftrace_pid_fops = { .open = ftrace_pid_open, .write = ftrace_pid_write, .read = seq_read, - .llseek = seq_lseek, + .llseek = ftrace_filter_lseek, .release = ftrace_pid_release, };
kernel/trace/trace_stack.c +1 -1
@@ -322,7 +322,7 @@ static const struct file_operations stack_trace_filter_fops = { .open = stack_trace_filter_open, .read = seq_read, .write = ftrace_filter_write, - .llseek = ftrace_regex_lseek, + .llseek = ftrace_filter_lseek, .release = ftrace_regex_release, };
Signature · 1 line
1.7.10.4
Steven Rostedt
maintainerPATCH 2/2 ftrace: Move ftrace_filter_lseek out of CONFIG_DYNAMIC_FTRACE section
In reply to Steven RostedtFrom: "Steven Rostedt (Red Hat)" <[email protected]>
As ftrace_filter_lseek is now used with ftrace_pid_fops, it needs to be moved out of the #ifdef CONFIG_DYNAMIC_FTRACE section as the ftrace_pid_fops is defined when DYNAMIC_FTRACE is not.
--- include/linux/ftrace.h | 3 ++- kernel/trace/ftrace.c | 28 ++++++++++++++-------------- 2 files changed, 16 insertions(+), 15 deletions(-)
include/linux/ftrace.h +2 -1
@@ -396,7 +396,6 @@ ssize_t ftrace_filter_write(struct file *file, const char __user *ubuf, size_t cnt, loff_t *ppos);ssize_t ftrace_notrace_write (struct file *file,const char __user *ubuf,size_t cnt,loff_t *ppos); -loff_t ftrace_filter_lseek (struct file *file,loff_t offset,int whence);int ftrace_regex_release (struct inode *inode,struct file *file);void __init
@@ -569,6 +568,8 @@ static inline int ftrace_regex_release(struct inode *inode, struct file *file) { return -ENODEV; }#endif /* CONFIG_DYNAMIC_FTRACE */ +loff_t ftrace_filter_lseek (struct file *file,loff_t offset,int whence); +/* totally disable ftrace - can not re-enable after this */ void ftrace_kill (void );
kernel/trace/ftrace.c +14 -14
@@ -1052,6 +1052,19 @@ static __init void ftrace_profile_debugfs(struct dentry *d_tracer)static struct pid *const ftrace_swapper_pid = &init_struct_pid; +loff_t +ftrace_filter_lseek (struct file *file,loff_t offset,int whence) +{ +loff_t ret; + +if (file->f_mode &FMODE_READ ) + ret =seq_lseek (file, offset, whence); +else + file->f_pos = ret =1 ; + +return ret; +} +#ifdef CONFIG_DYNAMIC_FTRACE #ifndef CONFIG_FTRACE_MCOUNT_RECORD
@@ -2612,7 +2625,7 @@ static void ftrace_filter_reset(struct ftrace_hash *hash)* routine, you can use ftrace_filter_write() for the write * routine if @flag has FTRACE_ITER_FILTER set, or * ftrace_notrace_write() if @flag has FTRACE_ITER_NOTRACE set. -* ftrace_regex_lseek() should be used as the lseek routine, and +* ftrace_filter_lseek() should be used as the lseek routine, and * release must call ftrace_regex_release(). */ int
@@ -2696,19 +2709,6 @@ ftrace_notrace_open(struct inode *inode, struct file *file) inode, file); } -loff_t -ftrace_filter_lseek (struct file *file,loff_t offset,int whence) -{ -loff_t ret; - -if (file->f_mode &FMODE_READ ) - ret =seq_lseek (file, offset, whence); -else - file->f_pos = ret =1 ; - -return ret; -} -static int ftrace_match (char *str,char *regex,int len,int type) {int matched =0 ;
Signature · 1 line
1.7.10.4