Skip to content

Commit

Permalink
tracing: Use seq_buf_used() in seq_buf_to_user() instead of len
Browse files Browse the repository at this point in the history
commit 5ac4837 ("tracing: Use trace_seq_used() and seq_buf_used()
instead of len") changed the tracing code to use trace_seq_used() and
seq_buf_used() instead of using the seq_buf len directly to avoid
overflow issues, but missed a spot in seq_buf_to_user() that makes use
of s->len.

Cleaned up the code a bit as well per suggestion of Steve Rostedt.

Link: http://lkml.kernel.org/r/1447703848-2951-1-git-send-email-jsnitsel@redhat.com

Signed-off-by: Jerry Snitselaar <jsnitsel@redhat.com>
Signed-off-by: Steven Rostedt <rostedt@goodmis.org>
  • Loading branch information
Jerry Snitselaar authored and Steven Rostedt committed Dec 23, 2015
1 parent 27dff4e commit ff078d8
Showing 1 changed file with 4 additions and 2 deletions.
6 changes: 4 additions & 2 deletions lib/seq_buf.c
Original file line number Diff line number Diff line change
Expand Up @@ -306,10 +306,12 @@ int seq_buf_to_user(struct seq_buf *s, char __user *ubuf, int cnt)
if (!cnt)
return 0;

if (s->len <= s->readpos)
len = seq_buf_used(s);

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

len = seq_buf_used(s) - s->readpos;
len -= s->readpos;
if (cnt > len)
cnt = len;
ret = copy_to_user(ubuf, s->buffer + s->readpos, cnt);
Expand Down

0 comments on commit ff078d8

Please sign in to comment.