From e2cdc863cd05f9fd0d96ec62ac990b3d278e5130 Mon Sep 17 00:00:00 2001 From: marcel Date: Sun, 27 Nov 2011 20:10:32 +0000 Subject: [PATCH] MFC rev. 227629, stable/9 rev 228041: Wire the kernel text RWX, rather than RX. We're not quite ready for having kernel text non-writable, because we still need to apply relocations. On top of that, the PBVM page table has all pages marked as RWX, so it's an inconsistency to begin with. Approved by: re (kib) git-svn-id: svn://svn.freebsd.org/base/releng/9.0@228042 ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f --- sys/boot/ia64/common/exec.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/boot/ia64/common/exec.c b/sys/boot/ia64/common/exec.c index 65886fa8..b721f97b 100644 --- a/sys/boot/ia64/common/exec.c +++ b/sys/boot/ia64/common/exec.c @@ -187,7 +187,7 @@ mmu_setup_paged(struct bootinfo *bi) pa = ia64_va2pa(ia64_text_start, &ia64_text_size); ia64_text_size = sz; /* XXX */ shft = sz2shft(ia64_text_start, ia64_text_size); - shft = mmu_wire(ia64_text_start, (uintptr_t)pa, shft, PTE_AR_RX); + shft = mmu_wire(ia64_text_start, (uintptr_t)pa, shft, PTE_AR_RWX); ia64_copyin(&shft, (uintptr_t)&bi->bi_text_mapped, 4); /* Wire as much of the data segment as well. */ -- 2.42.0