diff options
| author | Ben Hutchings <ben@decadent.org.uk> | 2019-04-27 13:15:15 +0100 |
|---|---|---|
| committer | Ben Hutchings <ben@decadent.org.uk> | 2019-04-27 13:15:15 +0100 |
| commit | 567fbda0c674fd0ea8900185bffd93fe4f2e3a2b (patch) | |
| tree | d0908b9b262a33fbdd4fe72df01c3afbd3616534 | |
| parent | 4dd0ca967b8e5e52e7c8afe779a634d9266ccd71 (diff) | |
| download | linux-stable-queue-567fbda0c674fd0ea8900185bffd93fe4f2e3a2b.tar.gz | |
Drop arm64 patch that causes a link error
| -rw-r--r-- | queue-3.16/arm64-hyp-stub-forbid-kprobing-of-the-hyp-stub.patch | 32 | ||||
| -rw-r--r-- | queue-3.16/series | 1 |
2 files changed, 0 insertions, 33 deletions
diff --git a/queue-3.16/arm64-hyp-stub-forbid-kprobing-of-the-hyp-stub.patch b/queue-3.16/arm64-hyp-stub-forbid-kprobing-of-the-hyp-stub.patch deleted file mode 100644 index 11297bb5..00000000 --- a/queue-3.16/arm64-hyp-stub-forbid-kprobing-of-the-hyp-stub.patch +++ /dev/null @@ -1,32 +0,0 @@ -From: James Morse <james.morse@arm.com> -Date: Thu, 24 Jan 2019 16:32:56 +0000 -Subject: arm64: hyp-stub: Forbid kprobing of the hyp-stub - -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 <james.morse@arm.com> -Signed-off-by: Will Deacon <will.deacon@arm.com> -Signed-off-by: Ben Hutchings <ben@decadent.org.uk> ---- - 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 -@@ -25,6 +25,8 @@ - #include <asm/virt.h> - - .text -+ .pushsection .hyp.text, "ax" -+ - .align 11 - - ENTRY(__hyp_stub_vectors) diff --git a/queue-3.16/series b/queue-3.16/series index a1f67eeb..8f77cdc1 100644 --- a/queue-3.16/series +++ b/queue-3.16/series @@ -79,7 +79,6 @@ usb-gadget-musb-fix-short-isoc-packets-with-inventra-dma.patch fs-dcache-fix-incorrect-nr_dentry_unused-accounting-in.patch l2tp-copy-4-more-bytes-to-linear-part-if-necessary.patch mac80211-ensure-that-mgmt-tx-skbs-have-tailroom-for-encryption.patch -arm64-hyp-stub-forbid-kprobing-of-the-hyp-stub.patch skge-potential-memory-corruption-in-skge_get_regs.patch mm-oom-fix-use-after-free-in-oom_kill_process.patch mm-hwpoison-use-do_send_sig_info-instead-of-force_sig.patch |