Revert "kmsg: format back to previous for /dev/kmsg"

This reverts commit c2e682c41250581a178db624712857ecda99db94.

diff --git a/kernel/printk/printk.c b/kernel/printk/printk.c
index 175cb13e8cd721d4831cfea7ae3bbea043017d47..20ebf827e858562d8b92eedfdf02d168cd7566a4 100644 (file)
--- a/kernel/printk/printk.c
+++ b/kernel/printk/printk.c
@@ -923,7 +923,6 @@ static ssize_t kmsg_read(struct log_buffer *log_b, struct file *file,
        char cont = '-';
        size_t len;
        ssize_t ret;
-       const int prime = (log_b == &log_buf);
 
        p = user->buf;
        e = user->buf + sizeof(user->buf);
@@ -931,7 +930,6 @@ static ssize_t kmsg_read(struct log_buffer *log_b, struct file *file,
        ret = mutex_lock_interruptible(&user->lock);
        if (ret)
                return ret;
-
        raw_spin_lock_irq(&log_b->lock);
        while (user->seq == log_b->next_seq) {
                if (file->f_flags & O_NONBLOCK) {
@@ -994,10 +992,7 @@ static ssize_t kmsg_read(struct log_buffer *log_b, struct file *file,
        for (i = 0; i < msg->text_len; i++) {
                unsigned char c = log_text(msg)[i];
 
-               if (prime && (c < ' ' || c >= 127 || c == '\\'))
-                       p += scnprintf(p, e - p, "\\x%02x", c);
-               else
-                       append_char(&p, e, c);
+               append_char(&p, e, c);
        }
 
        /*
@@ -1006,8 +1001,7 @@ static ssize_t kmsg_read(struct log_buffer *log_b, struct file *file,
         * to security: else one could forge dictionary tags through the message
         * such as "text\n _PID=123"
         */
-       if (!prime)
-               append_char(&p, e, '\0');
+       append_char(&p, e, '\0');
        append_char(&p, e, '\n');
 
        if (msg->dict_len) {
@@ -1027,11 +1021,6 @@ static ssize_t kmsg_read(struct log_buffer *log_b, struct file *file,
                                continue;
                        }
 
-                       if (prime && (c < ' ' || c >= 127 || c == '\\')) {
-                               p += scnprintf(p, e - p, "\\x%02x", c);
-                               continue;
-                       }
-
                        append_char(&p, e, c);
                }
                append_char(&p, e, '\n');