From: tip-bot for Slava Pestov <slavapestov@google.com>
To: linux-tip-commits@vger.kernel.org
Cc: linux-kernel@vger.kernel.org, hpa@zytor.com, mingo@redhat.com,
rostedt@goodmis.org, stable@kernel.org, tglx@linutronix.de,
slavapestov@google.com
Subject: [tip:perf/urgent] tracing: Fix panic when lseek() called on "trace" opened for writing
Date: Thu, 16 Dec 2010 08:21:45 GMT [thread overview]
Message-ID: <tip-364829b1263b44aa60383824e4c1289d83d78ca7@git.kernel.org> (raw)
In-Reply-To: <1290640396-24179-1-git-send-email-slavapestov@google.com>
Commit-ID: 364829b1263b44aa60383824e4c1289d83d78ca7
Gitweb: http://git.kernel.org/tip/364829b1263b44aa60383824e4c1289d83d78ca7
Author: Slava Pestov <slavapestov@google.com>
AuthorDate: Wed, 24 Nov 2010 15:13:16 -0800
Committer: Steven Rostedt <rostedt@goodmis.org>
CommitDate: Tue, 30 Nov 2010 12:18:17 -0500
tracing: Fix panic when lseek() called on "trace" opened for writing
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.
Cc: <stable@kernel.org>
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>
---
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 ee6a733..21db0de 100644
--- a/kernel/trace/trace.c
+++ b/kernel/trace/trace.c
@@ -2339,11 +2339,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,
};
prev parent reply other threads:[~2010-12-16 8:22 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-11-24 23:13 [PATCH] ftrace: " Slava Pestov
2010-11-24 23:34 ` David Sharp
2010-12-16 8:21 ` tip-bot for Slava Pestov [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=tip-364829b1263b44aa60383824e4c1289d83d78ca7@git.kernel.org \
--to=slavapestov@google.com \
--cc=hpa@zytor.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-tip-commits@vger.kernel.org \
--cc=mingo@redhat.com \
--cc=rostedt@goodmis.org \
--cc=stable@kernel.org \
--cc=tglx@linutronix.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
Powered by JetHome