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> LKML-Reference: <4A3EED63.3090908@cn.fujitsu.com> Signed-off-by: Steven Rostedt <rostedt@goodmis.org>
This commit is contained in:
committed by
Steven Rostedt
parent
7d536cb3fb
commit
ff4e9da233
@@ -2256,8 +2256,8 @@ tracing_trace_options_read(struct file *filp, char __user *ubuf,
|
|||||||
len += 3; /* "no" and newline */
|
len += 3; /* "no" and newline */
|
||||||
}
|
}
|
||||||
|
|
||||||
/* +2 for \n and \0 */
|
/* +1 for \0 */
|
||||||
buf = kmalloc(len + 2, GFP_KERNEL);
|
buf = kmalloc(len + 1, GFP_KERNEL);
|
||||||
if (!buf) {
|
if (!buf) {
|
||||||
mutex_unlock(&trace_types_lock);
|
mutex_unlock(&trace_types_lock);
|
||||||
return -ENOMEM;
|
return -ENOMEM;
|
||||||
@@ -2280,7 +2280,7 @@ tracing_trace_options_read(struct file *filp, char __user *ubuf,
|
|||||||
}
|
}
|
||||||
mutex_unlock(&trace_types_lock);
|
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);
|
r = simple_read_from_buffer(ubuf, cnt, ppos, buf, r);
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user