* [PATCH] tracing: sanitize value returned from write(trace_marker, "...", len)
@ 2010-07-27 23:06 Marcin Slusarz
2010-07-27 23:18 ` [PATCH v2] " Marcin Slusarz
0 siblings, 1 reply; 3+ messages in thread
From: Marcin Slusarz @ 2010-07-27 23:06 UTC (permalink / raw)
To: LKML; +Cc: Steven Rostedt, Frederic Weisbecker, Ingo Molnar, Emil Velikov
When userspace code writes non-new-line-terminated string to trace_marker
file, write handler appends new-line and returns number of bytes written
to trace buffer, so
write(fd, "abc", 3) will return 4
That's unexpected and unfortunately it confuses glibc's fprintf function.
Example:
int main() {
fprintf(stderr, "abc");
return 0;
}
results in infinite loop:
write(fd, "abc", 3) = 4
write(fd, "", 1) = 0
write(fd, "", 1) = 0
write(fd, "", 1) = 0
write(fd, "", 1) = 0
write(fd, "", 1) = 0
write(fd, "", 1) = 0
write(fd, "", 1) = 0
(...)
...and kernel trace buffer full of empty markers.
Fix it by sanitizing write return value.
Signed-off-by: Marcin Slusarz <marcin.slusarz@gmail.com>
Cc: Steven Rostedt <rostedt@goodmis.org>
Cc: Frederic Weisbecker <fweisbec@gmail.com>
Cc: Ingo Molnar <mingo@redhat.com>
---
kernel/trace/trace.c | 11 ++++++++---
1 files changed, 8 insertions(+), 3 deletions(-)
diff --git a/kernel/trace/trace.c b/kernel/trace/trace.c
index 02e04c8..6b39aa8 100644
--- a/kernel/trace/trace.c
+++ b/kernel/trace/trace.c
@@ -3499,6 +3499,7 @@ tracing_mark_write(struct file *filp, const char __user *ubuf,
size_t cnt, loff_t *fpos)
{
char *buf;
+ size_t written;
if (tracing_disabled)
return -EINVAL;
@@ -3520,11 +3521,15 @@ tracing_mark_write(struct file *filp, const char __user *ubuf,
} else
buf[cnt] = '\0';
- cnt = mark_printk("%s", buf);
+ written = mark_printk("%s", buf);
kfree(buf);
- *fpos += cnt;
+ *fpos += written;
- return cnt;
+ /* don't tell userspace we wrote more - it might confuse them */
+ if (written > cnt)
+ written = cnt;
+
+ return written;
}
static int tracing_clock_show(struct seq_file *m, void *v)
--
1.7.1.1
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [PATCH v2] tracing: sanitize value returned from write(trace_marker, "...", len)
2010-07-27 23:06 [PATCH] tracing: sanitize value returned from write(trace_marker, "...", len) Marcin Slusarz
@ 2010-07-27 23:18 ` Marcin Slusarz
2010-08-16 17:31 ` [tip:perf/urgent] tracing: Sanitize " tip-bot for Marcin Slusarz
0 siblings, 1 reply; 3+ messages in thread
From: Marcin Slusarz @ 2010-07-27 23:18 UTC (permalink / raw)
To: LKML; +Cc: Steven Rostedt, Frederic Weisbecker, Ingo Molnar, Emil Velikov
Now with corrected changelog.
---
From: Marcin Slusarz <marcin.slusarz@gmail.com>
Subject: [PATCH] tracing: sanitize value returned from write(trace_marker, "...", len)
When userspace code writes non-new-line-terminated string to trace_marker
file, write handler appends new-line and returns number of bytes written
to trace buffer, so
write(fd, "abc", 3) will return 4
That's unexpected and unfortunately it confuses glibc's fprintf function.
Example:
int main() {
fprintf(stderr, "abc");
return 0;
}
$ gcc test.c -o test
$ echo mmiotrace > /sys/kernel/debug/tracing/current_tracer
$ ./test 2>/sys/kernel/debug/tracing/trace_marker
results in infinite loop:
write(fd, "abc", 3) = 4
write(fd, "", 1) = 0
write(fd, "", 1) = 0
write(fd, "", 1) = 0
write(fd, "", 1) = 0
write(fd, "", 1) = 0
write(fd, "", 1) = 0
write(fd, "", 1) = 0
(...)
...and kernel trace buffer full of empty markers.
Fix it by sanitizing write return value.
Signed-off-by: Marcin Slusarz <marcin.slusarz@gmail.com>
Cc: Steven Rostedt <rostedt@goodmis.org>
Cc: Frederic Weisbecker <fweisbec@gmail.com>
Cc: Ingo Molnar <mingo@redhat.com>
---
kernel/trace/trace.c | 11 ++++++++---
1 files changed, 8 insertions(+), 3 deletions(-)
diff --git a/kernel/trace/trace.c b/kernel/trace/trace.c
index 02e04c8..6b39aa8 100644
--- a/kernel/trace/trace.c
+++ b/kernel/trace/trace.c
@@ -3499,6 +3499,7 @@ tracing_mark_write(struct file *filp, const char __user *ubuf,
size_t cnt, loff_t *fpos)
{
char *buf;
+ size_t written;
if (tracing_disabled)
return -EINVAL;
@@ -3520,11 +3521,15 @@ tracing_mark_write(struct file *filp, const char __user *ubuf,
} else
buf[cnt] = '\0';
- cnt = mark_printk("%s", buf);
+ written = mark_printk("%s", buf);
kfree(buf);
- *fpos += cnt;
+ *fpos += written;
- return cnt;
+ /* don't tell userspace we wrote more - it might confuse them */
+ if (written > cnt)
+ written = cnt;
+
+ return written;
}
static int tracing_clock_show(struct seq_file *m, void *v)
--
1.7.1.1
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [tip:perf/urgent] tracing: Sanitize value returned from write(trace_marker, "...", len)
2010-07-27 23:18 ` [PATCH v2] " Marcin Slusarz
@ 2010-08-16 17:31 ` tip-bot for Marcin Slusarz
0 siblings, 0 replies; 3+ messages in thread
From: tip-bot for Marcin Slusarz @ 2010-08-16 17:31 UTC (permalink / raw)
To: linux-tip-commits
Cc: linux-kernel, hpa, mingo, fweisbec, rostedt, marcin.slusarz, tglx
Commit-ID: 1aa54bca6ee0d07ebcafb8ca8074b624d80724aa
Gitweb: http://git.kernel.org/tip/1aa54bca6ee0d07ebcafb8ca8074b624d80724aa
Author: Marcin Slusarz <marcin.slusarz@gmail.com>
AuthorDate: Wed, 28 Jul 2010 01:18:01 +0200
Committer: Steven Rostedt <rostedt@goodmis.org>
CommitDate: Fri, 13 Aug 2010 15:23:16 -0400
tracing: Sanitize value returned from write(trace_marker, "...", len)
When userspace code writes non-new-line-terminated string to trace_marker
file, write handler appends new-line and returns number of bytes written
to trace buffer, so
write(fd, "abc", 3) will return 4
That's unexpected and unfortunately it confuses glibc's fprintf function.
Example:
int main() {
fprintf(stderr, "abc");
return 0;
}
$ gcc test.c -o test
$ echo mmiotrace > /sys/kernel/debug/tracing/current_tracer
$ ./test 2>/sys/kernel/debug/tracing/trace_marker
results in infinite loop:
write(fd, "abc", 3) = 4
write(fd, "", 1) = 0
write(fd, "", 1) = 0
write(fd, "", 1) = 0
write(fd, "", 1) = 0
write(fd, "", 1) = 0
write(fd, "", 1) = 0
write(fd, "", 1) = 0
(...)
...and kernel trace buffer full of empty markers.
Fix it by sanitizing write return value.
Signed-off-by: Marcin Slusarz <marcin.slusarz@gmail.com>
LKML-Reference: <20100727231801.GB2826@joi.lan>
Cc: Frederic Weisbecker <fweisbec@gmail.com>
Cc: Ingo Molnar <mingo@redhat.com>
Signed-off-by: Steven Rostedt <rostedt@goodmis.org>
---
kernel/trace/trace.c | 11 ++++++++---
1 files changed, 8 insertions(+), 3 deletions(-)
diff --git a/kernel/trace/trace.c b/kernel/trace/trace.c
index 086d363..88b42d1 100644
--- a/kernel/trace/trace.c
+++ b/kernel/trace/trace.c
@@ -3498,6 +3498,7 @@ tracing_mark_write(struct file *filp, const char __user *ubuf,
size_t cnt, loff_t *fpos)
{
char *buf;
+ size_t written;
if (tracing_disabled)
return -EINVAL;
@@ -3519,11 +3520,15 @@ tracing_mark_write(struct file *filp, const char __user *ubuf,
} else
buf[cnt] = '\0';
- cnt = mark_printk("%s", buf);
+ written = mark_printk("%s", buf);
kfree(buf);
- *fpos += cnt;
+ *fpos += written;
- return cnt;
+ /* don't tell userspace we wrote more - it might confuse them */
+ if (written > cnt)
+ written = cnt;
+
+ return written;
}
static int tracing_clock_show(struct seq_file *m, void *v)
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2010-08-16 17:32 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2010-07-27 23:06 [PATCH] tracing: sanitize value returned from write(trace_marker, "...", len) Marcin Slusarz
2010-07-27 23:18 ` [PATCH v2] " Marcin Slusarz
2010-08-16 17:31 ` [tip:perf/urgent] tracing: Sanitize " tip-bot for Marcin Slusarz
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox