aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWang Xiaoqiang <wangxq10@lzu.edu.cn>2016-04-18 03:23:29 -0400
committerSteven Rostedt <rostedt@goodmis.org>2016-04-26 14:42:03 -0400
commit4afe6495e5cb3c352d95f07512cbb227e607e2ce (patch)
tree8b3590a165e3b47f70e33d68db9b059769e7ef88
parent6e4cf657defa8fb06dbf9ed91adb78414758f259 (diff)
tracing: Don't use the address of the buffer array name in copy_from_user
With the following code snippet: ... char buf[64]; ... if (copy_from_user(&buf, ubuf, cnt)) ... Even though the value of "&buf" equals "buf", but there is no need to get the address of the "buf" again. Use "buf" instead of "&buf". Link: http://lkml.kernel.org/r/20160418152329.18b72bea@debian Signed-off-by: Wang Xiaoqiang <wangxq10@lzu.edu.cn> Signed-off-by: Steven Rostedt <rostedt@goodmis.org>
-rw-r--r--kernel/trace/trace.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/kernel/trace/trace.c b/kernel/trace/trace.c
index 5e3ad3481e4b..46028d47d252 100644
--- a/kernel/trace/trace.c
+++ b/kernel/trace/trace.c
@@ -3664,7 +3664,7 @@ tracing_trace_options_write(struct file *filp, const char __user *ubuf,
3664 if (cnt >= sizeof(buf)) 3664 if (cnt >= sizeof(buf))
3665 return -EINVAL; 3665 return -EINVAL;
3666 3666
3667 if (copy_from_user(&buf, ubuf, cnt)) 3667 if (copy_from_user(buf, ubuf, cnt))
3668 return -EFAULT; 3668 return -EFAULT;
3669 3669
3670 buf[cnt] = 0; 3670 buf[cnt] = 0;
@@ -4537,7 +4537,7 @@ tracing_set_trace_write(struct file *filp, const char __user *ubuf,
4537 if (cnt > MAX_TRACER_SIZE) 4537 if (cnt > MAX_TRACER_SIZE)
4538 cnt = MAX_TRACER_SIZE; 4538 cnt = MAX_TRACER_SIZE;
4539 4539
4540 if (copy_from_user(&buf, ubuf, cnt)) 4540 if (copy_from_user(buf, ubuf, cnt))
4541 return -EFAULT; 4541 return -EFAULT;
4542 4542
4543 buf[cnt] = 0; 4543 buf[cnt] = 0;
@@ -5327,7 +5327,7 @@ static ssize_t tracing_clock_write(struct file *filp, const char __user *ubuf,
5327 if (cnt >= sizeof(buf)) 5327 if (cnt >= sizeof(buf))
5328 return -EINVAL; 5328 return -EINVAL;
5329 5329
5330 if (copy_from_user(&buf, ubuf, cnt)) 5330 if (copy_from_user(buf, ubuf, cnt))
5331 return -EFAULT; 5331 return -EFAULT;
5332 5332
5333 buf[cnt] = 0; 5333 buf[cnt] = 0;