From: Bruno Meneguele <bmeneg@redhat.com>
To: linux-kernel@vger.kernel.org, stable@vger.kernel.org
Cc: pmladek@suse.com, sergey.senozhatsky@gmail.com,
rostedt@goodmis.org, Bruno Meneguele <bmeneg@redhat.com>
Subject: [PATCH] kernel/printk: add kmsg SEEK_CUR handling
Date: Thu, 12 Mar 2020 21:35:33 -0300 [thread overview]
Message-ID: <20200313003533.2203429-1-bmeneg@redhat.com> (raw)
Userspace libraries, e.g. glibc's dprintf(), expect the default return value
for invalid seek situations: -ESPIPE, but when the IO was over /dev/kmsg the
current state of kernel code was returning the generic case of an -EINVAL.
Hence, userspace programs were not behaving as expected or documented.
With this patch we add SEEK_CUR case returning the expected value and also a
simple mention of it in kernel's documentation for those relying on that for
guidance.
Signed-off-by: Bruno Meneguele <bmeneg@redhat.com>
---
Documentation/ABI/testing/dev-kmsg | 2 ++
kernel/printk/printk.c | 4 ++++
2 files changed, 6 insertions(+)
diff --git a/Documentation/ABI/testing/dev-kmsg b/Documentation/ABI/testing/dev-kmsg
index f307506eb54c..8533d28e6fda 100644
--- a/Documentation/ABI/testing/dev-kmsg
+++ b/Documentation/ABI/testing/dev-kmsg
@@ -56,6 +56,8 @@ Description: The /dev/kmsg character device node provides userspace access
seek after the last record available at the time
the last SYSLOG_ACTION_CLEAR was issued.
+ While SEEK_CUR sets -ESPIPE (invalid seek) to errno.
+
The output format consists of a prefix carrying the syslog
prefix including priority and facility, the 64 bit message
sequence number and the monotonic timestamp in microseconds,
diff --git a/kernel/printk/printk.c b/kernel/printk/printk.c
index ad4606234545..d02606723d2d 100644
--- a/kernel/printk/printk.c
+++ b/kernel/printk/printk.c
@@ -963,6 +963,10 @@ static loff_t devkmsg_llseek(struct file *file, loff_t offset, int whence)
user->idx = log_next_idx;
user->seq = log_next_seq;
break;
+ case SEEK_CUR:
+ /* return the default errno for invalid seek */
+ ret = -ESPIPE;
+ break;
default:
ret = -EINVAL;
}
--
2.24.1
next reply other threads:[~2020-03-13 0:35 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-03-13 0:35 Bruno Meneguele [this message]
2020-03-13 7:22 ` Greg KH
2020-03-13 10:44 ` Bruno Meneguele
2020-03-13 7:34 ` Sergey Senozhatsky
2020-03-13 11:02 ` Bruno Meneguele
2020-03-13 11:06 ` David Laight
2020-03-13 13:06 ` Bruno Meneguele
2020-03-17 2:03 ` Sergey Senozhatsky
2020-03-17 8:53 ` Bruno Meneguele
2020-03-19 10:33 ` Bruno Meneguele
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200313003533.2203429-1-bmeneg@redhat.com \
--to=bmeneg@redhat.com \
--cc=linux-kernel@vger.kernel.org \
--cc=pmladek@suse.com \
--cc=rostedt@goodmis.org \
--cc=sergey.senozhatsky@gmail.com \
--cc=stable@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®