From: Changming <charley.ashbringer@gmail.com>
To: willy@infradead.org, rdunlap@infradead.org
Cc: keescook@chromium.org, mcgrof@kernel.org, yzaikin@google.com,
akpm@linux-foundation.org, linux-kernel@vger.kernel.org,
Changming Liu <charley.ashbringer@gmail.com>
Subject: [PATCH v2] panic: prevent panic_timeout * 1000 from overflow
Date: Sat, 11 Jul 2020 01:17:28 -0400 [thread overview]
Message-ID: <20200711051728.1499-1-charley.ashbringer@gmail.com> (raw)
In-Reply-To: <0d4601d65709a0e2d80e2a8880gmail.com>
From: Changming Liu <charley.ashbringer@gmail.com>
Since panic_timeout is an integer passed-in through sysctl,
the loop boundary panic_timeout * 1000 could overflow and
result in a zero-delay panic when panic_timeout is greater
than INT_MAX/1000.
Fix this by moving 1000 to the left, also in case i/1000
might never be greater than panic_timeout, change i to
long long so that it strictly has more bits.
Signed-off-by: Changming Liu <charley.ashbringer@gmail.com>
---
Changes in v2:
- change the loop in panic, instead of change the sysctl
kernel/panic.c | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/kernel/panic.c b/kernel/panic.c
index e2157ca387c8..941848aac0ee 100644
--- a/kernel/panic.c
+++ b/kernel/panic.c
@@ -178,7 +178,8 @@ void panic(const char *fmt, ...)
{
static char buf[1024];
va_list args;
- long i, i_next = 0, len;
+ long long i;
+ long i_next = 0, len;
int state = 0;
int old_cpu, this_cpu;
bool _crash_kexec_post_notifiers = crash_kexec_post_notifiers;
@@ -315,7 +316,7 @@ void panic(const char *fmt, ...)
*/
pr_emerg("Rebooting in %d seconds..\n", panic_timeout);
- for (i = 0; i < panic_timeout * 1000; i += PANIC_TIMER_STEP) {
+ for (i = 0; i / 1000 < panic_timeout; i += PANIC_TIMER_STEP) {
touch_nmi_watchdog();
if (i >= i_next) {
i += panic_blink(state ^= 1);
--
2.17.1
next parent reply other threads:[~2020-07-11 5:17 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <0d4601d65709a0e2d80e2a8880gmail.com>
2020-07-11 5:17 ` Changming [this message]
2020-07-14 1:57 ` [PATCH v2] panic: prevent panic_timeout * 1000 from overflow Andrew Morton
2020-07-14 2:50 ` Matthew Wilcox
2020-07-16 23:15 ` [PATCH v3] " Changming Liu
2020-07-16 4:48 ` [PATCH v2] " charley.ashbringer
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=20200711051728.1499-1-charley.ashbringer@gmail.com \
--to=charley.ashbringer@gmail.com \
--cc=akpm@linux-foundation.org \
--cc=keescook@chromium.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mcgrof@kernel.org \
--cc=rdunlap@infradead.org \
--cc=willy@infradead.org \
--cc=yzaikin@google.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