projects
/
openwrt
/
staging
/
blogic.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
07d777f
)
tracing: Remove an unneeded check in trace_seq_buffer()
author
Dan Carpenter
<
[email protected]
>
Fri, 20 Apr 2012 06:31:45 +0000
(09:31 +0300)
committer
Steven Rostedt
<
[email protected]
>
Tue, 24 Apr 2012 01:16:10 +0000
(21:16 -0400)
memcpy() returns a pointer to "bug". Hopefully, it's not NULL here or
we would already have Oopsed.
Link:
http://lkml.kernel.org/r/
[email protected]
Cc: Frederic Weisbecker <
[email protected]
>
Cc: Eduard - Gabriel Munteanu <
[email protected]
>
Signed-off-by: Dan Carpenter <
[email protected]
>
Signed-off-by: Steven Rostedt <
[email protected]
>
kernel/trace/trace.c
patch
|
blob
|
history
diff --git
a/kernel/trace/trace.c
b/kernel/trace/trace.c
index 1ab8e35d069b17218e5385a2740bed14ddcf961c..bbcde546f9f76fcc4bc4b7af53ab1182693a0e30 100644
(file)
--- a/
kernel/trace/trace.c
+++ b/
kernel/trace/trace.c
@@
-629,7
+629,6
@@
ssize_t trace_seq_to_user(struct trace_seq *s, char __user *ubuf, size_t cnt)
static ssize_t trace_seq_to_buffer(struct trace_seq *s, void *buf, size_t cnt)
{
int len;
- void *ret;
if (s->len <= s->readpos)
return -EBUSY;
@@
-637,9
+636,7
@@
static ssize_t trace_seq_to_buffer(struct trace_seq *s, void *buf, size_t cnt)
len = s->len - s->readpos;
if (cnt > len)
cnt = len;
- ret = memcpy(buf, s->buffer + s->readpos, cnt);
- if (!ret)
- return -EFAULT;
+ memcpy(buf, s->buffer + s->readpos, cnt);
s->readpos += cnt;
return cnt;