Commit 8119c433 authored Oct 16, 2020 by Linus Torvalds

linux

Pull printk fix from Petr Mladek:
 "Prevent overflow in the new lockless ringbuffer"

* tag 'printk-for-5.10-fixup' of git://git.kernel.org/pub/scm/linux/kernel/git/printk/linux:
  printk: ringbuffer: Wrong data pointer when appending small string

parents 49dc6fbc eac48eb6

kernel/printk/printk_ringbuffer.c

+4 −1

Original line number	Diff line number	Diff line
		@@ -1125,6 +1125,9 @@ static char data_realloc(struct printk_ringbuffer rb,

		/* If the data block does not increase, there is nothing to do. */
		if (head_lpos - next_lpos < DATA_SIZE(data_ring)) {
		if (wrapped)
		blk = to_block(data_ring, 0);
		else
		blk = to_block(data_ring, blk_lpos->begin);
		return &blk->data[0];
		}

Admin message