public inbox for linux-kernel@vger.kernel.org
 help / color / mirror / Atom feed
From: Li Zefan <lizf@cn.fujitsu.com>
To: Ingo Molnar <mingo@elte.hu>
Cc: Tom Zanussi <tzanussi@gmail.com>,
	Steven Rostedt <rostedt@goodmis.org>,
	Frederic Weisbecker <fweisbec@gmail.com>,
	LKML <linux-kernel@vger.kernel.org>
Subject: [PATCH 1/7] tracing/filters: NUL-terminate user input filter
Date: Sat, 11 Apr 2009 15:52:18 +0800	[thread overview]
Message-ID: <49E04C32.6060508@cn.fujitsu.com> (raw)
In-Reply-To: <49E04C22.4040608@cn.fujitsu.com>

Make sure messages from user space are NUL-terminated strings,
otherwise we could dump random memory while reading filter file.

Try this:
 # echo 'parent_comm ==' > events/sched/sched_process_fork/filter
 # cat events/sched/sched_process_fork/filter
 parent_comm == �

Signed-off-by: Li Zefan <lizf@cn.fujitsu.com>
---
 kernel/trace/trace_events.c |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/kernel/trace/trace_events.c b/kernel/trace/trace_events.c
index 64ec4d2..054bc18 100644
--- a/kernel/trace/trace_events.c
+++ b/kernel/trace/trace_events.c
@@ -503,6 +503,7 @@ event_filter_write(struct file *filp, const char __user *ubuf, size_t cnt,
 
 	if (copy_from_user(&buf, ubuf, cnt))
 		return -EFAULT;
+	buf[cnt] = '\0';
 
 	pred = kzalloc(sizeof(*pred), GFP_KERNEL);
 	if (!pred)
@@ -569,6 +570,7 @@ subsystem_filter_write(struct file *filp, const char __user *ubuf, size_t cnt,
 
 	if (copy_from_user(&buf, ubuf, cnt))
 		return -EFAULT;
+	buf[cnt] = '\0';
 
 	pred = kzalloc(sizeof(*pred), GFP_KERNEL);
 	if (!pred)
-- 
1.5.4.rc3


  reply	other threads:[~2009-04-11  7:51 UTC|newest]

Thread overview: 21+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2009-04-11  7:52 [PATCH 0/7] tracing: bug fixes for tracing/filters Li Zefan
2009-04-11  7:52 ` Li Zefan [this message]
2009-04-11  7:52 ` [PATCH 2/7] tracing/filters: fix NULL pointer dereference Li Zefan
2009-04-12 10:06   ` [tip:tracing/urgent] " Li Zefan
2009-04-11  7:52 ` [PATCH 3/7] tracing/filters: allow user input integer to be oct or hex Li Zefan
2009-04-12 10:06   ` [tip:tracing/urgent] " Li Zefan
2009-04-11  7:53 ` [PATCH 4/7] tracing/filters: allow user to specify a filter val to be string Li Zefan
2009-04-11 14:35   ` Frederic Weisbecker
2009-04-12 10:04     ` Ingo Molnar
2009-04-13  1:37     ` Li Zefan
2009-04-13  3:45       ` Ingo Molnar
2009-04-11  7:55 ` [PATCH 5/7] tracing/filters: disallow newline as delimeter Li Zefan
2009-04-11  7:55 ` [PATCH 6/7] tracing/filters: return proper error code when writing filter file Li Zefan
2009-04-12 10:07   ` [tip:tracing/urgent] " Li Zefan
2009-04-11  7:55 ` [PATCH 7/7] tracing/filters: make filter preds RCU safe Li Zefan
2009-04-11  9:30 ` [PATCH 0/7] tracing: bug fixes for tracing/filters Tom Zanussi
2009-04-11 10:08   ` Li Zefan
2009-04-11 14:48   ` Frederic Weisbecker
2009-04-11 17:36     ` Paul E. McKenney
2009-04-11 17:58     ` Tom Zanussi
2009-04-12 10:02     ` Ingo Molnar

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=49E04C32.6060508@cn.fujitsu.com \
    --to=lizf@cn.fujitsu.com \
    --cc=fweisbec@gmail.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=mingo@elte.hu \
    --cc=rostedt@goodmis.org \
    --cc=tzanussi@gmail.com \
    /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