From nobody Sun Jan 23 10:25:43 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 E92B1197B0B3; Sun, 23 Jan 2022 10:25:45 +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 4JhTlr3hQ6z4YsW; Sun, 23 Jan 2022 10:25:44 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1642933545; 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=o4zJ8ziO+7LvJZjLRH9LCrSJqc1BIqLTHhs4H8S2+KM=; b=tj4h1QJON8WrE822QLSaC36m4mzEVLl7lKBQOa1eDsL5wVHCVMkubqtND5oITqzAV/ohzj u9++yxfyg7NLO1RzQkRoyov4Ho3oBNdGvhDwCOqKxxcEEOPKsJC4ukbGbgg/EpOow4IBAa FqtLbxElbhP8+Mp0JCjgw1uHnA4n55rY348Fx4MJtkRBmXFs3LBJ/pABjMag11t0zNpb/g I/BZ2xjOjysJWGeRbek+BmYroGIZCFBTVPHmeIR9nV6w5hmZKN5EZClyDTWf58VRRciuW8 mtnuBkyRyNSxVbG4QHwRE/f+a9Hw/bTmC/ffwifwAkTTzqy390t9rMJUSWql4w== 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 C6ACB20A5D; Sun, 23 Jan 2022 10:25:43 +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 20NAPhn5088383; Sun, 23 Jan 2022 10:25:43 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 20NAPhT3088382; Sun, 23 Jan 2022 10:25:43 GMT (envelope-from git) Date: Sun, 23 Jan 2022 10:25:43 GMT Message-Id: <202201231025.20NAPhT3088382@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Marcin Wojtas Subject: git: 408c698b133f - stable/13 - t_setrlimit: Adjust resource limit to 20M 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: mw X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 408c698b133f33e52ec2d067447dd32b425cfcc8 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1642933545; 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=o4zJ8ziO+7LvJZjLRH9LCrSJqc1BIqLTHhs4H8S2+KM=; b=cVhp5o1i97Bc3z4BEFohYpiho0ClJSAMwgti60qJRcIn/cffHnJM/WXXb57kpobN5spzXt hdCLV60KbCJql4W08gPVkcbpuppzdeH9KPDdZ5zo024bOfVw/5sqpan2t3ZZ/eCv21kjrr B3CD8+Wts5cu4wFzpWZrdaZRmtMp7aB6ov4bGMPpk2kMqCrrMh5WjQJzAk6ehrDY3pS57R R3TDnXiSxOB/4s8Nld8JFpKIxnR62CoXgeBXYQxffO0zr9YH6VQPhJlEyBz/uVH0TJptla L9SHYhKs8NUl1lFTGD6ehMLiMaSXMq+vKLh195o3Auzk22fCqhCWhRlCWQmZlA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1642933545; a=rsa-sha256; cv=none; b=mvPMKZrVda6TpK5xA4VbJpnNJ5/xY2XEic/057D8dcDzqlirLgK9fv0ViBCbZ2zKqcT82y 9qY3+S8B2fwmw4UJp5bKpZs6myqYlWjEUH5UbcrgUAA0dD8/NG+XSAw/UtllxYbLPraStG n4ODNzJh0A9lc834tt2JegTLL/pZKiaB+840ch1/nZyNZzM553JJrAbaMaDMfRepNfP3Xq ZP63Yklq9yMMl+ZB2aIR63DaUBIJhY/gNC7FdouNiMeMRVJiDPpG/s9BldN5T/V97tztpJ +yfK8rCcWcVsSQ4JBvuFznUYvrF2bu1Ue4O78OV6GKlmg+vFpFipPmxxHSbmOw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by mw: URL: https://cgit.FreeBSD.org/src/commit/?id=408c698b133f33e52ec2d067447dd32b425cfcc8 commit 408c698b133f33e52ec2d067447dd32b425cfcc8 Author: Dawid Gorecki AuthorDate: 2021-12-20 05:27:12 +0000 Commit: Marcin Wojtas CommitDate: 2022-01-23 10:09:53 +0000 t_setrlimit: Adjust resource limit to 20M With ASLR enabled by default, RLIMIT_STACK test fails due to the fact that default stack gap can be as big as 15M. Because of that the resource limit of 4M results in test program receiving SIGSEGV immediately after exiting the setrlimit syscall. Since the idea of this test is to check if rlim_cur does not extend past rlim_max, adjusting the resource limit to 20M should not invalidate the test results. Obtained from: Semihalf Sponsored by: Alstom Group Differential revision: https://reviews.freebsd.org/D33116 (cherry picked from commit 4f741801d86089a1c5d631ba1e0f1421cdcf7a7e) --- contrib/netbsd-tests/lib/libc/sys/t_setrlimit.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/contrib/netbsd-tests/lib/libc/sys/t_setrlimit.c b/contrib/netbsd-tests/lib/libc/sys/t_setrlimit.c index 6b90deab8f3f..15154cb8274f 100644 --- a/contrib/netbsd-tests/lib/libc/sys/t_setrlimit.c +++ b/contrib/netbsd-tests/lib/libc/sys/t_setrlimit.c @@ -551,7 +551,11 @@ ATF_TC_BODY(setrlimit_stack, tc) struct rlimit res; /* 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);