diff options
| author | Alex Elder <elder@linaro.org> | 2014-07-16 08:44:38 -0500 |
|---|---|---|
| committer | Alex Elder <elder@linaro.org> | 2014-07-17 08:54:53 -0500 |
| commit | d4ef849926bb2548bed1d8d63a0cf3fe4a599650 (patch) | |
| tree | fcd25e4a031f1ad8de6189d46a92f1a69919781e | |
| parent | 4010ea588f7693e492dc75016dd9fe3d094c80c1 (diff) | |
printk: insert newline in devkmsg_read()
If a log record has LOG_PREFIX set, its predecessor record should be
terminated if it was marked LOG_CONT. In devkmsg_read(), this
condition was being ignored, which would lead to such records
showing up combined when reading /dev/kmsg. Fix this oversight.
Reported-by: Petr Mládek <pmladek@suse.cz>
Signed-off-by: Alex Elder <elder@linaro.org>
| -rw-r--r-- | kernel/printk/printk.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/kernel/printk/printk.c b/kernel/printk/printk.c index e5ee1cb35a7..3174ba99c6e 100644 --- a/kernel/printk/printk.c +++ b/kernel/printk/printk.c @@ -575,6 +575,7 @@ static ssize_t devkmsg_read(struct file *file, char __user *buf, char cont; size_t len; ssize_t ret; + bool insert_newline; if (!user) return -EBADF; @@ -626,7 +627,10 @@ static ssize_t devkmsg_read(struct file *file, char __user *buf, else cont = '-'; - len = sprintf(user->buf, "%u,%llu,%llu,%c;", + /* Insert a newline if we're terminating the previous record early */ + insert_newline = (user->prev & LOG_CONT) && (msg->flags & LOG_PREFIX); + len = sprintf(user->buf, "%s%u,%llu,%llu,%c;", + insert_newline ? "\n" : "", (msg->facility << 3) | msg->level, user->seq, ts_usec, cont); user->prev = msg->flags; |