drop mips-fix-malformed-nt_file-and-nt_siginfo-in-32bit-coredumps.patch

from 4.19 and 5.4 trees as it breaks the build

diff --git a/queue-4.19/mips-fix-malformed-nt_file-and-nt_siginfo-in-32bit-coredumps.patch b/queue-4.19/mips-fix-malformed-nt_file-and-nt_siginfo-in-32bit-coredumps.patch
deleted file mode 100644 (file)
index bd31889..0000000
--- a/queue-4.19/mips-fix-malformed-nt_file-and-nt_siginfo-in-32bit-coredumps.patch
+++ /dev/null
@@ -1,61 +0,0 @@
-From 698222457465ce343443be81c5512edda86e5914 Mon Sep 17 00:00:00 2001
-From: Al Viro <viro@zeniv.linux.org.uk>
-Date: Thu, 24 Dec 2020 19:44:38 +0000
-Subject: MIPS: Fix malformed NT_FILE and NT_SIGINFO in 32bit coredumps
-
-From: Al Viro <viro@zeniv.linux.org.uk>
-
-commit 698222457465ce343443be81c5512edda86e5914 upstream.
-
-Patches that introduced NT_FILE and NT_SIGINFO notes back in 2012
-had taken care of native (fs/binfmt_elf.c) and compat (fs/compat_binfmt_elf.c)
-coredumps; unfortunately, compat on mips (which does not go through the
-usual compat_binfmt_elf.c) had not been noticed.
-
-As the result, both N32 and O32 coredumps on 64bit mips kernels
-have those sections malformed enough to confuse the living hell out of
-all gdb and readelf versions (up to and including the tip of binutils-gdb.git).
-
-Longer term solution is to make both O32 and N32 compat use the
-regular compat_binfmt_elf.c, but that's too much for backports.  The minimal
-solution is to do in arch/mips/kernel/binfmt_elf[on]32.c the same thing
-those patches have done in fs/compat_binfmt_elf.c
-
-Cc: stable@kernel.org # v3.7+
-Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
-Signed-off-by: Thomas Bogendoerfer <tsbogend@alpha.franken.de>
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-
----
- arch/mips/kernel/binfmt_elfn32.c |    7 +++++++
- arch/mips/kernel/binfmt_elfo32.c |    7 +++++++
- 2 files changed, 14 insertions(+)
-
---- a/arch/mips/kernel/binfmt_elfn32.c
-+++ b/arch/mips/kernel/binfmt_elfn32.c
-@@ -103,4 +103,11 @@ jiffies_to_compat_timeval(unsigned long
- #undef ns_to_timeval
- #define ns_to_timeval ns_to_compat_timeval
- 
-+/*
-+ * Some data types as stored in coredump.
-+ */
-+#define user_long_t             compat_long_t
-+#define user_siginfo_t          compat_siginfo_t
-+#define copy_siginfo_to_external        copy_siginfo_to_external32
-+
- #include "../../../fs/binfmt_elf.c"
---- a/arch/mips/kernel/binfmt_elfo32.c
-+++ b/arch/mips/kernel/binfmt_elfo32.c
-@@ -106,4 +106,11 @@ jiffies_to_compat_timeval(unsigned long
- #undef ns_to_timeval
- #define ns_to_timeval ns_to_compat_timeval
- 
-+/*
-+ * Some data types as stored in coredump.
-+ */
-+#define user_long_t             compat_long_t
-+#define user_siginfo_t          compat_siginfo_t
-+#define copy_siginfo_to_external        copy_siginfo_to_external32
-+
- #include "../../../fs/binfmt_elf.c"

diff --git a/queue-4.19/series b/queue-4.19/series
index c4725cee97a454a96bed0764a0efd88eb4ba562c..44fb6a56b3e0f14e191a71a7b2f57afc48b73541 100644 (file)
--- a/queue-4.19/series
+++ b/queue-4.19/series
@@ -2,7 +2,6 @@ asoc-dapm-remove-widget-from-dirty-list-on-free.patch
 x86-hyperv-check-cpu-mask-after-interrupt-has-been-disabled.patch
 tracing-kprobes-do-the-notrace-functions-check-without-kprobes-on-ftrace.patch
 mips-boot-fix-unaligned-access-with-config_mips_raw_appended_dtb.patch
-mips-fix-malformed-nt_file-and-nt_siginfo-in-32bit-coredumps.patch
 mips-relocatable-fix-possible-boot-hangup-with-kaslr-enabled.patch
 acpi-scan-harden-acpi_device_add-against-device-id-overflows.patch
 mm-hugetlb-fix-potential-missing-huge-page-size-info.patch

diff --git a/queue-5.4/mips-fix-malformed-nt_file-and-nt_siginfo-in-32bit-coredumps.patch b/queue-5.4/mips-fix-malformed-nt_file-and-nt_siginfo-in-32bit-coredumps.patch
deleted file mode 100644 (file)
index dd78db0..0000000
--- a/queue-5.4/mips-fix-malformed-nt_file-and-nt_siginfo-in-32bit-coredumps.patch
+++ /dev/null
@@ -1,61 +0,0 @@
-From 698222457465ce343443be81c5512edda86e5914 Mon Sep 17 00:00:00 2001
-From: Al Viro <viro@zeniv.linux.org.uk>
-Date: Thu, 24 Dec 2020 19:44:38 +0000
-Subject: MIPS: Fix malformed NT_FILE and NT_SIGINFO in 32bit coredumps
-
-From: Al Viro <viro@zeniv.linux.org.uk>
-
-commit 698222457465ce343443be81c5512edda86e5914 upstream.
-
-Patches that introduced NT_FILE and NT_SIGINFO notes back in 2012
-had taken care of native (fs/binfmt_elf.c) and compat (fs/compat_binfmt_elf.c)
-coredumps; unfortunately, compat on mips (which does not go through the
-usual compat_binfmt_elf.c) had not been noticed.
-
-As the result, both N32 and O32 coredumps on 64bit mips kernels
-have those sections malformed enough to confuse the living hell out of
-all gdb and readelf versions (up to and including the tip of binutils-gdb.git).
-
-Longer term solution is to make both O32 and N32 compat use the
-regular compat_binfmt_elf.c, but that's too much for backports.  The minimal
-solution is to do in arch/mips/kernel/binfmt_elf[on]32.c the same thing
-those patches have done in fs/compat_binfmt_elf.c
-
-Cc: stable@kernel.org # v3.7+
-Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
-Signed-off-by: Thomas Bogendoerfer <tsbogend@alpha.franken.de>
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-
----
- arch/mips/kernel/binfmt_elfn32.c |    7 +++++++
- arch/mips/kernel/binfmt_elfo32.c |    7 +++++++
- 2 files changed, 14 insertions(+)
-
---- a/arch/mips/kernel/binfmt_elfn32.c
-+++ b/arch/mips/kernel/binfmt_elfn32.c
-@@ -103,4 +103,11 @@ jiffies_to_old_timeval32(unsigned long j
- #undef ns_to_timeval
- #define ns_to_timeval ns_to_old_timeval32
- 
-+/*
-+ * Some data types as stored in coredump.
-+ */
-+#define user_long_t             compat_long_t
-+#define user_siginfo_t          compat_siginfo_t
-+#define copy_siginfo_to_external        copy_siginfo_to_external32
-+
- #include "../../../fs/binfmt_elf.c"
---- a/arch/mips/kernel/binfmt_elfo32.c
-+++ b/arch/mips/kernel/binfmt_elfo32.c
-@@ -106,4 +106,11 @@ jiffies_to_old_timeval32(unsigned long j
- #undef ns_to_timeval
- #define ns_to_timeval ns_to_old_timeval32
- 
-+/*
-+ * Some data types as stored in coredump.
-+ */
-+#define user_long_t             compat_long_t
-+#define user_siginfo_t          compat_siginfo_t
-+#define copy_siginfo_to_external        copy_siginfo_to_external32
-+
- #include "../../../fs/binfmt_elf.c"

diff --git a/queue-5.4/series b/queue-5.4/series
index d056821b11392caf79b1bae55f50cff566259270..86caa597bfeca7b75cfc5159259217e3706aa45e 100644 (file)
--- a/queue-5.4/series
+++ b/queue-5.4/series
@@ -6,7 +6,6 @@ tracing-kprobes-do-the-notrace-functions-check-without-kprobes-on-ftrace.patch
 mips-fix-section-mismatch-in-reference.patch
 mips-lib-uncached-fix-non-standard-usage-of-variable-sp.patch
 mips-boot-fix-unaligned-access-with-config_mips_raw_appended_dtb.patch
-mips-fix-malformed-nt_file-and-nt_siginfo-in-32bit-coredumps.patch
 mips-relocatable-fix-possible-boot-hangup-with-kaslr-enabled.patch
 rdma-ocrdma-fix-use-after-free-in-ocrdma_dealloc_ucontext_pd.patch
 acpi-scan-harden-acpi_device_add-against-device-id-overflows.patch