From: Eric Biggers <ebiggers@kernel.org>
To: stable@vger.kernel.org
Cc: Harshit Mogalapalli <harshit.m.mogalapalli@oracle.com>,
Kees Cook <keescook@chromium.org>, SeongJae Park <sj@kernel.org>,
Seth Jenkins <sethjenkins@google.com>,
Jann Horn <jannh@google.com>,
"Eric W . Biederman" <ebiederm@xmission.com>,
linux-hardening@vger.kernel.org, linux-kernel@vger.kernel.org,
Jonathan Corbet <corbet@lwn.net>,
Andrew Morton <akpm@linux-foundation.org>,
Baolin Wang <baolin.wang@linux.alibaba.com>,
"Jason A. Donenfeld" <Jason@zx2c4.com>,
Eric Biggers <ebiggers@google.com>,
Huang Ying <ying.huang@intel.com>, Arnd Bergmann <arnd@arndb.de>,
linux-doc@vger.kernel.org
Subject: [PATCH 4.14 v2 10/15] exit: Allow oops_limit to be disabled
Date: Thu, 2 Feb 2023 16:33:49 -0800 [thread overview]
Message-ID: <20230203003354.85691-11-ebiggers@kernel.org> (raw)
In-Reply-To: <20230203003354.85691-1-ebiggers@kernel.org>
From: Kees Cook <keescook@chromium.org>
commit de92f65719cd672f4b48397540b9f9eff67eca40 upstream.
In preparation for keeping oops_limit logic in sync with warn_limit,
have oops_limit == 0 disable checking the Oops counter.
Cc: Jann Horn <jannh@google.com>
Cc: Jonathan Corbet <corbet@lwn.net>
Cc: Andrew Morton <akpm@linux-foundation.org>
Cc: Baolin Wang <baolin.wang@linux.alibaba.com>
Cc: "Jason A. Donenfeld" <Jason@zx2c4.com>
Cc: Eric Biggers <ebiggers@google.com>
Cc: Huang Ying <ying.huang@intel.com>
Cc: "Eric W. Biederman" <ebiederm@xmission.com>
Cc: Arnd Bergmann <arnd@arndb.de>
Cc: linux-doc@vger.kernel.org
Signed-off-by: Kees Cook <keescook@chromium.org>
Signed-off-by: Eric Biggers <ebiggers@google.com>
---
Documentation/sysctl/kernel.txt | 5 +++--
kernel/exit.c | 2 +-
2 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/Documentation/sysctl/kernel.txt b/Documentation/sysctl/kernel.txt
index 7b04c616c5901..b6124a4475fb7 100644
--- a/Documentation/sysctl/kernel.txt
+++ b/Documentation/sysctl/kernel.txt
@@ -519,8 +519,9 @@ scanned for a given scan.
oops_limit:
Number of kernel oopses after which the kernel should panic when
-``panic_on_oops`` is not set. Setting this to 0 or 1 has the same effect
-as setting ``panic_on_oops=1``.
+``panic_on_oops`` is not set. Setting this to 0 disables checking
+the count. Setting this to 1 has the same effect as setting
+``panic_on_oops=1``. The default value is 10000.
==============================================================
diff --git a/kernel/exit.c b/kernel/exit.c
index 138b110bf83a1..73103e008a627 100644
--- a/kernel/exit.c
+++ b/kernel/exit.c
@@ -984,7 +984,7 @@ void __noreturn make_task_dead(int signr)
* To make sure this can't happen, place an upper bound on how often the
* kernel may oops without panic().
*/
- if (atomic_inc_return(&oops_count) >= READ_ONCE(oops_limit))
+ if (atomic_inc_return(&oops_count) >= READ_ONCE(oops_limit) && oops_limit)
panic("Oopsed too often (kernel.oops_limit is %d)", oops_limit);
do_exit(signr);
--
2.39.1
next prev parent reply other threads:[~2023-02-03 0:35 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-02-03 0:33 [PATCH 4.14 v2 00/15] Backport oops_limit to 4.14 Eric Biggers
2023-02-03 0:33 ` [PATCH 4.14 v2 01/15] sysctl: add a new register_sysctl_init() interface Eric Biggers
2023-02-03 0:33 ` [PATCH 4.14 v2 02/15] panic: unset panic_on_warn inside panic() Eric Biggers
2023-02-03 0:33 ` [PATCH 4.14 v2 03/15] exit: Add and use make_task_dead Eric Biggers
2023-02-03 0:33 ` [PATCH 4.14 v2 04/15] objtool: Add a missing comma to avoid string concatenation Eric Biggers
2023-02-03 0:33 ` [PATCH 4.14 v2 05/15] hexagon: Fix function name in die() Eric Biggers
2023-02-03 0:33 ` [PATCH 4.14 v2 06/15] h8300: Fix build errors from do_exit() to make_task_dead() transition Eric Biggers
2023-02-03 0:33 ` [PATCH 4.14 v2 07/15] ia64: make IA64_MCA_RECOVERY bool instead of tristate Eric Biggers
2023-02-03 0:33 ` [PATCH 4.14 v2 08/15] exit: Put an upper limit on how often we can oops Eric Biggers
2023-02-03 0:33 ` [PATCH 4.14 v2 09/15] exit: Expose "oops_count" to sysfs Eric Biggers
2023-02-03 0:33 ` Eric Biggers [this message]
2023-02-03 0:33 ` [PATCH 4.14 v2 11/15] panic: Consolidate open-coded panic_on_warn checks Eric Biggers
2023-02-03 7:57 ` Patch "panic: Consolidate open-coded panic_on_warn checks" has been added to the 4.14-stable tree gregkh
2023-02-03 0:33 ` [PATCH 4.14 v2 12/15] panic: Introduce warn_limit Eric Biggers
2023-02-03 0:33 ` [PATCH 4.14 v2 13/15] panic: Expose "warn_count" to sysfs Eric Biggers
2023-02-03 0:33 ` [PATCH 4.14 v2 14/15] docs: Fix path paste-o for /sys/kernel/warn_count Eric Biggers
2023-02-03 0:33 ` [PATCH 4.14 v2 15/15] exit: Use READ_ONCE() for all oops/warn limit reads Eric Biggers
2023-02-03 7:57 ` [PATCH 4.14 v2 00/15] Backport oops_limit to 4.14 Greg KH
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=20230203003354.85691-11-ebiggers@kernel.org \
--to=ebiggers@kernel.org \
--cc=Jason@zx2c4.com \
--cc=akpm@linux-foundation.org \
--cc=arnd@arndb.de \
--cc=baolin.wang@linux.alibaba.com \
--cc=corbet@lwn.net \
--cc=ebiederm@xmission.com \
--cc=ebiggers@google.com \
--cc=harshit.m.mogalapalli@oracle.com \
--cc=jannh@google.com \
--cc=keescook@chromium.org \
--cc=linux-doc@vger.kernel.org \
--cc=linux-hardening@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=sethjenkins@google.com \
--cc=sj@kernel.org \
--cc=stable@vger.kernel.org \
--cc=ying.huang@intel.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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.