diff options
| author | John Ogness <john.ogness@linutronix.de> | 2021-01-24 21:33:28 +0106 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2021-01-30 13:55:20 +0100 |
| commit | d5ac8304e18025a522b5d1d87629e926064ce134 (patch) | |
| tree | 7cc4bbafa07455753254de90b55c67893427ea15 | |
| parent | 861c2e349a36868f9c19a82844b2eb0abf20939b (diff) | |
printk: fix string termination for record_print_text()
commit 08d60e5999540110576e7c1346d486220751b7f9 upstream.
Commit f0e386ee0c0b ("printk: fix buffer overflow potential for
print_text()") added string termination in record_print_text().
However it used the wrong base pointer for adding the terminator.
This led to a 0-byte being written somewhere beyond the buffer.
Use the correct base pointer when adding the terminator.
Fixes: f0e386ee0c0b ("printk: fix buffer overflow potential for print_text()")
Reported-by: Sven Schnelle <svens@linux.ibm.com>
Signed-off-by: John Ogness <john.ogness@linutronix.de>
Signed-off-by: Petr Mladek <pmladek@suse.com>
Link: https://lore.kernel.org/r/20210124202728.4718-1-john.ogness@linutronix.de
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| -rw-r--r-- | kernel/printk/printk.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/printk/printk.c b/kernel/printk/printk.c index 807810216492..aafec8cb8637 100644 --- a/kernel/printk/printk.c +++ b/kernel/printk/printk.c @@ -1445,7 +1445,7 @@ static size_t record_print_text(struct printk_record *r, bool syslog, * not counted in the return value. */ if (buf_size > 0) - text[len] = 0; + r->text_buf[len] = 0; return len; } |