From nobody Mon Dec 20 17:36:03 2021 X-Original-To: dev-commits-src-main@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 CA22118FBD59; Mon, 20 Dec 2021 17:36: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 4JHmw4008Mz4VKL; Mon, 20 Dec 2021 17:36:04 +0000 (UTC) (envelope-from git@FreeBSD.org) 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 8B95C1A4E1; Mon, 20 Dec 2021 17:36: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 1BKHa3GO024543; Mon, 20 Dec 2021 17:36:03 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1BKHa3HS024542; Mon, 20 Dec 2021 17:36:03 GMT (envelope-from git) Date: Mon, 20 Dec 2021 17:36:03 GMT Message-Id: <202112201736.1BKHa3HS024542@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Marcin Wojtas Subject: git: 4b97eef0bb3e - main - Revert "t_setrlimit: Adjust resource limit to 20M" List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mw X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 4b97eef0bb3e4403feda3f51aaaf7b75b953db76 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1640021764; 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=QSjVJllGuKJj2+6tRAcYTPnSjxqaBBScNUCBX69bpzs=; b=Nqf/7445dB4x7W9xI0FzUTqhMIqk9R8JzEu7ZyVibDLbZkjsBY6aeFkIvv3LrKm8QZnzr8 E+oj8r9CPKYeg9NNzv8weNziFTFFMOIlKpU85zS6T7D5iotazX4M7YGhm3Q5ZbCZJIdz5W 7z1NatIInKbaEaWBVtv2s8sc4R0rw7YzizAZ/ERHNly2w7FtuU6JCoEFFPeeA2dRz2pwB5 21hr8sSZWgRLWzHDWKu1UwmIinUyelBZ1o9rJdaspmF4Xeg9QnX/mBDPtlUuS9v5dUT9TO crc7LR6yo1v35GC0GQ5iXrLrgZ8fobF657T1d+OivL6wGSIi5nEiVO6nfuRnkw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1640021764; a=rsa-sha256; cv=none; b=W8i7dDrz5xClGPTlR73yRVzKLYz7g5UM9pS/Ws4Qz35AG4gFSH4hWb+0eZlEK/ULBylOXI LfCayVAYKPC2WemmfiGjuSiULy5LjidjcK6DgiytzefRo+0+hPi185xI40dn2xjLtQLwZg U2xFHmBGXpoV4ejYqpuZAbt3wEKOjD9a4OOJhs/Mw3tezm6ljbL0HJAwqq/rWf0hZsmzpK JjA50XFXURzI0v1XBT6EUHY8YAmXjouKpkqnPNctFgh+WDFfKtgWkrfdR1iJ3lb9m5OE3N Px2rwrGmjZggQsmO4TQZ2rVVVLLBPAGGIqTjMzliHx9SNIfddhQ+UScqCbCwaA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by mw: URL: https://cgit.FreeBSD.org/src/commit/?id=4b97eef0bb3e4403feda3f51aaaf7b75b953db76 commit 4b97eef0bb3e4403feda3f51aaaf7b75b953db76 Author: Marcin Wojtas AuthorDate: 2021-12-20 17:33:06 +0000 Commit: Marcin Wojtas CommitDate: 2021-12-20 17:33:06 +0000 Revert "t_setrlimit: Adjust resource limit to 20M" This reverts commit 4f741801d86089a1c5d631ba1e0f1421cdcf7a7e. As per discussion in PR: 260303 the reverted patch covered the real issue with a fixed address of the top of the stack. --- contrib/netbsd-tests/lib/libc/sys/t_setrlimit.c | 4 ---- 1 file changed, 4 deletions(-) diff --git a/contrib/netbsd-tests/lib/libc/sys/t_setrlimit.c b/contrib/netbsd-tests/lib/libc/sys/t_setrlimit.c index e7e294cb5df3..d5c50155e6dd 100644 --- a/contrib/netbsd-tests/lib/libc/sys/t_setrlimit.c +++ b/contrib/netbsd-tests/lib/libc/sys/t_setrlimit.c @@ -554,11 +554,7 @@ ATF_TC_BODY(setrlimit_stack, tc) atf_tc_skip("https://bugs.freebsd.org/259969"); /* Ensure soft limit is not bigger than hard limit */ -#ifdef __FreeBSD__ - res.rlim_cur = res.rlim_max = 20971520; -#else res.rlim_cur = res.rlim_max = 4192256; -#endif ATF_REQUIRE(setrlimit(RLIMIT_STACK, &res) == 0); ATF_REQUIRE(getrlimit(RLIMIT_STACK, &res) == 0); ATF_CHECK(res.rlim_cur <= res.rlim_max);