From owner-svn-src-all@freebsd.org Wed Aug 14 09:57:01 2019 Return-Path: Delivered-To: svn-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 6AE82CD99B; Wed, 14 Aug 2019 09:57:01 +0000 (UTC) (envelope-from kib@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 467lNr6vj4z45hG; Wed, 14 Aug 2019 09:57:00 +0000 (UTC) (envelope-from kib@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id CA4252625F; Wed, 14 Aug 2019 09:57:00 +0000 (UTC) (envelope-from kib@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x7E9v07m082491; Wed, 14 Aug 2019 09:57:00 GMT (envelope-from kib@FreeBSD.org) Received: (from kib@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x7E9uxqD082476; Wed, 14 Aug 2019 09:56:59 GMT (envelope-from kib@FreeBSD.org) Message-Id: <201908140956.x7E9uxqD082476@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: kib set sender to kib@FreeBSD.org using -f From: Konstantin Belousov Date: Wed, 14 Aug 2019 09:56:59 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-12@freebsd.org Subject: svn commit: r351024 - in stable/12/sys: amd64/amd64 compat/freebsd32 compat/ia32 kern sys X-SVN-Group: stable-12 X-SVN-Commit-Author: kib X-SVN-Commit-Paths: in stable/12/sys: amd64/amd64 compat/freebsd32 compat/ia32 kern sys X-SVN-Commit-Revision: 351024 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 14 Aug 2019 09:57:01 -0000 Author: kib Date: Wed Aug 14 09:56:58 2019 New Revision: 351024 URL: https://svnweb.freebsd.org/changeset/base/351024 Log: MFC r350484, r350607, r350608: Make randomized stack gap between strings and pointers to argv/envs. Modified: stable/12/sys/amd64/amd64/elf_machdep.c stable/12/sys/compat/freebsd32/freebsd32_misc.c stable/12/sys/compat/ia32/ia32_sysvec.c stable/12/sys/kern/imgact_elf.c stable/12/sys/kern/kern_exec.c stable/12/sys/sys/imgact.h stable/12/sys/sys/imgact_elf.h stable/12/sys/sys/sysent.h Directory Properties: stable/12/ (props changed) Modified: stable/12/sys/amd64/amd64/elf_machdep.c ============================================================================== --- stable/12/sys/amd64/amd64/elf_machdep.c Wed Aug 14 09:53:30 2019 (r351023) +++ stable/12/sys/amd64/amd64/elf_machdep.c Wed Aug 14 09:56:58 2019 (r351024) @@ -83,6 +83,7 @@ struct sysentvec elf64_freebsd_sysvec = { .sv_schedtail = NULL, .sv_thread_detach = NULL, .sv_trap = NULL, + .sv_stackgap = elf64_stackgap, }; INIT_SYSENTVEC(elf64_sysvec, &elf64_freebsd_sysvec); Modified: stable/12/sys/compat/freebsd32/freebsd32_misc.c ============================================================================== --- stable/12/sys/compat/freebsd32/freebsd32_misc.c Wed Aug 14 09:53:30 2019 (r351023) +++ stable/12/sys/compat/freebsd32/freebsd32_misc.c Wed Aug 14 09:56:58 2019 (r351024) @@ -3189,6 +3189,9 @@ freebsd32_copyout_strings(struct image_params *imgp) destp = rounddown2(destp, sizeof(uint32_t)); vectp = (uint32_t *)destp; + if (imgp->sysent->sv_stackgap != NULL) + imgp->sysent->sv_stackgap(imgp, (u_long *)&vectp); + if (imgp->auxargs) { /* * Allocate room on the stack for the ELF auxargs Modified: stable/12/sys/compat/ia32/ia32_sysvec.c ============================================================================== --- stable/12/sys/compat/ia32/ia32_sysvec.c Wed Aug 14 09:53:30 2019 (r351023) +++ stable/12/sys/compat/ia32/ia32_sysvec.c Wed Aug 14 09:56:58 2019 (r351024) @@ -129,6 +129,7 @@ struct sysentvec ia32_freebsd_sysvec = { .sv_schedtail = NULL, .sv_thread_detach = NULL, .sv_trap = NULL, + .sv_stackgap = elf32_stackgap, }; INIT_SYSENTVEC(elf_ia32_sysvec, &ia32_freebsd_sysvec); Modified: stable/12/sys/kern/imgact_elf.c ============================================================================== --- stable/12/sys/kern/imgact_elf.c Wed Aug 14 09:53:30 2019 (r351023) +++ stable/12/sys/kern/imgact_elf.c Wed Aug 14 09:56:58 2019 (r351024) @@ -157,6 +157,12 @@ SYSCTL_INT(ASLR_NODE_OID, OID_AUTO, honor_sbrk, CTLFLA &__elfN(aslr_honor_sbrk), 0, __XSTRING(__CONCAT(ELF, __ELF_WORD_SIZE)) ": assume sbrk is used"); +static int __elfN(aslr_stack_gap) = 3; +SYSCTL_INT(ASLR_NODE_OID, OID_AUTO, stack_gap, CTLFLAG_RW, + &__elfN(aslr_stack_gap), 0, + __XSTRING(__CONCAT(ELF, __ELF_WORD_SIZE)) + ": maximum percentage of main stack to waste on a random gap"); + static Elf_Brandinfo *elf_brand_list[MAX_BRANDS]; #define aligned(a, t) (rounddown2((u_long)(a), sizeof(t)) == (u_long)(a)) @@ -2723,4 +2729,24 @@ __elfN(untrans_prot)(vm_prot_t prot) if (prot & VM_PROT_WRITE) flags |= PF_W; return (flags); +} + +void +__elfN(stackgap)(struct image_params *imgp, u_long *stack_base) +{ + u_long range, rbase, gap; + int pct; + + if ((imgp->map_flags & MAP_ASLR) == 0) + return; + pct = __elfN(aslr_stack_gap); + if (pct == 0) + return; + if (pct > 50) + pct = 50; + range = imgp->eff_stack_sz * pct / 100; + arc4rand(&rbase, sizeof(rbase), 0); + gap = rbase % range; + gap &= ~(sizeof(u_long) - 1); + *stack_base -= gap; } Modified: stable/12/sys/kern/kern_exec.c ============================================================================== --- stable/12/sys/kern/kern_exec.c Wed Aug 14 09:53:30 2019 (r351023) +++ stable/12/sys/kern/kern_exec.c Wed Aug 14 09:56:58 2019 (r351024) @@ -1144,6 +1144,9 @@ exec_new_vmspace(struct image_params *imgp, struct sys } else { ssiz = maxssiz; } + imgp->eff_stack_sz = lim_cur(curthread, RLIMIT_STACK); + if (ssiz < imgp->eff_stack_sz) + imgp->eff_stack_sz = ssiz; stack_addr = sv->sv_usrstack - ssiz; error = vm_map_stack(map, stack_addr, (vm_size_t)ssiz, obj != NULL && imgp->stack_prot != 0 ? imgp->stack_prot : @@ -1538,6 +1541,9 @@ exec_copyout_strings(struct image_params *imgp) destp = rounddown2(destp, sizeof(void *)); vectp = (char **)destp; + if (imgp->sysent->sv_stackgap != NULL) + imgp->sysent->sv_stackgap(imgp, (u_long *)&vectp); + if (imgp->auxargs) { /* * Allocate room on the stack for the ELF auxargs Modified: stable/12/sys/sys/imgact.h ============================================================================== --- stable/12/sys/sys/imgact.h Wed Aug 14 09:53:30 2019 (r351023) +++ stable/12/sys/sys/imgact.h Wed Aug 14 09:56:58 2019 (r351024) @@ -86,6 +86,7 @@ struct image_params { int pagesizeslen; vm_prot_t stack_prot; u_long stack_sz; + u_long eff_stack_sz; struct ucred *newcred; /* new credentials if changing */ bool credential_setid; /* true if becoming setid */ bool textset; Modified: stable/12/sys/sys/imgact_elf.h ============================================================================== --- stable/12/sys/sys/imgact_elf.h Wed Aug 14 09:53:30 2019 (r351023) +++ stable/12/sys/sys/imgact_elf.h Wed Aug 14 09:56:58 2019 (r351024) @@ -98,6 +98,7 @@ int __elfN(remove_brand_entry)(Elf_Brandinfo *entry); int __elfN(freebsd_fixup)(register_t **, struct image_params *); int __elfN(coredump)(struct thread *, struct vnode *, off_t, int); size_t __elfN(populate_note)(int, void *, void *, size_t, void **); +void __elfN(stackgap)(struct image_params *, u_long *); /* Machine specific function to dump per-thread information. */ void __elfN(dump_thread)(struct thread *, void *, size_t *); Modified: stable/12/sys/sys/sysent.h ============================================================================== --- stable/12/sys/sys/sysent.h Wed Aug 14 09:53:30 2019 (r351023) +++ stable/12/sys/sys/sysent.h Wed Aug 14 09:56:58 2019 (r351024) @@ -110,6 +110,7 @@ struct sysentvec { int (*sv_coredump)(struct thread *, struct vnode *, off_t, int); /* function to dump core, or NULL */ int (*sv_imgact_try)(struct image_params *); + void (*sv_stackgap)(struct image_params *, u_long *); int sv_minsigstksz; /* minimum signal stack size */ int sv_pagesize; /* spare / no longer used */ vm_offset_t sv_minuser; /* VM_MIN_ADDRESS */