Skip to content

Commit

Permalink
tracing: Remove an unneeded check in trace_seq_buffer()
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Dan Carpenter authored and Steven Rostedt committed Apr 24, 2012
1 parent 07d777f commit 5a26c8f
Showing 1 changed file with 1 addition and 4 deletions.
5 changes: 1 addition & 4 deletions kernel/trace/trace.c
Original file line number Diff line number Diff line change
Expand Up @@ -629,17 +629,14 @@ 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;

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;
Expand Down

0 comments on commit 5a26c8f

Please sign in to comment.