The Linux Kernel Mailing List
 help / color / mirror / Atom feed
From: <zhe.he@windriver.com>
To: <pmladek@suse.com>, <sergey.senozhatsky@gmail.com>,
	<rostedt@goodmis.org>, <linux-kernel@vger.kernel.org>,
	<zhe.he@windriver.com>
Subject: [PATCH v4 4/4] printk: Give error on attempt to set log buffer length to over 4G
Date: Sat, 29 Sep 2018 22:48:49 +0800	[thread overview]
Message-ID: <1538232529-72706-4-git-send-email-zhe.he@windriver.com> (raw)
In-Reply-To: <1538232529-72706-1-git-send-email-zhe.he@windriver.com>

From: He Zhe <zhe.he@windriver.com>

Give explicit error for users who want to use larger log buffer.

Signed-off-by: He Zhe <zhe.he@windriver.com>
Cc: pmladek@suse.com
Cc: sergey.senozhatsky@gmail.com
Cc: rostedt@goodmis.org
---
 kernel/printk/printk.c | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/kernel/printk/printk.c b/kernel/printk/printk.c
index b84aac0..5ccfd5d 100644
--- a/kernel/printk/printk.c
+++ b/kernel/printk/printk.c
@@ -1039,18 +1039,23 @@ void log_buf_vmcoreinfo_setup(void)
 static unsigned long __initdata new_log_buf_len;
 
 /* we practice scaling the ring buffer by powers of 2 */
-static void __init log_buf_len_update(unsigned size)
+static void __init log_buf_len_update(u64 size)
 {
+	if (size > UINT_MAX) {
+		size = UINT_MAX;
+		pr_err("log_buf over 4G is not supported.\n");
+	}
+
 	if (size)
 		size = roundup_pow_of_two(size);
 	if (size > log_buf_len)
-		new_log_buf_len = size;
+		new_log_buf_len = (unsigned long)size;
 }
 
 /* save requested log_buf_len since it's too early to process it */
 static int __init log_buf_len_setup(char *str)
 {
-	unsigned int size;
+	u64 size;
 
 	if (!str)
 		return -EINVAL;
-- 
2.7.4


      parent reply	other threads:[~2018-09-29 14:49 UTC|newest]

Thread overview: 5+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-09-29 14:48 [PATCH v4 1/4] printk: Fix panic caused by passing log_buf_len to command line zhe.he
2018-09-29 14:48 ` [PATCH v4 2/4] printk: Correct wrong casting zhe.he
2018-09-29 14:48 ` [PATCH v4 3/4] printk: Add KBUILD_MODNAME zhe.he
2018-09-29 16:05   ` Sergey Senozhatsky
2018-09-29 14:48 ` zhe.he [this message]

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=1538232529-72706-4-git-send-email-zhe.he@windriver.com \
    --to=zhe.he@windriver.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