From: pierre Kuo <vichy.kuo@gmail.com>
To: pmladek@suse.com
Cc: sergey.senozhatsky@gmail.com, rostedt@goodmis.org,
linux-kernel@vger.kernel.org, pierre Kuo <vichy.kuo@gmail.com>
Subject: [RFC V2] printk: add warning while drop partial text in msg
Date: Sun, 30 Jul 2017 21:37:50 +0800 [thread overview]
Message-ID: <1501421870-12042-1-git-send-email-vichy.kuo@gmail.com> (raw)
If the buffer pass to msg_print_text is not big enough to put both all
prefixes and log_text(msg), kernel will quietly break.
That means the user may not have the chance to know whether the
log_text(msg) is fully printed into buffer or not.
In this patch, once above case happened, we try to calculate how many
characters of log_text(msg) are dropped and add warning for debugging
purpose.
Signed-off-by: pierre Kuo <vichy.kuo@gmail.com>
---
Changes since v2:
* fix typo in commit message from "waring for debugging purpose" to "warning for debugging purpose"
kernel/printk/printk.c | 23 ++++++++++++++++++++++-
1 file changed, 22 insertions(+), 1 deletion(-)
diff --git a/kernel/printk/printk.c b/kernel/printk/printk.c
index fc47863..6cbb3699 100644
--- a/kernel/printk/printk.c
+++ b/kernel/printk/printk.c
@@ -558,6 +558,12 @@ static u32 msg_used_size(u16 text_len, u16 dict_len, u32 *pad_len)
#define MAX_LOG_TAKE_PART 4
static const char trunc_msg[] = "<truncated>";
+/*
+ * Define max drop msg length that we put in next msg
+ */
+#define MAX_DROP_MSG_LENGTH 32
+static char drop_msg[MAX_DROP_MSG_LENGTH];
+
static u32 truncate_msg(u16 *text_len, u16 *trunc_msg_len,
u16 *dict_len, u32 *pad_len)
{
@@ -1264,8 +1270,23 @@ static size_t msg_print_text(const struct printk_log *msg, bool syslog, char *bu
if (buf) {
if (print_prefix(msg, syslog, NULL) +
- text_len + 1 >= size - len)
+ text_len + 1 >= size - len) {
+ /* below stores dropped characters
+ * related information in next msg
+ */
+ size_t drop_len;
+
+ drop_len = scnprintf(drop_msg,
+ MAX_DROP_MSG_LENGTH,
+ "<%u characters dropped>",
+ (next) ?
+ (unsigned int)(text_size + next - text) :
+ (unsigned int)text_size);
+ drop_msg[drop_len] = 0;
+ log_store(msg->facility, msg->level, msg->flags,
+ 0, NULL, 0, drop_msg, strlen(drop_msg));
break;
+ }
len += print_prefix(msg, syslog, buf + len);
memcpy(buf + len, text, text_len);
--
1.9.1
next reply other threads:[~2017-07-30 13:38 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-07-30 13:37 pierre Kuo [this message]
2017-08-01 2:43 ` Sergey Senozhatsky
2017-08-10 16:26 ` pierre kuo
2017-08-10 16:55 ` pierre kuo
2017-08-16 9:21 ` Petr Mladek
2017-08-17 1:05 ` Sergey Senozhatsky
2017-09-12 6:07 ` pierre kuo
2017-09-18 9:39 ` Sergey Senozhatsky
2017-09-18 10:00 ` Joe Perches
2017-09-18 10:08 ` Sergey Senozhatsky
2017-09-27 13:59 ` pierre kuo
2017-09-30 3:14 ` Sergey Senozhatsky
2017-10-04 13:28 ` Petr Mladek
2017-10-17 17:10 ` pierre kuo
2017-10-18 1:07 ` Sergey Senozhatsky
2017-10-04 13:17 ` Petr Mladek
2017-10-17 17:07 ` pierre kuo
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=1501421870-12042-1-git-send-email-vichy.kuo@gmail.com \
--to=vichy.kuo@gmail.com \
--cc=linux-kernel@vger.kernel.org \
--cc=pmladek@suse.com \
--cc=rostedt@goodmis.org \
--cc=sergey.senozhatsky@gmail.com \
/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
Powered by JetHome