From 1461886fee76d41f89b5ab9b2eac91fa607f5fbd Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Sun, 10 Mar 2019 07:20:32 +0100 Subject: [PATCH] drop xtensa patch from older kernels --- queue-3.18/series | 1 - queue-3.18/xtensa-fix-get_wchan.patch | 35 --------------------------- queue-4.4/series | 1 - queue-4.4/xtensa-fix-get_wchan.patch | 35 --------------------------- queue-4.9/series | 1 - queue-4.9/xtensa-fix-get_wchan.patch | 35 --------------------------- 6 files changed, 108 deletions(-) delete mode 100644 queue-3.18/xtensa-fix-get_wchan.patch delete mode 100644 queue-4.4/xtensa-fix-get_wchan.patch delete mode 100644 queue-4.9/xtensa-fix-get_wchan.patch diff --git a/queue-3.18/series b/queue-3.18/series index 2d9771878ee..8147bd974ca 100644 --- a/queue-3.18/series +++ b/queue-3.18/series @@ -52,4 +52,3 @@ net-phy-micrel-ksz8061-link-failure-after-cable-connect.patch netlabel-fix-out-of-bounds-memory-accesses.patch ip6mr-do-not-call-__ip6_inc_stats-from-preemptible-context.patch hugetlbfs-fix-races-and-page-leaks-during-migration.patch -xtensa-fix-get_wchan.patch diff --git a/queue-3.18/xtensa-fix-get_wchan.patch b/queue-3.18/xtensa-fix-get_wchan.patch deleted file mode 100644 index 240495ffb3c..00000000000 --- a/queue-3.18/xtensa-fix-get_wchan.patch +++ /dev/null @@ -1,35 +0,0 @@ -From d90b88fd3653f1fb66ecc6571b860d5a5749fa56 Mon Sep 17 00:00:00 2001 -From: Max Filippov -Date: Wed, 2 Jan 2019 01:08:32 -0800 -Subject: xtensa: fix get_wchan - -From: Max Filippov - -commit d90b88fd3653f1fb66ecc6571b860d5a5749fa56 upstream. - -Stack unwinding is implemented incorrectly in xtensa get_wchan: instead -of extracting a0 and a1 registers from the spill location under the -stack pointer it extracts a word pointed to by the stack pointer and -subtracts 4 or 3 from it. - -Cc: stable@vger.kernel.org -Signed-off-by: Max Filippov -Signed-off-by: Greg Kroah-Hartman - ---- - arch/xtensa/kernel/process.c | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - ---- a/arch/xtensa/kernel/process.c -+++ b/arch/xtensa/kernel/process.c -@@ -303,8 +303,8 @@ unsigned long get_wchan(struct task_stru - - /* Stack layout: sp-4: ra, sp-3: sp' */ - -- pc = MAKE_PC_FROM_RA(*(unsigned long*)sp - 4, sp); -- sp = *(unsigned long *)sp - 3; -+ pc = MAKE_PC_FROM_RA(SPILL_SLOT(sp, 0), sp); -+ sp = SPILL_SLOT(sp, 1); - } while (count++ < 16); - return 0; - } diff --git a/queue-4.4/series b/queue-4.4/series index aa0a9cad419..f420af31804 100644 --- a/queue-4.4/series +++ b/queue-4.4/series @@ -74,7 +74,6 @@ x86-cpu-amd-set-the-cpb-bit-unconditionally-on-f17h.patch applicom-fix-potential-spectre-v1-vulnerabilities.patch mips-irq-allocate-accurate-order-pages-for-irq-stack.patch hugetlbfs-fix-races-and-page-leaks-during-migration.patch -xtensa-fix-get_wchan.patch netlabel-fix-out-of-bounds-memory-accesses.patch net-dsa-mv88e6xxx-fix-u64-statistics.patch ip6mr-do-not-call-__ip6_inc_stats-from-preemptible-context.patch diff --git a/queue-4.4/xtensa-fix-get_wchan.patch b/queue-4.4/xtensa-fix-get_wchan.patch deleted file mode 100644 index 16cafd95bae..00000000000 --- a/queue-4.4/xtensa-fix-get_wchan.patch +++ /dev/null @@ -1,35 +0,0 @@ -From d90b88fd3653f1fb66ecc6571b860d5a5749fa56 Mon Sep 17 00:00:00 2001 -From: Max Filippov -Date: Wed, 2 Jan 2019 01:08:32 -0800 -Subject: xtensa: fix get_wchan - -From: Max Filippov - -commit d90b88fd3653f1fb66ecc6571b860d5a5749fa56 upstream. - -Stack unwinding is implemented incorrectly in xtensa get_wchan: instead -of extracting a0 and a1 registers from the spill location under the -stack pointer it extracts a word pointed to by the stack pointer and -subtracts 4 or 3 from it. - -Cc: stable@vger.kernel.org -Signed-off-by: Max Filippov -Signed-off-by: Greg Kroah-Hartman - ---- - arch/xtensa/kernel/process.c | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - ---- a/arch/xtensa/kernel/process.c -+++ b/arch/xtensa/kernel/process.c -@@ -306,8 +306,8 @@ unsigned long get_wchan(struct task_stru - - /* Stack layout: sp-4: ra, sp-3: sp' */ - -- pc = MAKE_PC_FROM_RA(*(unsigned long*)sp - 4, sp); -- sp = *(unsigned long *)sp - 3; -+ pc = MAKE_PC_FROM_RA(SPILL_SLOT(sp, 0), sp); -+ sp = SPILL_SLOT(sp, 1); - } while (count++ < 16); - return 0; - } diff --git a/queue-4.9/series b/queue-4.9/series index 4d0a8afdd6d..abb83734fd7 100644 --- a/queue-4.9/series +++ b/queue-4.9/series @@ -29,5 +29,4 @@ x86-cpu-amd-set-the-cpb-bit-unconditionally-on-f17h.patch applicom-fix-potential-spectre-v1-vulnerabilities.patch mips-irq-allocate-accurate-order-pages-for-irq-stack.patch hugetlbfs-fix-races-and-page-leaks-during-migration.patch -xtensa-fix-get_wchan.patch exec-fix-mem-leak-in-kernel_read_file.patch diff --git a/queue-4.9/xtensa-fix-get_wchan.patch b/queue-4.9/xtensa-fix-get_wchan.patch deleted file mode 100644 index 9c8835861c0..00000000000 --- a/queue-4.9/xtensa-fix-get_wchan.patch +++ /dev/null @@ -1,35 +0,0 @@ -From d90b88fd3653f1fb66ecc6571b860d5a5749fa56 Mon Sep 17 00:00:00 2001 -From: Max Filippov -Date: Wed, 2 Jan 2019 01:08:32 -0800 -Subject: xtensa: fix get_wchan - -From: Max Filippov - -commit d90b88fd3653f1fb66ecc6571b860d5a5749fa56 upstream. - -Stack unwinding is implemented incorrectly in xtensa get_wchan: instead -of extracting a0 and a1 registers from the spill location under the -stack pointer it extracts a word pointed to by the stack pointer and -subtracts 4 or 3 from it. - -Cc: stable@vger.kernel.org -Signed-off-by: Max Filippov -Signed-off-by: Greg Kroah-Hartman - ---- - arch/xtensa/kernel/process.c | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - ---- a/arch/xtensa/kernel/process.c -+++ b/arch/xtensa/kernel/process.c -@@ -311,8 +311,8 @@ unsigned long get_wchan(struct task_stru - - /* Stack layout: sp-4: ra, sp-3: sp' */ - -- pc = MAKE_PC_FROM_RA(*(unsigned long*)sp - 4, sp); -- sp = *(unsigned long *)sp - 3; -+ pc = MAKE_PC_FROM_RA(SPILL_SLOT(sp, 0), sp); -+ sp = SPILL_SLOT(sp, 1); - } while (count++ < 16); - return 0; - } -- 2.47.2