From owner-svn-src-stable@FreeBSD.ORG Fri Jun 15 17:31:16 2012 Return-Path: Delivered-To: svn-src-stable@freebsd.org Received: from mx1.freebsd.org (unknown [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 52A9A106566C; Fri, 15 Jun 2012 17:31:16 +0000 (UTC) (envelope-from kib@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [69.147.83.44]) by mx1.freebsd.org (Postfix) with ESMTP id 3C9918FC1B; Fri, 15 Jun 2012 17:31:16 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q5FHVGb0094675; Fri, 15 Jun 2012 17:31:16 GMT (envelope-from kib@svn.freebsd.org) Received: (from kib@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id q5FHVF8v094670; Fri, 15 Jun 2012 17:31:15 GMT (envelope-from kib@svn.freebsd.org) Message-Id: <201206151731.q5FHVF8v094670@svn.freebsd.org> From: Konstantin Belousov Date: Fri, 15 Jun 2012 17:31:15 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org X-SVN-Group: stable-9 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r237140 - in stable/9/sys: i386/i386 kern powerpc/aim powerpc/booke X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 15 Jun 2012 17:31:16 -0000 Author: kib Date: Fri Jun 15 17:31:15 2012 New Revision: 237140 URL: http://svn.freebsd.org/changeset/base/237140 Log: MFC r230767: Enable nxstacks where supported. Modified: stable/9/sys/i386/i386/initcpu.c stable/9/sys/kern/imgact_elf.c stable/9/sys/powerpc/aim/mmu_oea64.c stable/9/sys/powerpc/booke/machdep.c Directory Properties: stable/9/sys/ (props changed) Modified: stable/9/sys/i386/i386/initcpu.c ============================================================================== --- stable/9/sys/i386/i386/initcpu.c Fri Jun 15 17:16:41 2012 (r237139) +++ stable/9/sys/i386/i386/initcpu.c Fri Jun 15 17:31:15 2012 (r237140) @@ -649,6 +649,8 @@ enable_sse(void) #endif } +extern int elf32_nxstack; + void initializecpu(void) { @@ -738,6 +740,7 @@ initializecpu(void) msr = rdmsr(MSR_EFER) | EFER_NXE; wrmsr(MSR_EFER, msr); pg_nx = PG_NX; + elf32_nxstack = 1; } #endif break; Modified: stable/9/sys/kern/imgact_elf.c ============================================================================== --- stable/9/sys/kern/imgact_elf.c Fri Jun 15 17:16:41 2012 (r237139) +++ stable/9/sys/kern/imgact_elf.c Fri Jun 15 17:31:15 2012 (r237140) @@ -118,7 +118,12 @@ static int elf_legacy_coredump = 0; SYSCTL_INT(_debug, OID_AUTO, __elfN(legacy_coredump), CTLFLAG_RW, &elf_legacy_coredump, 0, ""); -static int __elfN(nxstack) = 0; +int __elfN(nxstack) = +#if defined(__amd64__) || defined(__powerpc64__) /* both 64 and 32 bit */ + 1; +#else + 0; +#endif SYSCTL_INT(__CONCAT(_kern_elf, __ELF_WORD_SIZE), OID_AUTO, nxstack, CTLFLAG_RW, &__elfN(nxstack), 0, __XSTRING(__CONCAT(ELF, __ELF_WORD_SIZE)) ": enable non-executable stack"); Modified: stable/9/sys/powerpc/aim/mmu_oea64.c ============================================================================== --- stable/9/sys/powerpc/aim/mmu_oea64.c Fri Jun 15 17:16:41 2012 (r237139) +++ stable/9/sys/powerpc/aim/mmu_oea64.c Fri Jun 15 17:31:15 2012 (r237140) @@ -1448,6 +1448,8 @@ moea64_uma_page_alloc(uma_zone_t zone, i return (void *)va; } +extern int elf32_nxstack; + void moea64_init(mmu_t mmu) { @@ -1467,6 +1469,8 @@ moea64_init(mmu_t mmu) uma_zone_set_allocf(moea64_mpvo_zone,moea64_uma_page_alloc); } + elf32_nxstack = 1; + moea64_initialized = TRUE; } Modified: stable/9/sys/powerpc/booke/machdep.c ============================================================================== --- stable/9/sys/powerpc/booke/machdep.c Fri Jun 15 17:16:41 2012 (r237139) +++ stable/9/sys/powerpc/booke/machdep.c Fri Jun 15 17:31:15 2012 (r237140) @@ -192,6 +192,8 @@ void print_kernel_section_addr(void); void print_kenv(void); u_int booke_init(uint32_t, uint32_t); +extern int elf32_nxstack; + static void cpu_e500_startup(void *dummy) { @@ -227,6 +229,9 @@ cpu_e500_startup(void *dummy) /* Set up buffers, so they can be used to read disk labels. */ bufinit(); vm_pager_bufferinit(); + + /* Cpu supports execution permissions on the pages. */ + elf32_nxstack = 1; } static char *