linuxppc-dev.lists.ozlabs.org archive mirror
 help / color / mirror / Atom feed
From: Balbir Singh <bsingharora@gmail.com>
To: linuxppc-dev@lists.ozlabs.org, mpe@ellerman.id.au
Cc: naveen.n.rao@linux.vnet.ibm.com, christophe.leroy@c-s.fr,
	paulus@samba.org, Balbir Singh <bsingharora@gmail.com>
Subject: [PATCH v5 6/7] mm/radix: Fix permissions correctly for interrupt_vectors
Date: Thu, 29 Jun 2017 03:04:10 +1000	[thread overview]
Message-ID: <20170628170411.28864-7-bsingharora@gmail.com> (raw)
In-Reply-To: <20170628170411.28864-1-bsingharora@gmail.com>

Commit 9abcc98 introduced marking kernel text as executable,
but missed some bits of the changes from hash_utils_64.c, where
under CONFIG_RELOCATABLE with CONFIG_RELOCATABLE_TEST or a kdump
kernel, if the size of the mapping was less than 1G, we end up
marking the first page (address range 0->mapping_size) as non
executable. As a side-effect none of the exception handlers
work

fixes - Commit 9abcc981de97
("powerpc/mm/radix: Only add X for pages overlapping kernel text")

Signed-off-by: Balbir Singh <bsingharora@gmail.com>
---
 arch/powerpc/mm/pgtable-radix.c | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/arch/powerpc/mm/pgtable-radix.c b/arch/powerpc/mm/pgtable-radix.c
index 6dc9923..ec21f97 100644
--- a/arch/powerpc/mm/pgtable-radix.c
+++ b/arch/powerpc/mm/pgtable-radix.c
@@ -230,6 +230,14 @@ static int __meminit create_physical_mapping(unsigned long start,
 		else
 			prot = PAGE_KERNEL;
 
+		/*
+		 * See the comment in hash_utils_64.c
+		 */
+		if ((PHYSICAL_START > MEMORY_START) &&
+			overlaps_interrupt_vector_text(vaddr,
+							vaddr + mapping_size))
+			prot = PAGE_KERNEL_X;
+
 		rc = radix__map_kernel_page(vaddr, addr, prot, mapping_size);
 		if (rc)
 			return rc;
-- 
2.9.4

  parent reply	other threads:[~2017-06-28 17:04 UTC|newest]

Thread overview: 10+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2017-06-28 17:04 [PATCH v5 0/7] Provide STRICT_KERNEL_RWX for powerpc Balbir Singh
2017-06-28 17:04 ` [PATCH v5 1/7] powerpc/lib/code-patching: Use alternate map for patch_instruction() Balbir Singh
2017-06-28 17:04 ` [PATCH v5 2/7] powerpc/vmlinux.lds: Align __init_begin to 16M Balbir Singh
2017-06-29 11:29   ` David Laight
2017-06-29 11:36     ` Balbir Singh
2017-06-28 17:04 ` [PATCH v5 3/7] powerpc/platform/pseries/lpar: Fix updatepp and updateboltedpp Balbir Singh
2017-06-28 17:04 ` [PATCH v5 4/7] powerpc/mm/hash: Implement mark_rodata_ro() for hash Balbir Singh
2017-06-28 17:04 ` [PATCH v5 5/7] powerpc/mm/radix: Implement mark_rodata_ro() for radix Balbir Singh
2017-06-28 17:04 ` Balbir Singh [this message]
2017-06-28 17:04 ` [PATCH v5 7/7] powerpc/Kconfig: Enable STRICT_KERNEL_RWX Balbir Singh

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20170628170411.28864-7-bsingharora@gmail.com \
    --to=bsingharora@gmail.com \
    --cc=christophe.leroy@c-s.fr \
    --cc=linuxppc-dev@lists.ozlabs.org \
    --cc=mpe@ellerman.id.au \
    --cc=naveen.n.rao@linux.vnet.ibm.com \
    --cc=paulus@samba.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).