From: Greg Kroah-Hartman Date: Tue, 5 Feb 2019 08:45:12 +0000 (+0100) Subject: drop arm patch from 3.18 X-Git-Tag: v4.20.7~1 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=a6836c0194a69709c605acb2ae97b3883a4ba70a;p=thirdparty%2Fkernel%2Fstable-queue.git drop arm patch from 3.18 --- diff --git a/queue-3.18/arm64-hyp-stub-forbid-kprobing-of-the-hyp-stub.patch b/queue-3.18/arm64-hyp-stub-forbid-kprobing-of-the-hyp-stub.patch deleted file mode 100644 index 07895f33fad..00000000000 --- a/queue-3.18/arm64-hyp-stub-forbid-kprobing-of-the-hyp-stub.patch +++ /dev/null @@ -1,37 +0,0 @@ -From 8fac5cbdfe0f01254d9d265c6aa1a95f94f58595 Mon Sep 17 00:00:00 2001 -From: James Morse -Date: Thu, 24 Jan 2019 16:32:56 +0000 -Subject: arm64: hyp-stub: Forbid kprobing of the hyp-stub - -From: James Morse - -commit 8fac5cbdfe0f01254d9d265c6aa1a95f94f58595 upstream. - -The hyp-stub is loaded by the kernel's early startup code at EL2 -during boot, before KVM takes ownership later. The hyp-stub's -text is part of the regular kernel text, meaning it can be kprobed. - -A breakpoint in the hyp-stub causes the CPU to spin in el2_sync_invalid. - -Add it to the __hyp_text. - -Signed-off-by: James Morse -Cc: stable@vger.kernel.org -Signed-off-by: Will Deacon -Signed-off-by: Greg Kroah-Hartman - ---- - arch/arm64/kernel/hyp-stub.S | 2 ++ - 1 file changed, 2 insertions(+) - ---- a/arch/arm64/kernel/hyp-stub.S -+++ b/arch/arm64/kernel/hyp-stub.S -@@ -26,6 +26,8 @@ - #include - - .text -+ .pushsection .hyp.text, "ax" -+ - .align 11 - - ENTRY(__hyp_stub_vectors) diff --git a/queue-3.18/series b/queue-3.18/series index cc5dc22df27..c880f593546 100644 --- a/queue-3.18/series +++ b/queue-3.18/series @@ -23,7 +23,6 @@ l2tp-remove-l2specific_len-dependency-in-l2tp_core.patch l2tp-fix-reading-optional-fields-of-l2tpv3.patch cifs-do-not-count-enodata-as-failure-for-query-directory.patch fs-dcache-fix-incorrect-nr_dentry_unused-accounting-in-shrink_dcache_sb.patch -arm64-hyp-stub-forbid-kprobing-of-the-hyp-stub.patch gfs2-revert-fix-loop-in-gfs2_rbm_find.patch platform-x86-asus-nb-wmi-map-0x35-to-key_screenlock.patch platform-x86-asus-nb-wmi-drop-mapping-of-0x33-and-0x.patch