Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753723Ab0G0XVL (ORCPT ); Tue, 27 Jul 2010 19:21:11 -0400 Received: from mail-bw0-f46.google.com ([209.85.214.46]:44225 "EHLO mail-bw0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751031Ab0G0XVF (ORCPT ); Tue, 27 Jul 2010 19:21:05 -0400 DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=date:from:to:cc:subject:message-id:references:mime-version :content-type:content-disposition:in-reply-to:user-agent; b=fWw7VebhnbEOCtBeY5L9sKn7Ywk2T5cZ35IbtgusJEXF5TwRiXMmqViXMUwW1hU9Bw Bf1WzCeM+smoIoG4k2Ikc8kghc/+9ulSrYmtUBJaYmOrLD7F3IC/kWjRERR7qtUHnhcZ hWh6p6A2qiPDkRJpPPuQP37nnPXhpjZrsOyI4= Date: Wed, 28 Jul 2010 01:18:01 +0200 From: Marcin Slusarz To: LKML Cc: Steven Rostedt , Frederic Weisbecker , Ingo Molnar , Emil Velikov Subject: [PATCH v2] tracing: sanitize value returned from write(trace_marker, "...", len) Message-ID: <20100727231801.GB2826@joi.lan> References: <20100727230636.GA2826@joi.lan> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20100727230636.GA2826@joi.lan> User-Agent: Mutt/1.5.20 (2009-06-14) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2252 Lines: 85 Now with corrected changelog. --- From: Marcin Slusarz 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 Cc: Steven Rostedt Cc: Frederic Weisbecker Cc: Ingo Molnar --- 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 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/