lkml.org 
[lkml]   [2023]   [Feb]   [2]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.19 v2 10/15] exit: Allow oops_limit to be disabled
    Date
    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 fd65f4e651d55..e1d375df4f286 100644
    --- a/Documentation/sysctl/kernel.txt
    +++ b/Documentation/sysctl/kernel.txt
    @@ -559,8 +559,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 5cd8a34257650..b2f0aaf6bee78 100644
    --- a/kernel/exit.c
    +++ b/kernel/exit.c
    @@ -986,7 +986,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
    \
     
     \ /
      Last update: 2023-03-27 00:08    [W:4.114 / U:0.472 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site