tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

seq_buf: Fix overflow in seq_buf_putmem_hex()

There's two variables being increased in that loop (i and j), and i
follows the raw data, and j follows what is being written into the buffer.
We should compare 'i' to MAX_MEMHEX_BYTES or compare 'j' to HEX_CHARS.
Otherwise, if 'j' goes bigger than HEX_CHARS, it will overflow the
destination buffer.

Link: https://lore.kernel.org/lkml/20210625122453.5e2fe304@oasis.local.home/
Link: https://lkml.kernel.org/r/20210626032156.47889-1-yun.zhou@windriver.com

Cc: stable@vger.kernel.org
Fixes: 5e3ca0ec76fce ("ftrace: introduce the "hex" output method")
Signed-off-by: Yun Zhou <yun.zhou@windriver.com>
Signed-off-by: Steven Rostedt (VMware) <rostedt@goodmis.org>

authored by

Yun Zhou and committed by
Steven Rostedt (VMware) d3b16034 c8895e27

+3 -1
+3 -1
lib/seq_buf.c
··· 229 229 230 230 WARN_ON(s->size == 0); 231 231 232 + BUILD_BUG_ON(MAX_MEMHEX_BYTES * 2 >= HEX_CHARS); 233 + 232 234 while (len) { 233 - start_len = min(len, HEX_CHARS - 1); 235 + start_len = min(len, MAX_MEMHEX_BYTES); 234 236 #ifdef __BIG_ENDIAN 235 237 for (i = 0, j = 0; i < start_len; i++) { 236 238 #else