Messages in this thread Patch in this message | | | Date | Mon, 22 Jun 2009 10:33:07 +0800 | From | Xiao Guangrong <> | Subject | [PATCH] tracing: cleanup for tracing_trace_options_read() |
| |
'\n' is already appended, and what we need is just an extra space for the '\0'.
Signed-off-by: Xiao Guangrong <xiaoguangrong@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 076fa6f..4c3f856 100644 --- a/kernel/trace/trace.c +++ b/kernel/trace/trace.c @@ -2266,8 +2266,8 @@ tracing_trace_options_read(struct file *filp, char __user *ubuf, len += 3; /* "no" and newline */ } - /* +2 for \n and \0 */ - buf = kmalloc(len + 2, GFP_KERNEL); + /* +1 for \0 */ + buf = kmalloc(len + 1, GFP_KERNEL); if (!buf) { mutex_unlock(&trace_types_lock); return -ENOMEM; @@ -2290,7 +2290,7 @@ tracing_trace_options_read(struct file *filp, char __user *ubuf, } mutex_unlock(&trace_types_lock); - WARN_ON(r >= len + 2); + WARN_ON(r >= len + 1); r = simple_read_from_buffer(ubuf, cnt, ppos, buf, r); -- 1.6.1.2
| |