diff options
| author | Dan Carpenter <dan.carpenter@oracle.com> | 2012-04-20 09:31:45 +0300 |
|---|---|---|
| committer | Steven Rostedt <rostedt@goodmis.org> | 2012-04-23 21:16:10 -0400 |
| commit | 5a26c8f0cf1e95106858bb4e23ca6dd14c9b842f (patch) | |
| tree | 0e4d5a45f2ce667f3560a9171e11178437ca24a5 /kernel/trace | |
| parent | 07d777fe8c3985bc83428c2866713c2d1b3d4129 (diff) | |
| download | op-kernel-dev-5a26c8f0cf1e95106858bb4e23ca6dd14c9b842f.zip op-kernel-dev-5a26c8f0cf1e95106858bb4e23ca6dd14c9b842f.tar.gz | |
tracing: Remove an unneeded check in trace_seq_buffer()
memcpy() returns a pointer to "bug". Hopefully, it's not NULL here or
we would already have Oopsed.
Link: http://lkml.kernel.org/r/20120420063145.GA22649@elgon.mountain
Cc: Frederic Weisbecker <fweisbec@gmail.com>
Cc: Eduard - Gabriel Munteanu <eduard.munteanu@linux360.ro>
Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Steven Rostedt <rostedt@goodmis.org>
Diffstat (limited to 'kernel/trace')
| -rw-r--r-- | kernel/trace/trace.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/kernel/trace/trace.c b/kernel/trace/trace.c index 1ab8e35..bbcde54 100644 --- 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; |
