From nobody Thu Oct 2 08:20:45 2025 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 4ccl9V2FJgz69KV4; Thu, 02 Oct 2025 08:20:46 +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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ccl9V0pyRz4MnW; Thu, 02 Oct 2025 08:20:46 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1759393246; 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=Lq6k5Dm7JqrV9liJHkuIh9snqPQs5m1iH3QeGmtPv5w=; b=YBwaCp5JhKMVhBo40WfwwXgjUToeOYGl0y8bu8XR7b6lNT2+HXgIGBYYTX71pvFlbIP20E +U5/K4EXASBTnzWQF6WvENbvqh8PICBn3zIKLHQmqKFg41IR2HPhC2jID8ySr43QR3MlkE 1sqadRtXvfDQU9ymyS6TtdA4JRyGq6SdiQ1lN2QAMo+dwUQLD6lriMbQEF8Ok/q22eH+b1 tPVFmK2EMY/pj1AiwFb8PwKxZXcr/UXma76XBYKyxg7woGNsM5RKbuYGBYU1oY4xDZciiA 7uv3cxsuWRaUd98hEpIqx1LZiiaLM3WHn9zTAFXXFmTAIbLosyQVXt19eDdHrQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1759393246; 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=Lq6k5Dm7JqrV9liJHkuIh9snqPQs5m1iH3QeGmtPv5w=; b=yii7ewkiIbo5BNwJ72Fu/LN7ZKLqSUmNocaGEboC10ZhBajh8WM3x24HRSUsDe06Cil2OR Atd2c4FvN+LOs0hxZ44ZGKFUa7kRm+S4WaLIaP583PsrCKM4ExLas/PZ5wC7neOTy5ML9f MJe8ur/g4DgNMSYmRPrMO4n+eD8qopIJzRbRE5SYJuJ+MrbnFygv3A8clmBtoBKF7JV+2r nL/pr3ys1ydRURofbi8hDB0odU5MyrPMkEXVvYwm58Q4++DlhxycTIXtaFaIyovpAJA31f 2UgqmWdH2DNLQ26DJzB3/HthHlOUHOVuvW9ab+VV09mHnS709+Ia/Xqy0Zno1g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1759393246; a=rsa-sha256; cv=none; b=iLeJBeH90f363VmHeQBXR/7yQftFdj+Hymtk3yLQFbb2KoB2GMLrNbsv57BvHV/FR+/gWg Y86q2ncozzybTroEThHvCUW2kRvHcqn7xnfJqxVV1tAVExbjt2bADkcPb+aBnVtkk+Fo/3 uQnvedg2OpjRxVT/mNEKjsA8msEIceNgrZ4UD8sGRloog1JRX7rHhGrZeJeRz9f4kM6vl3 Iz6JBvBEHcX2MzZrXm9n01aBUKJzEQfECZ+fGAzNWbj7dOOH6RIfZBsSxHiR0XU4zTDE/C umRdU/CXYi51hAhwIezilVeROddlnkmcvOo+C7MRJdB7ZS0mZGZLTbgLoodeKQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4ccl9V03FWz10ZL; Thu, 02 Oct 2025 08:20:46 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 5928KjAx023240; Thu, 2 Oct 2025 08:20:45 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5928KjCB023237; Thu, 2 Oct 2025 08:20:45 GMT (envelope-from git) Date: Thu, 2 Oct 2025 08:20:45 GMT Message-Id: <202510020820.5928KjCB023237@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dag-Erling =?utf-8?Q?Sm=C3=B8rgrav?= Subject: git: cbb155ce4e45 - stable/15 - tzcode: Test escape from TZDIR 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: des X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: cbb155ce4e45955bf7bbcda4f6f5c75e90054ff0 Auto-Submitted: auto-generated The branch stable/15 has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=cbb155ce4e45955bf7bbcda4f6f5c75e90054ff0 commit cbb155ce4e45955bf7bbcda4f6f5c75e90054ff0 Author: Dag-Erling Smørgrav AuthorDate: 2025-09-29 12:36:24 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2025-10-02 08:19:24 +0000 tzcode: Test escape from TZDIR Test a value of TZ that temporarily escapes from TZDIR (which is not permitted when setugid) then reenters it. MFC after: 3 days (cherry picked from commit cf76bfbb235116702ea1689bf984f200a72d2790) --- lib/libc/tests/stdtime/detect_tz_changes_test.c | 39 ++++++++++++++++--------- 1 file changed, 26 insertions(+), 13 deletions(-) diff --git a/lib/libc/tests/stdtime/detect_tz_changes_test.c b/lib/libc/tests/stdtime/detect_tz_changes_test.c index fe6b04357331..06c31c9fbc3d 100644 --- a/lib/libc/tests/stdtime/detect_tz_changes_test.c +++ b/lib/libc/tests/stdtime/detect_tz_changes_test.c @@ -24,10 +24,12 @@ #include -static const struct tzcase { +struct tzcase { const char *tzfn; const char *expect; -} tzcases[] = { +}; + +static const struct tzcase tzcases[] = { /* * A handful of time zones and the expected result of * strftime("%z (%Z)", tm) when that time zone is active @@ -43,7 +45,8 @@ static const struct tzcase { { "UTC", "+0000 (UTC)" }, { 0 }, }; - +static const struct tzcase utc = { "UTC", "+0000 (UTC)" }; +static const struct tzcase invalid = { "invalid", "+0000 (-00)" }; static const time_t then = 1751328000; /* 2025-07-01 00:00:00 UTC */ static bool debugging; @@ -139,7 +142,7 @@ ATF_TC_BODY(tz_invalid_file, tc) ATF_REQUIRE_EQ(0, chdir("/")); /* check timezone */ unsetenv("TZ"); - test_tz("+0000 (-00)"); + test_tz(invalid.expect); } ATF_TC(thin_jail); @@ -366,12 +369,8 @@ test_tz_env(const char *tzval, const char *expect) test_tz(expect); } -ATF_TC(tz_env); -ATF_TC_HEAD(tz_env, tc) -{ - atf_tc_set_md_var(tc, "descr", "Test TZ environment variable"); -} -ATF_TC_BODY(tz_env, tc) +static void +tz_env_common(void) { char path[MAXPATHLEN]; const struct tzcase *tzcase = tzcases; @@ -394,6 +393,18 @@ ATF_TC_BODY(tz_env, tc) } } +ATF_TC(tz_env); +ATF_TC_HEAD(tz_env, tc) +{ + atf_tc_set_md_var(tc, "descr", "Test TZ environment variable"); +} +ATF_TC_BODY(tz_env, tc) +{ + tz_env_common(); + /* escape from TZDIR is permitted when not setugid */ + test_tz_env("../zoneinfo/UTC", utc.expect); +} + ATF_TC(tz_invalid_env); ATF_TC_HEAD(tz_invalid_env, tc) @@ -403,8 +414,8 @@ ATF_TC_HEAD(tz_invalid_env, tc) } ATF_TC_BODY(tz_invalid_env, tc) { - test_tz_env("invalid", "+0000 (-00)"); - test_tz_env(":invalid", "+0000 (-00)"); + test_tz_env("invalid", invalid.expect); + test_tz_env(":invalid", invalid.expect); } ATF_TC(setugid); @@ -443,7 +454,9 @@ ATF_TC_BODY(tz_env_setugid, tc) { ATF_REQUIRE_EQ(0, seteuid(UID_NOBODY)); ATF_REQUIRE(issetugid()); - ATF_TC_BODY_NAME(tz_env)(tc); + tz_env_common(); + /* escape from TZDIR is not permitted when setugid */ + test_tz_env("../zoneinfo/UTC", invalid.expect); } ATF_TP_ADD_TCS(tp)