Author: marcel
Date: Sun Nov 27 20:10:32 2011
New Revision: 228042
URL: http://svn.freebsd.org/changeset/base/228042
Log:
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)
Modified:
releng/9.0/sys/boot/ia64/common/exec.c
Directory Properties:
releng/9.0/sys/ (props changed)
releng/9.0/sys/amd64/include/xen/ (props changed)
releng/9.0/sys/boot/ (props changed)
releng/9.0/sys/boot/i386/efi/ (props changed)
releng/9.0/sys/boot/ia64/efi/ (props changed)
releng/9.0/sys/boot/ia64/ski/ (props changed)
releng/9.0/sys/boot/powerpc/boot1.chrp/ (props changed)
releng/9.0/sys/boot/powerpc/ofw/ (props changed)
releng/9.0/sys/cddl/contrib/opensolaris/ (props changed)
releng/9.0/sys/conf/ (props changed)
releng/9.0/sys/contrib/dev/acpica/ (props changed)
releng/9.0/sys/contrib/octeon-sdk/ (props changed)
releng/9.0/sys/contrib/pf/ (props changed)
releng/9.0/sys/contrib/x86emu/ (props changed)
Modified: releng/9.0/sys/boot/ia64/common/exec.c
==============================================================================
--- releng/9.0/sys/boot/ia64/common/exec.c Sun Nov 27 20:07:30 2011
(r228041)
+++ releng/9.0/sys/boot/ia64/common/exec.c Sun Nov 27 20:10:32 2011
(r228042)
@@ -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. */
_______________________________________________
[email protected] mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "[email protected]"
