Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge tag 'printk-for-5.10-fixup' of git://git.kernel.org/pub/scm/linux/kernel/git/printk/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
+4
-1
+4
-1
kernel/printk/printk_ringbuffer.c
+4
-1
kernel/printk/printk_ringbuffer.c
···
1125
1125
1126
1126
/* If the data block does not increase, there is nothing to do. */
1127
1127
if (head_lpos - next_lpos < DATA_SIZE(data_ring)) {
1128
-
blk = to_block(data_ring, blk_lpos->begin);
1128
+
if (wrapped)
1129
+
blk = to_block(data_ring, 0);
1130
+
else
1131
+
blk = to_block(data_ring, blk_lpos->begin);
1129
1132
return &blk->data[0];
1130
1133
}
1131
1134