diff options
| author | Paul Gortmaker <paul.gortmaker@windriver.com> | 2018-07-23 10:13:34 -0400 |
|---|---|---|
| committer | Paul Gortmaker <paul.gortmaker@windriver.com> | 2018-07-23 10:13:34 -0400 |
| commit | 1ee4f322d17e712767de4f72e6f1467c7c23669d (patch) | |
| tree | a3e2966af4ec0f0e00f392f1c699d3297251a877 | |
| parent | 698661c1564c0857a743a3309556c409f5e12677 (diff) | |
| download | longterm-queue-4.12-1ee4f322d17e712767de4f72e6f1467c7c23669d.tar.gz | |
arm64: remove another already applied patch
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
| -rw-r--r-- | queue/arm64-fix-CONFIG_DEBUG_WX-address-reporting.patch | 40 | ||||
| -rw-r--r-- | queue/series | 1 |
2 files changed, 0 insertions, 41 deletions
diff --git a/queue/arm64-fix-CONFIG_DEBUG_WX-address-reporting.patch b/queue/arm64-fix-CONFIG_DEBUG_WX-address-reporting.patch deleted file mode 100644 index 57d65ff..0000000 --- a/queue/arm64-fix-CONFIG_DEBUG_WX-address-reporting.patch +++ /dev/null @@ -1,40 +0,0 @@ -From 1d08a044cf12aee37dfd54837558e3295287b343 Mon Sep 17 00:00:00 2001 -From: Mark Rutland <mark.rutland@arm.com> -Date: Wed, 13 Dec 2017 11:45:42 +0000 -Subject: [PATCH] arm64: fix CONFIG_DEBUG_WX address reporting - -commit 1d08a044cf12aee37dfd54837558e3295287b343 upstream. - -In ptdump_check_wx(), we pass walk_pgd() a start address of 0 (rather -than VA_START) for the init_mm. This means that any reported W&X -addresses are offset by VA_START, which is clearly wrong and can make -them appear like userspace addresses. - -Fix this by telling the ptdump code that we're walking init_mm starting -at VA_START. We don't need to update the addr_markers, since these are -still valid bounds regardless. - -Cc: <stable@vger.kernel.org> -Fixes: 1404d6f13e47 ("arm64: dump: Add checking for writable and exectuable pages") -Signed-off-by: Mark Rutland <mark.rutland@arm.com> -Cc: Kees Cook <keescook@chromium.org> -Cc: Laura Abbott <labbott@redhat.com> -Reported-by: Timur Tabi <timur@codeaurora.org> -Signed-off-by: Will Deacon <will.deacon@arm.com> - -diff --git a/arch/arm64/mm/dump.c b/arch/arm64/mm/dump.c -index ca74a2aace42..7b60d62ac593 100644 ---- a/arch/arm64/mm/dump.c -+++ b/arch/arm64/mm/dump.c -@@ -389,7 +389,7 @@ void ptdump_check_wx(void) - .check_wx = true, - }; - -- walk_pgd(&st, &init_mm, 0); -+ walk_pgd(&st, &init_mm, VA_START); - note_page(&st, 0, 0, 0); - if (st.wx_pages || st.uxn_pages) - pr_warn("Checked W+X mappings: FAILED, %lu W+X pages found, %lu non-UXN pages found\n", --- -2.15.0 - diff --git a/queue/series b/queue/series index dc3dc6e..05ed326 100644 --- a/queue/series +++ b/queue/series @@ -13,7 +13,6 @@ ceph-drop-negative-child-dentries-before-try-pruning.patch usb-xhci-fix-TDS-for-MTK-xHCI1.1.patch xhci-Don-t-add-a-virt_dev-to-the-devs-array-before-i.patch nfs-don-t-wait-on-commit-in-nfs_commit_inode-if-ther.patch -arm64-fix-CONFIG_DEBUG_WX-address-reporting.patch scsi-core-Fix-a-scsi_show_rq-NULL-pointer-dereferenc.patch dm-fix-various-targets-to-dm_register_target-after-m.patch iw_cxgb4-only-insert-drain-cqes-if-wq-is-flushed.patch |