Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]
Groups > linux.kernel > #1297879
| From | Steven Rostedt <rostedt@goodmis.org> |
|---|---|
| Newsgroups | linux.kernel |
| Subject | [for-next][PATCH 06/13] tracing: Use seq_buf_used() in seq_buf_to_user() instead of len |
| Date | 2015-12-24 15:40 +0100 |
| Message-ID | <qJfdD-7VC-1@gated-at.bofh.it> (permalink) |
| References | <qJf3Y-7QW-7@gated-at.bofh.it> |
| Organization | linux.* mail to news gateway |
From: Jerry Snitselaar <jsnitsel@redhat.com>
commit 5ac48378414d ("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>
---
lib/seq_buf.c | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/lib/seq_buf.c b/lib/seq_buf.c
index 5c94e1012a91..cb18469e1f49 100644
--- a/lib/seq_buf.c
+++ b/lib/seq_buf.c
@@ -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);
--
2.6.2
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread
[for-next][PATCH 00/13] tracing: More updates for 4.5. Steven Rostedt <rostedt@goodmis.org> - 2015-12-24 15:40 +0100 [for-next][PATCH 06/13] tracing: Use seq_buf_used() in seq_buf_to_user() instead of len Steven Rostedt <rostedt@goodmis.org> - 2015-12-24 15:40 +0100 [for-next][PATCH 01/13] ftrace: Fix a typo in comment Steven Rostedt <rostedt@goodmis.org> - 2015-12-24 15:40 +0100 [for-next][PATCH 12/13] metag: ftrace: Fix the comments for ftrace_modify_code Steven Rostedt <rostedt@goodmis.org> - 2015-12-24 15:40 +0100 [for-next][PATCH 03/13] ftrace: Remove use of control list and ops Steven Rostedt <rostedt@goodmis.org> - 2015-12-24 15:40 +0100 [for-next][PATCH 07/13] tracing: Introduce TRACE_EVENT_FN_COND macro Steven Rostedt <rostedt@goodmis.org> - 2015-12-24 15:40 +0100 [for-next][PATCH 04/13] ftrace: Have ftrace_ops_get_func() handle RCU and PER_CPU flags too Steven Rostedt <rostedt@goodmis.org> - 2015-12-24 15:40 +0100 [for-next][PATCH 13/13] tracing: Fix comment to use tracing_on over tracing_enable Steven Rostedt <rostedt@goodmis.org> - 2015-12-24 15:40 +0100 [for-next][PATCH 09/13] ftrace: Clean up ftrace_module_init() code Steven Rostedt <rostedt@goodmis.org> - 2015-12-24 15:40 +0100 [for-next][PATCH 10/13] ia64: ftrace: Fix the comments for ftrace_modify_code() Steven Rostedt <rostedt@goodmis.org> - 2015-12-24 15:40 +0100 [for-next][PATCH 02/13] ftrace: Fix output of enabled_functions for showing tramp Steven Rostedt <rostedt@goodmis.org> - 2015-12-24 15:40 +0100
csiph-web