If a log record has LOG_PREFIX set, its predecessor record should be terminated if it was marked LOG_CONT.
In msg_print_text(), this condition was being ignored, which would lead to such records showing up combined when reading /dev/kmsg. Fix this oversight. Suggested-by: Petr Mládek <[email protected]> Signed-off-by: Alex Elder <[email protected]> Reviewed-by: Petr Mládek <[email protected]> --- kernel/printk/printk.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/kernel/printk/printk.c b/kernel/printk/printk.c index ffc9928..7dfa658 100644 --- a/kernel/printk/printk.c +++ b/kernel/printk/printk.c @@ -1013,6 +1013,12 @@ static size_t msg_print_text(const struct printk_log *msg, enum log_flags prev, newline = false; } + if ((prev & LOG_CONT) && (msg->flags & LOG_PREFIX) && len < size) { + if (buf) + buf[len++] = '\n'; + else + len++; + } do { const char *next = memchr(text, '\n', text_size); size_t text_len; -- 1.9.1 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
