Message ID | 20210626032156.47889-2-yun.zhou@windriver.com (mailing list archive) |
---|---|
State | New, archived |
Headers | show |
Series | [1/2] seq_buf: fix overflow in seq_buf_putmem_hex() | expand |
diff --git a/lib/seq_buf.c b/lib/seq_buf.c index 223fbc3bb958..562e53c93b7b 100644 --- a/lib/seq_buf.c +++ b/lib/seq_buf.c @@ -244,12 +244,14 @@ int seq_buf_putmem_hex(struct seq_buf *s, const void *mem, break; /* j increments twice per loop */ - len -= j / 2; hex[j++] = ' '; seq_buf_putmem(s, hex, j); if (seq_buf_has_overflowed(s)) return -1; + + len -= start_len; + data += start_len; } return 0; }
Since the raw memory 'data' does not go forward, it will dump repeated data if the data length is more than 8. 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 improve the commit 6d2289f3faa7 ("tracing: Make trace_seq_putmem_hex() more robust"). Signed-off-by: Yun Zhou <yun.zhou@windriver.com> --- lib/seq_buf.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)