[5.10,15/20] exit: Allow oops_limit to be disabled

Commit Message

Eric Biggers Jan. 24, 2023, 7:29 p.m. UTC

From: Kees Cook <[e-mail]>

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 <[e-mail]>
Cc: Jonathan Corbet <[e-mail]>
Cc: Andrew Morton <[e-mail]>
Cc: Baolin Wang <[e-mail]>
Cc: "Jason A. Donenfeld" <[e-mail]>
Cc: Eric Biggers <[e-mail]>
Cc: Huang Ying <[e-mail]>
Cc: "Eric W. Biederman" <[e-mail]>
Cc: Arnd Bergmann <[e-mail]>
Cc: [e-mail]
Signed-off-by: Kees Cook <[e-mail]>
Signed-off-by: Eric Biggers <[e-mail]>
---
 Documentation/admin-guide/sysctl/kernel.rst | 5 +++--
 kernel/exit.c                               | 2 +-
 2 files changed, 4 insertions(+), 3 deletions(-)

Patch

diff --git a/Documentation/admin-guide/sysctl/kernel.rst b/Documentation/admin-guide/sysctl/kernel.rst
index cd9247b48fc73..470262c088589 100644
--- a/Documentation/admin-guide/sysctl/kernel.rst
+++ b/Documentation/admin-guide/sysctl/kernel.rst
@@ -667,8 +667,9 @@  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.
 
 
 osrelease, ostype & version
diff --git a/kernel/exit.c b/kernel/exit.c
index b519abee2c541..8c820aa7b9c5d 100644
--- a/kernel/exit.c
+++ b/kernel/exit.c
@@ -927,7 +927,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);