diff options
| author | Slava Pestov <slavapestov@google.com> | 2010-11-24 15:13:16 -0800 |
|---|---|---|
| committer | Paul Gortmaker <paul.gortmaker@windriver.com> | 2011-04-17 16:16:10 -0400 |
| commit | ae621e2431fa476dcbe1daf1d9d278085b0e95e3 (patch) | |
| tree | 9bfe38f6d4f0cbc4ff75e9986d6f3f061034b32c /kernel | |
| parent | 3b1c91ceeaa02ca5fac9312eed959253297a01b7 (diff) | |
tracing: Fix panic when lseek() called on "trace" opened for writing
commit 364829b1263b44aa60383824e4c1289d83d78ca7 upstream.
The file_ops struct for the "trace" special file defined llseek as seq_lseek().
However, if the file was opened for writing only, seq_open() was not called,
and the seek would dereference a null pointer, file->private_data.
This patch introduces a new wrapper for seq_lseek() which checks if the file
descriptor is opened for reading first. If not, it does nothing.
Signed-off-by: Slava Pestov <slavapestov@google.com>
LKML-Reference: <1290640396-24179-1-git-send-email-slavapestov@google.com>
Signed-off-by: Steven Rostedt <rostedt@goodmis.org>
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
Diffstat (limited to 'kernel')
| -rw-r--r-- | kernel/trace/trace.c | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/kernel/trace/trace.c b/kernel/trace/trace.c index 44f916a04065..eb76a22387e0 100644 --- a/kernel/trace/trace.c +++ b/kernel/trace/trace.c @@ -2341,11 +2341,19 @@ tracing_write_stub(struct file *filp, const char __user *ubuf, return count; } +static loff_t tracing_seek(struct file *file, loff_t offset, int origin) +{ + if (file->f_mode & FMODE_READ) + return seq_lseek(file, offset, origin); + else + return 0; +} + static const struct file_operations tracing_fops = { .open = tracing_open, .read = seq_read, .write = tracing_write_stub, - .llseek = seq_lseek, + .llseek = tracing_seek, .release = tracing_release, }; |