drop queue-4.14/bug-use-pb-in-bug-and-stack-protector-failure.patch

diff --git a/queue-4.14/bug-use-pb-in-bug-and-stack-protector-failure.patch b/queue-4.14/bug-use-pb-in-bug-and-stack-protector-failure.patch
deleted file mode 100644 (file)
index e46d301..0000000
--- a/queue-4.14/bug-use-pb-in-bug-and-stack-protector-failure.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-From 0862ca422b79cb5aa70823ee0f07f6b468f86070 Mon Sep 17 00:00:00 2001
-From: Kees Cook <keescook@chromium.org>
-Date: Fri, 9 Mar 2018 15:50:59 -0800
-Subject: bug: use %pB in BUG and stack protector failure
-
-From: Kees Cook <keescook@chromium.org>
-
-commit 0862ca422b79cb5aa70823ee0f07f6b468f86070 upstream.
-
-The BUG and stack protector reports were still using a raw %p.  This
-changes it to %pB for more meaningful output.
-
-Link: http://lkml.kernel.org/r/20180301225704.GA34198@beast
-Fixes: ad67b74d2469 ("printk: hash addresses printed with %p")
-Signed-off-by: Kees Cook <keescook@chromium.org>
-Reviewed-by: Andrew Morton <akpm@linux-foundation.org>
-Cc: Ingo Molnar <mingo@kernel.org>
-Cc: Thomas Gleixner <tglx@linutronix.de>
-Cc: Peter Zijlstra <peterz@infradead.org>
-Cc: Borislav Petkov <bp@alien8.de>
-Cc: Richard Weinberger <richard.weinberger@gmail.com>,
-Cc: <stable@vger.kernel.org>
-Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
-Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-
----
- kernel/panic.c |    2 +-
- lib/bug.c      |    2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
---- a/kernel/panic.c
-+++ b/kernel/panic.c
-@@ -595,7 +595,7 @@ EXPORT_SYMBOL(warn_slowpath_null);
-  */
- __visible void __stack_chk_fail(void)
- {
--      panic("stack-protector: Kernel stack is corrupted in: %p\n",
-+      panic("stack-protector: Kernel stack is corrupted in: %pB\n",
-               __builtin_return_address(0));
- }
- EXPORT_SYMBOL(__stack_chk_fail);
---- a/lib/bug.c
-+++ b/lib/bug.c
-@@ -191,7 +191,7 @@ enum bug_trap_type report_bug(unsigned l
-       if (file)
-               pr_crit("kernel BUG at %s:%u!\n", file, line);
-       else
--              pr_crit("Kernel BUG at %p [verbose debug info unavailable]\n",
-+              pr_crit("Kernel BUG at %pB [verbose debug info unavailable]\n",
-                       (void *)bugaddr);
- 
-       return BUG_TRAP_TYPE_BUG;

diff --git a/queue-4.14/series b/queue-4.14/series
index bdb35b8403880c1b849a9519bf225b052b380d00..16ae6ddb6ef4ba7c9195b551193dad69613c4172 100644 (file)
--- a/queue-4.14/series
+++ b/queue-4.14/series
@@ -35,7 +35,6 @@ mips-ath25-check-for-kzalloc-allocation-failure.patch
 mips-octeon-irq-check-for-null-return-on-kzalloc-allocation.patch
 pci-dwc-fix-enumeration-end-when-reaching-root-subordinate.patch
 input-matrix_keypad-fix-race-when-disabling-interrupts.patch
-bug-use-pb-in-bug-and-stack-protector-failure.patch
 lib-bug.c-exclude-non-bug-warn-exceptions-from-report_bug.patch
 mm-memblock.c-hardcode-the-end_pfn-being-1.patch
 mm-page_alloc-fix-memmap_init_zone-pageblock-alignment.patch