2009-06-22 02:33:03

by 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 <[email protected]>
---
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

2009-07-20 15:59:26

by Steven Rostedt

Subject: Re: [PATCH] tracing: cleanup for tracing_trace_options_read()

On Mon, 22 Jun 2009, Xiao Guangrong wrote:

> '\n' is already appended, and what we need is just an extra
> space for the '\0'.

Hi Xiao,

I'm going through old email (or email lost in the shuffle) and I came
across this lost patch. I'll go ahead an apply it.

Thanks,

-- Steve


>
> Signed-off-by: Xiao Guangrong <[email protected]>
> ---
> 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
>
>