Skip to content

Commit

Permalink
tracing: do not return EFAULT if read copied anything
Browse files Browse the repository at this point in the history
Impact: fix trace read to conform to standards

Andrew Morton, Theodore Tso and H. Peter Anvin brought to my attention
that a userspace read should not return -EFAULT if it succeeded in
copying anything. It should only return -EFAULT if it failed to copy
at all.

This patch modifies the check of copy_from_user and updates the return
code appropriately.

I also used H. Peter Anvin's short cut rule to just test ret == count.

Signed-off-by: Steven Rostedt <srostedt@redhat.com>
  • Loading branch information
Steven Rostedt committed Mar 5, 2009
1 parent 4f3640f commit 2dc5d12
Showing 1 changed file with 12 additions and 2 deletions.
14 changes: 12 additions & 2 deletions kernel/trace/trace.c
Original file line number Diff line number Diff line change
Expand Up @@ -346,16 +346,21 @@ ssize_t trace_seq_to_user(struct trace_seq *s, char __user *ubuf, size_t cnt)
int len;
int ret;

if (!cnt)
return 0;

if (s->len <= s->readpos)
return -EBUSY;

len = s->len - s->readpos;
if (cnt > len)
cnt = len;
ret = copy_to_user(ubuf, s->buffer + s->readpos, cnt);
if (ret)
if (ret == cnt)
return -EFAULT;

cnt -= ret;

s->readpos += len;
return cnt;
}
Expand Down Expand Up @@ -3049,6 +3054,9 @@ tracing_buffers_read(struct file *filp, char __user *ubuf,
ssize_t ret;
size_t size;

if (!count)
return 0;

/* Do we have previous read data to read? */
if (info->read < PAGE_SIZE)
goto read;
Expand All @@ -3073,8 +3081,10 @@ tracing_buffers_read(struct file *filp, char __user *ubuf,
size = count;

ret = copy_to_user(ubuf, info->spare + info->read, size);
if (ret)
if (ret == size)
return -EFAULT;
size -= ret;

*ppos += size;
info->read += size;

Expand Down

0 comments on commit 2dc5d12

Please sign in to comment.