linux-kernel - [PATCH v7 2/7] printk: insert newline for truncated records

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [day] [month] [year] [list]

Date:	Mon, 28 Jul 2014 08:29:15 -0500
From:	Alex Elder <elder@...aro.org>
To:	akpm@...ux-foundation.org
Cc:	kay@...y.org, pmladek@...e.cz, john.stultz@...aro.org,
	jack@...e.cz, linux-kernel@...r.kernel.org
Subject: [PATCH v7 2/7] printk: insert newline for truncated records

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 <pmladek@...e.cz>
Signed-off-by: Alex Elder <elder@...aro.org>
Reviewed-by: Petr Mládek <pmladek@...e.cz>
---
 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 majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/