Date: Sat, 8 Jan 2011 18:41:19 +0000 (UTC) From: Konstantin Belousov <kib@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r217160 - head/sys/kern Message-ID: <201101081841.p08IfKfa000906@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: kib Date: Sat Jan 8 18:41:19 2011 New Revision: 217160 URL: http://svn.freebsd.org/changeset/base/217160 Log: Use the same expression to report stack protection mode for AT_STACKEXEC as the expression used by exec_new_vmspace(). Modified: head/sys/kern/imgact_elf.c Modified: head/sys/kern/imgact_elf.c ============================================================================== --- head/sys/kern/imgact_elf.c Sat Jan 8 18:31:23 2011 (r217159) +++ head/sys/kern/imgact_elf.c Sat Jan 8 18:41:19 2011 (r217160) @@ -982,8 +982,9 @@ __elfN(freebsd_fixup)(register_t **stack AUXARGS_ENTRY(pos, AT_PAGESIZES, imgp->pagesizes); AUXARGS_ENTRY(pos, AT_PAGESIZESLEN, imgp->pagesizeslen); } - AUXARGS_ENTRY(pos, AT_STACKPROT, imgp->stack_prot != 0 ? - imgp->stack_prot : imgp->sysent->sv_stackprot); + AUXARGS_ENTRY(pos, AT_STACKPROT, imgp->sysent->sv_shared_page_obj + != NULL && imgp->stack_prot != 0 ? imgp->stack_prot : + imgp->sysent->sv_stackprot); AUXARGS_ENTRY(pos, AT_NULL, 0); free(imgp->auxargs, M_TEMP);
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201101081841.p08IfKfa000906>