From nobody Mon Jan 24 14:21:03 2022 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 151DA196810E; Mon, 24 Jan 2022 14:21:04 +0000 (UTC) (envelope-from git@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) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4JjBwv5m8bz3GkD; Mon, 24 Jan 2022 14:21:03 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1643034064; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=EbzVNxeRH8HHB5K0H95exOKs5RwONhjXav4+4Qwgp3g=; b=r7CYT5tW6mcN9OY2+9VCJtI5LGmgOlVEQ/cjbRNfDcq9dhDXse2/XLorijNMCoKG9kOiDw MiI+t07HW8JUMEgh4or2Rp5MnhYNq48iQjGNalh9jZXCQ1oAOmnlpGXaIWCgJaif5nqvkK 08jfDvOSAlE3VxEu/Kkzb8EzWkpQ690usBKWCZmuFAgBhvAiSvwKLi6j52w1RWdhjDZCau fU6nfYZ/0KK8h257ofsr+++vAS3dqi/rIOhMSUgJAFp8xRPD/73OFVTj9luhQ/cFNyCpNX Ju0FONlxSduuligQG1Kz5BYlscdV8kwLtq6raSuc4wMyPtYNo0Mw4Xbqokzy0Q== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 83C8E17908; Mon, 24 Jan 2022 14:21:03 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 20OEL3BK042266; Mon, 24 Jan 2022 14:21:03 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 20OEL3JW042265; Mon, 24 Jan 2022 14:21:03 GMT (envelope-from git) Date: Mon, 24 Jan 2022 14:21:03 GMT Message-Id: <202201241421.20OEL3JW042265@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: 1a97674b4637 - stable/13 - setrlimit: Remove special handling for RLIMIT_STACK with a stack gap List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 1a97674b4637d07189fca0d4d8cea29bcf0d0efa Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1643034064; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=EbzVNxeRH8HHB5K0H95exOKs5RwONhjXav4+4Qwgp3g=; b=vKGjmwlOHopDDJ+3AeTZ9glusTPFzPXetr+0/zrlXzBok/1KHiMmFxq1Cw5pn2EdTHJiSz J4KYVVEI5mdqsGA50+6akE1AGwGm1VS5j9V5WuXL6/O3zQ1UvPCa9g945Cg6xGuJBcFZrd 3+LtYS53vthEvNcr1oy3lsYLjnDbDhgbOwDuFJ40+vwxLXCNijLSh9hRhJFE9hpCD/PpY/ nbHbeVQ9loqNz1BdWBpJ31alauqzCqYVIM4NoKjauiJLaLURFGiutr4cAoaoTmjvFfoUDI 7nibzrNmXGr7OkPARHeCvgy6Z4GscQcdVw5klazvuFrWVMFtZp/ZynOPa+8Qvw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1643034064; a=rsa-sha256; cv=none; b=lROBSbBFzkRPBw1rhDbA63pI/62ND36o9x74FYUwpBSDmdT+v4mE+aHudf2Fq30KRjOboQ S6d1ngJppaorbZza2d5+iDZJf7xv0AfNxsT9GMC/CLWtWBmCm4a9UN5350Rizbhf0U+0S1 qjPF4Mctc+LzKeOjJyKI99n/hpUAfOl++C2e5WUXYLPRgAy4yJEzW7CJWFWb/11zGdiCnr b6aG2s1J0muSZvsOLJfizQxrNBoJs20U6B5avGJi4tu0FPwuYfMV0J838bpWbBEkWRGCk6 K2enQXfD+usBXHwpgNriSKyL6HL+9lfSLOZQv+ef1xA5tKYY8eqBX0hx6pglyw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=1a97674b4637d07189fca0d4d8cea29bcf0d0efa commit 1a97674b4637d07189fca0d4d8cea29bcf0d0efa Author: Mark Johnston AuthorDate: 2022-01-17 16:42:13 +0000 Commit: Mark Johnston CommitDate: 2022-01-24 14:16:52 +0000 setrlimit: Remove special handling for RLIMIT_STACK with a stack gap This will not be required with a forthcoming reimplementation of ASLR stack randomization. Moreover, this change was not sufficient to enable the use of a stack size limit smaller than the stack gap itself. PR: 260303 Reviewed by: kib Sponsored by: The FreeBSD Foundation (cherry picked from commit 5a8413e779a2258b02f92bad69a03d283c4bf2a6) --- sys/kern/kern_resource.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/sys/kern/kern_resource.c b/sys/kern/kern_resource.c index ed15f02eedbc..0ea863917727 100644 --- a/sys/kern/kern_resource.c +++ b/sys/kern/kern_resource.c @@ -672,9 +672,6 @@ kern_proc_setrlimit(struct thread *td, struct proc *p, u_int which, if (limp->rlim_max < 0) limp->rlim_max = RLIM_INFINITY; - if (which == RLIMIT_STACK && limp->rlim_cur != RLIM_INFINITY) - limp->rlim_cur += p->p_vmspace->vm_stkgap; - oldssiz.rlim_cur = 0; newlim = lim_alloc(); PROC_LOCK(p);