From fad4e286ca995ac372f76c6cca3c2103361534c4 Mon Sep 17 00:00:00 2001 From: Steven Rostedt Date: Tue, 28 Oct 2008 10:44:24 -0400 Subject: [PATCH] --- yaml --- r: 118017 b: refs/heads/master c: 60063a66236c15f5613f91390631e06718689782 h: refs/heads/master i: 118015: c3f2c6a91235f43cc864c047f661b10db136737e v: v3 --- [refs] | 2 +- trunk/kernel/trace/trace.c | 7 ++++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 495609af9ba8..fc457f889a33 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 21798a84ab383cdac0e7ee3368e0792b718b867d +refs/heads/master: 60063a66236c15f5613f91390631e06718689782 diff --git a/trunk/kernel/trace/trace.c b/trunk/kernel/trace/trace.c index bc577dcc0e47..a610ca771558 100644 --- a/trunk/kernel/trace/trace.c +++ b/trunk/kernel/trace/trace.c @@ -2377,9 +2377,10 @@ tracing_set_trace_write(struct file *filp, const char __user *ubuf, int i; size_t ret; + ret = cnt; + if (cnt > max_tracer_type_len) cnt = max_tracer_type_len; - ret = cnt; if (copy_from_user(&buf, ubuf, cnt)) return -EFAULT; @@ -2412,8 +2413,8 @@ tracing_set_trace_write(struct file *filp, const char __user *ubuf, out: mutex_unlock(&trace_types_lock); - if (ret == cnt) - filp->f_pos += cnt; + if (ret > 0) + filp->f_pos += ret; return ret; }