From 856c801d25949ad11b269b09628e006d203b461c Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Fri, 22 Jan 2021 17:07:35 +0100 Subject: [PATCH] drop 2 patches from 4.4, 4.9, and 4.14 compiler.h-raise-minimum-version-of-gcc-to-5.1-for-arm64.patch mips-fix-malformed-nt_file-and-nt_siginfo-in-32bit-coredumps.patch --- ...imum-version-of-gcc-to-5.1-for-arm64.patch | 56 ----------------- ...le-and-nt_siginfo-in-32bit-coredumps.patch | 61 ------------------- queue-4.14/series | 2 - ...imum-version-of-gcc-to-5.1-for-arm64.patch | 56 ----------------- ...le-and-nt_siginfo-in-32bit-coredumps.patch | 61 ------------------- queue-4.4/series | 2 - ...imum-version-of-gcc-to-5.1-for-arm64.patch | 56 ----------------- ...le-and-nt_siginfo-in-32bit-coredumps.patch | 61 ------------------- queue-4.9/series | 2 - 9 files changed, 357 deletions(-) delete mode 100644 queue-4.14/compiler.h-raise-minimum-version-of-gcc-to-5.1-for-arm64.patch delete mode 100644 queue-4.14/mips-fix-malformed-nt_file-and-nt_siginfo-in-32bit-coredumps.patch delete mode 100644 queue-4.4/compiler.h-raise-minimum-version-of-gcc-to-5.1-for-arm64.patch delete mode 100644 queue-4.4/mips-fix-malformed-nt_file-and-nt_siginfo-in-32bit-coredumps.patch delete mode 100644 queue-4.9/compiler.h-raise-minimum-version-of-gcc-to-5.1-for-arm64.patch delete mode 100644 queue-4.9/mips-fix-malformed-nt_file-and-nt_siginfo-in-32bit-coredumps.patch diff --git a/queue-4.14/compiler.h-raise-minimum-version-of-gcc-to-5.1-for-arm64.patch b/queue-4.14/compiler.h-raise-minimum-version-of-gcc-to-5.1-for-arm64.patch deleted file mode 100644 index d02cfe6f31d..00000000000 --- a/queue-4.14/compiler.h-raise-minimum-version-of-gcc-to-5.1-for-arm64.patch +++ /dev/null @@ -1,56 +0,0 @@ -From dca5244d2f5b94f1809f0c02a549edf41ccd5493 Mon Sep 17 00:00:00 2001 -From: Will Deacon -Date: Tue, 12 Jan 2021 22:48:32 +0000 -Subject: compiler.h: Raise minimum version of GCC to 5.1 for arm64 - -From: Will Deacon - -commit dca5244d2f5b94f1809f0c02a549edf41ccd5493 upstream. - -GCC versions >= 4.9 and < 5.1 have been shown to emit memory references -beyond the stack pointer, resulting in memory corruption if an interrupt -is taken after the stack pointer has been adjusted but before the -reference has been executed. This leads to subtle, infrequent data -corruption such as the EXT4 problems reported by Russell King at the -link below. - -Life is too short for buggy compilers, so raise the minimum GCC version -required by arm64 to 5.1. - -Reported-by: Russell King -Suggested-by: Arnd Bergmann -Signed-off-by: Will Deacon -Tested-by: Nathan Chancellor -Reviewed-by: Nick Desaulniers -Reviewed-by: Nathan Chancellor -Acked-by: Linus Torvalds -Cc: -Cc: Theodore Ts'o -Cc: Florian Weimer -Cc: Peter Zijlstra -Cc: Nick Desaulniers -Link: https://lore.kernel.org/r/20210105154726.GD1551@shell.armlinux.org.uk -Link: https://lore.kernel.org/r/20210112224832.10980-1-will@kernel.org -Signed-off-by: Catalin Marinas -[will: backport to 4.4.y/4.9.y/4.14.y] -Signed-off-by: Will Deacon -Signed-off-by: Greg Kroah-Hartman ---- - include/linux/compiler-gcc.h | 6 ++++++ - 1 file changed, 6 insertions(+) - ---- a/include/linux/compiler-gcc.h -+++ b/include/linux/compiler-gcc.h -@@ -152,6 +152,12 @@ - - #if GCC_VERSION < 30200 - # error Sorry, your compiler is too old - please upgrade it. -+#elif defined(CONFIG_ARM64) && GCC_VERSION < 50100 -+/* -+ * https://gcc.gnu.org/bugzilla/show_bug.cgi?id=63293 -+ * https://lore.kernel.org/r/20210107111841.GN1551@shell.armlinux.org.uk -+ */ -+# error Sorry, your version of GCC is too old - please use 5.1 or newer. - #endif - - #if GCC_VERSION < 30300 diff --git a/queue-4.14/mips-fix-malformed-nt_file-and-nt_siginfo-in-32bit-coredumps.patch b/queue-4.14/mips-fix-malformed-nt_file-and-nt_siginfo-in-32bit-coredumps.patch deleted file mode 100644 index bd3188923e8..00000000000 --- a/queue-4.14/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 -Date: Thu, 24 Dec 2020 19:44:38 +0000 -Subject: MIPS: Fix malformed NT_FILE and NT_SIGINFO in 32bit coredumps - -From: Al Viro - -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 -Signed-off-by: Thomas Bogendoerfer -Signed-off-by: Greg Kroah-Hartman - ---- - 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.14/series b/queue-4.14/series index 246f77cf07f..f5fab24d15a 100644 --- a/queue-4.14/series +++ b/queue-4.14/series @@ -1,6 +1,5 @@ asoc-dapm-remove-widget-from-dirty-list-on-free.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 @@ -31,7 +30,6 @@ alsa-firewire-tascam-fix-integer-overflow-in-midi_port_work.patch alsa-fireface-fix-integer-overflow-in-transmit_midi_msg.patch netfilter-conntrack-fix-reading-nf_conntrack_buckets.patch usb-ohci-make-distrust_firmware-param-default-to-false.patch -compiler.h-raise-minimum-version-of-gcc-to-5.1-for-arm64.patch nfsd4-readdirplus-shouldn-t-return-parent-of-export.patch netxen_nic-fix-msi-msi-x-interrupts.patch rndis_host-set-proper-input-size-for-oid_gen_physical_medium-request.patch diff --git a/queue-4.4/compiler.h-raise-minimum-version-of-gcc-to-5.1-for-arm64.patch b/queue-4.4/compiler.h-raise-minimum-version-of-gcc-to-5.1-for-arm64.patch deleted file mode 100644 index 440ec2f2024..00000000000 --- a/queue-4.4/compiler.h-raise-minimum-version-of-gcc-to-5.1-for-arm64.patch +++ /dev/null @@ -1,56 +0,0 @@ -From dca5244d2f5b94f1809f0c02a549edf41ccd5493 Mon Sep 17 00:00:00 2001 -From: Will Deacon -Date: Tue, 12 Jan 2021 22:48:32 +0000 -Subject: compiler.h: Raise minimum version of GCC to 5.1 for arm64 - -From: Will Deacon - -commit dca5244d2f5b94f1809f0c02a549edf41ccd5493 upstream. - -GCC versions >= 4.9 and < 5.1 have been shown to emit memory references -beyond the stack pointer, resulting in memory corruption if an interrupt -is taken after the stack pointer has been adjusted but before the -reference has been executed. This leads to subtle, infrequent data -corruption such as the EXT4 problems reported by Russell King at the -link below. - -Life is too short for buggy compilers, so raise the minimum GCC version -required by arm64 to 5.1. - -Reported-by: Russell King -Suggested-by: Arnd Bergmann -Signed-off-by: Will Deacon -Tested-by: Nathan Chancellor -Reviewed-by: Nick Desaulniers -Reviewed-by: Nathan Chancellor -Acked-by: Linus Torvalds -Cc: -Cc: Theodore Ts'o -Cc: Florian Weimer -Cc: Peter Zijlstra -Cc: Nick Desaulniers -Link: https://lore.kernel.org/r/20210105154726.GD1551@shell.armlinux.org.uk -Link: https://lore.kernel.org/r/20210112224832.10980-1-will@kernel.org -Signed-off-by: Catalin Marinas -[will: backport to 4.4.y/4.9.y/4.14.y] -Signed-off-by: Will Deacon -Signed-off-by: Greg Kroah-Hartman ---- - include/linux/compiler-gcc.h | 6 ++++++ - 1 file changed, 6 insertions(+) - ---- a/include/linux/compiler-gcc.h -+++ b/include/linux/compiler-gcc.h -@@ -145,6 +145,12 @@ - - #if GCC_VERSION < 30200 - # error Sorry, your compiler is too old - please upgrade it. -+#elif defined(CONFIG_ARM64) && GCC_VERSION < 50100 -+/* -+ * https://gcc.gnu.org/bugzilla/show_bug.cgi?id=63293 -+ * https://lore.kernel.org/r/20210107111841.GN1551@shell.armlinux.org.uk -+ */ -+# error Sorry, your version of GCC is too old - please use 5.1 or newer. - #endif - - #if GCC_VERSION < 30300 diff --git a/queue-4.4/mips-fix-malformed-nt_file-and-nt_siginfo-in-32bit-coredumps.patch b/queue-4.4/mips-fix-malformed-nt_file-and-nt_siginfo-in-32bit-coredumps.patch deleted file mode 100644 index f6a0eba8bba..00000000000 --- a/queue-4.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 -Date: Thu, 24 Dec 2020 19:44:38 +0000 -Subject: MIPS: Fix malformed NT_FILE and NT_SIGINFO in 32bit coredumps - -From: Al Viro - -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 -Signed-off-by: Thomas Bogendoerfer -Signed-off-by: Greg Kroah-Hartman - ---- - 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 -@@ -130,4 +130,11 @@ cputime_to_compat_timeval(const cputime_ - value->tv_sec = jiffies / HZ; - } - -+/* -+ * 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 -@@ -149,4 +149,11 @@ cputime_to_compat_timeval(const cputime_ - value->tv_sec = jiffies / HZ; - } - -+/* -+ * 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.4/series b/queue-4.4/series index d6123a03b70..da39ffe5282 100644 --- a/queue-4.4/series +++ b/queue-4.4/series @@ -1,5 +1,4 @@ asoc-dapm-remove-widget-from-dirty-list-on-free.patch -mips-fix-malformed-nt_file-and-nt_siginfo-in-32bit-coredumps.patch mm-hugetlb-fix-potential-missing-huge-page-size-info.patch ext4-fix-bug-for-rename-with-rename_whiteout.patch arc-build-add-boot_targets-to-phony.patch @@ -17,7 +16,6 @@ rdma-usnic-fix-memleak-in-find_free_vf_and_create_qp_grp.patch mm-slub-consider-rest-of-partial-list-if-acquire_slab-fails.patch net-sunrpc-interpret-the-return-value-of-kstrtou32-correctly.patch usb-ohci-make-distrust_firmware-param-default-to-false.patch -compiler.h-raise-minimum-version-of-gcc-to-5.1-for-arm64.patch iio-buffer-fix-demux-update.patch nfsd4-readdirplus-shouldn-t-return-parent-of-export.patch net-cdc_ncm-correct-overhead-in-delayed_ndp_size.patch diff --git a/queue-4.9/compiler.h-raise-minimum-version-of-gcc-to-5.1-for-arm64.patch b/queue-4.9/compiler.h-raise-minimum-version-of-gcc-to-5.1-for-arm64.patch deleted file mode 100644 index df2f1b02cdd..00000000000 --- a/queue-4.9/compiler.h-raise-minimum-version-of-gcc-to-5.1-for-arm64.patch +++ /dev/null @@ -1,56 +0,0 @@ -From dca5244d2f5b94f1809f0c02a549edf41ccd5493 Mon Sep 17 00:00:00 2001 -From: Will Deacon -Date: Tue, 12 Jan 2021 22:48:32 +0000 -Subject: compiler.h: Raise minimum version of GCC to 5.1 for arm64 - -From: Will Deacon - -commit dca5244d2f5b94f1809f0c02a549edf41ccd5493 upstream. - -GCC versions >= 4.9 and < 5.1 have been shown to emit memory references -beyond the stack pointer, resulting in memory corruption if an interrupt -is taken after the stack pointer has been adjusted but before the -reference has been executed. This leads to subtle, infrequent data -corruption such as the EXT4 problems reported by Russell King at the -link below. - -Life is too short for buggy compilers, so raise the minimum GCC version -required by arm64 to 5.1. - -Reported-by: Russell King -Suggested-by: Arnd Bergmann -Signed-off-by: Will Deacon -Tested-by: Nathan Chancellor -Reviewed-by: Nick Desaulniers -Reviewed-by: Nathan Chancellor -Acked-by: Linus Torvalds -Cc: -Cc: Theodore Ts'o -Cc: Florian Weimer -Cc: Peter Zijlstra -Cc: Nick Desaulniers -Link: https://lore.kernel.org/r/20210105154726.GD1551@shell.armlinux.org.uk -Link: https://lore.kernel.org/r/20210112224832.10980-1-will@kernel.org -Signed-off-by: Catalin Marinas -[will: backport to 4.4.y/4.9.y/4.14.y] -Signed-off-by: Will Deacon -Signed-off-by: Greg Kroah-Hartman ---- - include/linux/compiler-gcc.h | 6 ++++++ - 1 file changed, 6 insertions(+) - ---- a/include/linux/compiler-gcc.h -+++ b/include/linux/compiler-gcc.h -@@ -149,6 +149,12 @@ - - #if GCC_VERSION < 30200 - # error Sorry, your compiler is too old - please upgrade it. -+#elif defined(CONFIG_ARM64) && GCC_VERSION < 50100 -+/* -+ * https://gcc.gnu.org/bugzilla/show_bug.cgi?id=63293 -+ * https://lore.kernel.org/r/20210107111841.GN1551@shell.armlinux.org.uk -+ */ -+# error Sorry, your version of GCC is too old - please use 5.1 or newer. - #endif - - #if GCC_VERSION < 30300 diff --git a/queue-4.9/mips-fix-malformed-nt_file-and-nt_siginfo-in-32bit-coredumps.patch b/queue-4.9/mips-fix-malformed-nt_file-and-nt_siginfo-in-32bit-coredumps.patch deleted file mode 100644 index ab2b82c452a..00000000000 --- a/queue-4.9/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 -Date: Thu, 24 Dec 2020 19:44:38 +0000 -Subject: MIPS: Fix malformed NT_FILE and NT_SIGINFO in 32bit coredumps - -From: Al Viro - -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 -Signed-off-by: Thomas Bogendoerfer -Signed-off-by: Greg Kroah-Hartman - ---- - 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 -@@ -110,4 +110,11 @@ cputime_to_compat_timeval(const cputime_ - value->tv_sec = jiffies / HZ; - } - -+/* -+ * 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 -@@ -113,4 +113,11 @@ cputime_to_compat_timeval(const cputime_ - value->tv_sec = jiffies / HZ; - } - -+/* -+ * 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.9/series b/queue-4.9/series index 2ecf95d7e28..0565d76f9c8 100644 --- a/queue-4.9/series +++ b/queue-4.9/series @@ -1,6 +1,5 @@ asoc-dapm-remove-widget-from-dirty-list-on-free.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 @@ -21,7 +20,6 @@ mm-slub-consider-rest-of-partial-list-if-acquire_slab-fails.patch net-sunrpc-interpret-the-return-value-of-kstrtou32-correctly.patch netfilter-conntrack-fix-reading-nf_conntrack_buckets.patch usb-ohci-make-distrust_firmware-param-default-to-false.patch -compiler.h-raise-minimum-version-of-gcc-to-5.1-for-arm64.patch nfsd4-readdirplus-shouldn-t-return-parent-of-export.patch net-cdc_ncm-correct-overhead-in-delayed_ndp_size.patch netxen_nic-fix-msi-msi-x-interrupts.patch -- 2.47.3