| From 4026b7faf247ed4d7c8aed0e19e13e2d2c331f03 Mon Sep 17 00:00:00 2001 |
| From: Sasha Levin <sashal@kernel.org> |
| Date: Thu, 18 Mar 2021 14:33:07 +0000 |
| Subject: bug: Remove redundant condition check in report_bug |
| |
| From: Andrew Scull <ascull@google.com> |
| |
| [ Upstream commit 3ad1a6cb0abc63d036fc866bd7c2c5983516dec5 ] |
| |
| report_bug() will return early if it cannot find a bug corresponding to |
| the provided address. The subsequent test for the bug will always be |
| true so remove it. |
| |
| Fixes: 1b4cfe3c0a30d ("lib/bug.c: exclude non-BUG/WARN exceptions from report_bug()") |
| Signed-off-by: Andrew Scull <ascull@google.com> |
| Cc: Peter Zijlstra <peterz@infradead.org> |
| Cc: "Steven Rostedt (VMware)" <rostedt@goodmis.org> |
| Reviewed-by: Steven Rostedt (VMware) <rostedt@goodmis.org> |
| Acked-by: Will Deacon <will@kernel.org> |
| Signed-off-by: Marc Zyngier <maz@kernel.org> |
| Link: https://lore.kernel.org/r/20210318143311.839894-2-ascull@google.com |
| Signed-off-by: Sasha Levin <sashal@kernel.org> |
| --- |
| lib/bug.c | 33 +++++++++++++++------------------ |
| 1 file changed, 15 insertions(+), 18 deletions(-) |
| |
| diff --git a/lib/bug.c b/lib/bug.c |
| index 7103440c0ee1..4ab398a2de93 100644 |
| --- a/lib/bug.c |
| +++ b/lib/bug.c |
| @@ -158,30 +158,27 @@ enum bug_trap_type report_bug(unsigned long bugaddr, struct pt_regs *regs) |
| |
| file = NULL; |
| line = 0; |
| - warning = 0; |
| |
| - if (bug) { |
| #ifdef CONFIG_DEBUG_BUGVERBOSE |
| #ifndef CONFIG_GENERIC_BUG_RELATIVE_POINTERS |
| - file = bug->file; |
| + file = bug->file; |
| #else |
| - file = (const char *)bug + bug->file_disp; |
| + file = (const char *)bug + bug->file_disp; |
| #endif |
| - line = bug->line; |
| + line = bug->line; |
| #endif |
| - warning = (bug->flags & BUGFLAG_WARNING) != 0; |
| - once = (bug->flags & BUGFLAG_ONCE) != 0; |
| - done = (bug->flags & BUGFLAG_DONE) != 0; |
| - |
| - if (warning && once) { |
| - if (done) |
| - return BUG_TRAP_TYPE_WARN; |
| - |
| - /* |
| - * Since this is the only store, concurrency is not an issue. |
| - */ |
| - bug->flags |= BUGFLAG_DONE; |
| - } |
| + warning = (bug->flags & BUGFLAG_WARNING) != 0; |
| + once = (bug->flags & BUGFLAG_ONCE) != 0; |
| + done = (bug->flags & BUGFLAG_DONE) != 0; |
| + |
| + if (warning && once) { |
| + if (done) |
| + return BUG_TRAP_TYPE_WARN; |
| + |
| + /* |
| + * Since this is the only store, concurrency is not an issue. |
| + */ |
| + bug->flags |= BUGFLAG_DONE; |
| } |
| |
| /* |
| -- |
| 2.30.2 |
| |
