commit e08eb72e4aad99bec2505d4d9e0c71aef9f23aef
author Linux Build Service Account <lnxbuild@localhost> Wed Mar 04 06:09:16 2020 -0800
committer Gerrit - the friendly Code Review server <code-review@localhost> Wed Mar 04 06:09:15 2020 -0800
tree e18f04ff9cef259b2fe180bfa72a6f1a688004c2
parent 01d81fb3dbaa1003cde07ccaee3307e9c11ddad8
parent 4a5a8781082fc4061dffe9dc5c203aacd0a28118

Merge "arm: mm: restrict EXEC to text and init"

arch/arm/mm/mmu.c

diff --git a/arch/arm/mm/mmu.c b/arch/arm/mm/mmu.c
index f898706..d9375c1 100644
--- a/arch/arm/mm/mmu.c
+++ b/arch/arm/mm/mmu.c
@@ -1672,7 +1672,13 @@
 	pte = start_pte;
 
 	do {
-		set_pte_ext(pte, pfn_pte(pfn, type->prot_pte), 0);
+		if (((unsigned long)_stext <= addr) &&
+			(addr < (unsigned long)__init_end))
+			set_pte_ext(pte, pfn_pte(pfn,
+				mem_types[MT_MEMORY_RWX].prot_pte), 0);
+		else
+			set_pte_ext(pte, pfn_pte(pfn,
+				mem_types[MT_MEMORY_RW].prot_pte), 0);
 		pfn++;
 	} while (pte++, addr += PAGE_SIZE, addr != end);