diff options
| author | kib <kib@FreeBSD.org> | 2011-01-08 18:41:19 +0000 |
|---|---|---|
| committer | kib <kib@FreeBSD.org> | 2011-01-08 18:41:19 +0000 |
| commit | 25001a6e2e10451d55d9e088f5a7604dfafb6e74 (patch) | |
| tree | 99eb31d1def35cac037cfbae6202ae5c3e51d5e3 /sys/kern | |
| parent | 75b3c29fb33f218e61a0088af36b6ca0bf67dcf5 (diff) | |
| download | FreeBSD-src-25001a6e2e10451d55d9e088f5a7604dfafb6e74.zip FreeBSD-src-25001a6e2e10451d55d9e088f5a7604dfafb6e74.tar.gz | |
Use the same expression to report stack protection mode for AT_STACKEXEC
as the expression used by exec_new_vmspace().
Diffstat (limited to 'sys/kern')
| -rw-r--r-- | sys/kern/imgact_elf.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/sys/kern/imgact_elf.c b/sys/kern/imgact_elf.c index 57001b0..38029b0 100644 --- a/sys/kern/imgact_elf.c +++ b/sys/kern/imgact_elf.c @@ -982,8 +982,9 @@ __elfN(freebsd_fixup)(register_t **stack_base, struct image_params *imgp) 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); |
