From: Eric Biggers <ebiggers@kernel.org>
To: stable@vger.kernel.org, Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cc: 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,
Andrey Ryabinin <ryabinin.a.a@gmail.com>,
Baoquan He <bhe@redhat.com>, Jonathan Corbet <corbet@lwn.net>,
Xuefeng Li <lixuefeng@loongson.cn>,
Tiezhu Yang <yangtiezhu@loongson.cn>,
Marco Elver <elver@google.com>,
Andrew Morton <akpm@linux-foundation.org>,
Linus Torvalds <torvalds@linux-foundation.org>
Subject: [PATCH 5.10 04/20] ubsan: no need to unset panic_on_warn in ubsan_epilogue()
Date: Tue, 24 Jan 2023 11:29:48 -0800 [thread overview]
Message-ID: <20230124193004.206841-5-ebiggers@kernel.org> (raw)
In-Reply-To: <20230124193004.206841-1-ebiggers@kernel.org>
From: Tiezhu Yang <yangtiezhu@loongson.cn>
commit d83ce027a54068fabb70d2c252e1ce2da86784a4 upstream.
panic_on_warn is unset inside panic(), so no need to unset it before
calling panic() in ubsan_epilogue().
Link: https://lkml.kernel.org/r/1644324666-15947-5-git-send-email-yangtiezhu@loongson.cn
Signed-off-by: Tiezhu Yang <yangtiezhu@loongson.cn>
Reviewed-by: Marco Elver <elver@google.com>
Cc: Andrey Ryabinin <ryabinin.a.a@gmail.com>
Cc: Baoquan He <bhe@redhat.com>
Cc: Jonathan Corbet <corbet@lwn.net>
Cc: Xuefeng Li <lixuefeng@loongson.cn>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: Eric Biggers <ebiggers@google.com>
---
lib/ubsan.c | 10 +---------
1 file changed, 1 insertion(+), 9 deletions(-)
diff --git a/lib/ubsan.c b/lib/ubsan.c
index adf8dcf3c84e6..d81d107f64f41 100644
--- a/lib/ubsan.c
+++ b/lib/ubsan.c
@@ -151,16 +151,8 @@ static void ubsan_epilogue(void)
current->in_ubsan--;
- if (panic_on_warn) {
- /*
- * This thread may hit another WARN() in the panic path.
- * Resetting this prevents additional WARN() from panicking the
- * system on this thread. Other threads are blocked by the
- * panic_mutex in panic().
- */
- panic_on_warn = 0;
+ if (panic_on_warn)
panic("panic_on_warn set ...\n");
- }
}
static void handle_overflow(struct overflow_data *data, void *lhs,
--
2.39.1
next prev parent reply other threads:[~2023-01-24 19:35 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-01-24 19:29 [PATCH 5.10 00/20] Backport oops_limit to 5.10 Eric Biggers
2023-01-24 19:29 ` [PATCH 5.10 01/20] sysctl: add a new register_sysctl_init() interface Eric Biggers
2023-01-24 19:29 ` [PATCH 5.10 02/20] kernel/panic: move panic sysctls to its own file Eric Biggers
2023-01-24 19:29 ` [PATCH 5.10 03/20] panic: unset panic_on_warn inside panic() Eric Biggers
2023-01-24 19:29 ` Eric Biggers [this message]
2023-01-24 19:29 ` [PATCH 5.10 05/20] kasan: no need to unset panic_on_warn in end_report() Eric Biggers
2023-01-24 19:29 ` [PATCH 5.10 06/20] exit: Add and use make_task_dead Eric Biggers
2023-01-24 19:29 ` [PATCH 5.10 07/20] objtool: Add a missing comma to avoid string concatenation Eric Biggers
2023-01-24 19:29 ` [PATCH 5.10 08/20] hexagon: Fix function name in die() Eric Biggers
2023-01-24 19:29 ` [PATCH 5.10 09/20] h8300: Fix build errors from do_exit() to make_task_dead() transition Eric Biggers
2023-01-24 19:29 ` [PATCH 5.10 10/20] csky: Fix function name in csky_alignment() and die() Eric Biggers
2023-01-24 19:29 ` [PATCH 5.10 11/20] ia64: make IA64_MCA_RECOVERY bool instead of tristate Eric Biggers
2023-01-24 19:29 ` [PATCH 5.10 12/20] panic: Separate sysctl logic from CONFIG_SMP Eric Biggers
2023-01-24 19:29 ` [PATCH 5.10 13/20] exit: Put an upper limit on how often we can oops Eric Biggers
2023-01-24 19:29 ` [PATCH 5.10 14/20] exit: Expose "oops_count" to sysfs Eric Biggers
2023-01-24 19:29 ` [PATCH 5.10 15/20] exit: Allow oops_limit to be disabled Eric Biggers
2023-01-24 19:30 ` [PATCH 5.10 16/20] panic: Consolidate open-coded panic_on_warn checks Eric Biggers
2023-01-24 19:30 ` [PATCH 5.10 17/20] panic: Introduce warn_limit Eric Biggers
2023-01-24 19:30 ` [PATCH 5.10 18/20] panic: Expose "warn_count" to sysfs Eric Biggers
2023-01-24 19:30 ` [PATCH 5.10 19/20] docs: Fix path paste-o for /sys/kernel/warn_count Eric Biggers
2023-01-24 19:30 ` [PATCH 5.10 20/20] exit: Use READ_ONCE() for all oops/warn limit reads Eric Biggers
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=20230124193004.206841-5-ebiggers@kernel.org \
--to=ebiggers@kernel.org \
--cc=akpm@linux-foundation.org \
--cc=bhe@redhat.com \
--cc=corbet@lwn.net \
--cc=ebiederm@xmission.com \
--cc=elver@google.com \
--cc=gregkh@linuxfoundation.org \
--cc=jannh@google.com \
--cc=keescook@chromium.org \
--cc=linux-hardening@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=lixuefeng@loongson.cn \
--cc=ryabinin.a.a@gmail.com \
--cc=sethjenkins@google.com \
--cc=sj@kernel.org \
--cc=stable@vger.kernel.org \
--cc=torvalds@linux-foundation.org \
--cc=yangtiezhu@loongson.cn \
/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;
as well as URLs for NNTP newsgroup(s).