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: Steven Rostedt <rostedt@goodmis.org>,
	Frederic Weisbecker <fweisbec@gmail.com>,
	LKML <linux-kernel@vger.kernel.org>
Subject: [PATCH 1/4] tracing: fix a typo in tracing_cpumask_write()
Date: Mon, 15 Jun 2009 10:56:42 +0800	[thread overview]
Message-ID: <4A35B86A.7070608@cn.fujitsu.com> (raw)
In-Reply-To: <4A35B84B.40904@cn.fujitsu.com>

It's tracing_cpumask_new that should be kfree()ed.

This causes tracing_cpumask to be freed due to the typo:

 # echo z > tracing_cpumask
 bash: echo: write error: Invalid argument

And subsequent reads/writes to tracing_cpuamsk will access this
already-freed tracing_cpumask, thus may lead to crash.

[ Impact: fix leak and crash when writing invalid val to tracing_cpumask ]

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

diff --git a/kernel/trace/trace.c b/kernel/trace/trace.c
index 8acd9b8..7355a38 100644
--- a/kernel/trace/trace.c
+++ b/kernel/trace/trace.c
@@ -2191,11 +2191,12 @@ tracing_cpumask_write(struct file *filp, const char __user *ubuf,
 	if (!alloc_cpumask_var(&tracing_cpumask_new, GFP_KERNEL))
 		return -ENOMEM;
 
-	mutex_lock(&tracing_cpumask_update_lock);
 	err = cpumask_parse_user(ubuf, count, tracing_cpumask_new);
 	if (err)
 		goto err_unlock;
 
+	mutex_lock(&tracing_cpumask_update_lock);
+
 	local_irq_disable();
 	__raw_spin_lock(&ftrace_max_lock);
 	for_each_tracing_cpu(cpu) {
@@ -2223,8 +2224,7 @@ tracing_cpumask_write(struct file *filp, const char __user *ubuf,
 	return count;
 
 err_unlock:
-	mutex_unlock(&tracing_cpumask_update_lock);
-	free_cpumask_var(tracing_cpumask);
+	free_cpumask_var(tracing_cpumask_new);
 
 	return err;
 }
-- 
1.5.4.rc3


  reply	other threads:[~2009-06-15  2:55 UTC|newest]

Thread overview: 11+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2009-06-15  2:56 [PATCH 0/4] tracing: some fixes for 2.6.31 Li Zefan
2009-06-15  2:56 ` Li Zefan [this message]
2009-06-15 18:13   ` [tip:tracing/urgent] tracing: fix a typo in tracing_cpumask_write() tip-bot for Li Zefan
2009-06-15  2:57 ` [PATCH 2/4] tracing: replace a GFP_ATOMIC with GFP_KERNEL allocation Li Zefan
2009-06-15 18:13   ` [tip:tracing/urgent] " tip-bot for Li Zefan
2009-06-15  2:58 ` [PATCH 3/4] tracing/filters: operand can be negative Li Zefan
2009-06-15 18:13   ` [tip:tracing/urgent] " tip-bot for Li Zefan
2009-06-15  2:59 ` [PATCH 4/4] tracing/filters: strloc should be unsigned short Li Zefan
2009-06-15 18:13   ` [tip:tracing/urgent] " tip-bot for Li Zefan
2009-06-15 12:21 ` [PATCH 0/4] tracing: some fixes for 2.6.31 Frederic Weisbecker
2009-06-15 12:48   ` Steven Rostedt

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=4A35B86A.7070608@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 \
    /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