From: Yun Zhou <yun.zhou@windriver.com>
To: <rostedt@goodmis.org>
Cc: <linux-kernel@vger.kernel.org>,
<kernel-hardening@lists.openwall.com>, <ying.xue@windriver.com>,
<zhiquan.li@windriver.com>
Subject: [PATCH 2/2] seq_buf: Make trace_seq_putmem_hex() support data longer than 8
Date: Fri, 25 Jun 2021 23:53:48 +0800 [thread overview]
Message-ID: <20210625155348.58266-2-yun.zhou@windriver.com> (raw)
In-Reply-To: <20210625155348.58266-1-yun.zhou@windriver.com>
At present, trace_seq_putmem_hex() can only support data with length
of 8 or less, which greatly limits its application scope. If we want to
dump longer data blocks, we need to repeatedly call macro SEQ_PUT_HEX_FIELD.
I think it is a bit redundant, and multiple function calls also affect
the performance.
This patch is to perfect the commit 6d2289f3faa7 ("tracing: Make
trace_seq_putmem_hex() more robust").
Signed-off-by: Yun Zhou <yun.zhou@windriver.com>
---
lib/seq_buf.c | 29 ++++++++++++++++++-----------
1 file changed, 18 insertions(+), 11 deletions(-)
diff --git a/lib/seq_buf.c b/lib/seq_buf.c
index aa2f666e584e..98580a5c32c0 100644
--- a/lib/seq_buf.c
+++ b/lib/seq_buf.c
@@ -210,8 +210,7 @@ int seq_buf_putmem(struct seq_buf *s, const void *mem, unsigned int len)
* seq_buf_putmem_hex - write raw memory into the buffer in ASCII hex
* @s: seq_buf descriptor
* @mem: The raw memory to write its hex ASCII representation of
- * @len: The length of the raw memory to copy (in bytes).
- * It can be not larger than 8.
+ * @len: The length of the raw memory to copy (in bytes)
*
* This is similar to seq_buf_putmem() except instead of just copying the
* raw memory into the buffer it writes its ASCII representation of it
@@ -229,19 +228,27 @@ int seq_buf_putmem_hex(struct seq_buf *s, const void *mem,
WARN_ON(s->size == 0);
- start_len = min(len, MAX_MEMHEX_BYTES);
+ while (len) {
+ start_len = min(len, MAX_MEMHEX_BYTES);
#ifdef __BIG_ENDIAN
- for (i = 0, j = 0; i < start_len; i++) {
+ for (i = 0, j = 0; i < start_len; i++) {
#else
- for (i = start_len-1, j = 0; i >= 0; i--) {
+ for (i = start_len-1, j = 0; i >= 0; i--) {
#endif
- hex[j++] = hex_asc_hi(data[i]);
- hex[j++] = hex_asc_lo(data[i]);
- }
+ hex[j++] = hex_asc_hi(data[i]);
+ hex[j++] = hex_asc_lo(data[i]);
+ }
- seq_buf_putmem(s, hex, j);
- if (seq_buf_has_overflowed(s))
- return -1;
+ /* j increments twice per loop */
+ len -= j / 2;
+ hex[j++] = ' ';
+
+ seq_buf_putmem(s, hex, j);
+ if (seq_buf_has_overflowed(s))
+ return -1;
+
+ data += start_len;
+ }
return 0;
}
--
2.26.1
next prev parent reply other threads:[~2021-06-25 16:04 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-06-25 15:53 [PATCH 1/2] seq_buf: fix overflow when length is bigger than 8 Yun Zhou
2021-06-25 15:53 ` Yun Zhou [this message]
2021-06-25 16:24 ` Steven Rostedt
2021-06-26 0:57 ` 回复: " Zhou, Yun
-- strict thread matches above, loose matches on Subject: below --
2021-06-26 3:21 [PATCH 1/2] seq_buf: fix overflow in seq_buf_putmem_hex() Yun Zhou
2021-06-26 3:21 ` [PATCH 2/2] seq_buf: Make trace_seq_putmem_hex() support data longer than 8 Yun Zhou
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210625155348.58266-2-yun.zhou@windriver.com \
--to=yun.zhou@windriver.com \
--cc=kernel-hardening@lists.openwall.com \
--cc=linux-kernel@vger.kernel.org \
--cc=rostedt@goodmis.org \
--cc=ying.xue@windriver.com \
--cc=zhiquan.li@windriver.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).