From nobody Mon Sep 29 12:40:08 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 4cb14860jFz69PFC; Mon, 29 Sep 2025 12:40:08 +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 4cb14851HJz3fHl; Mon, 29 Sep 2025 12:40:08 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1759149608; 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=0O6chSwbdF10T2W6+X2xkaC20akwGe5W66aROX8Cr78=; b=xu+TVBAY7ZMHB72Oj++3v0fucyywmYz+Fn65iVnRdZk1Lbla0DZ3XeXaUfu2y2M38XMSyD OIyrlodVvbFnsPJaUEKOf1ojVyT7CFSyiu5YKqui6UjvT7TvCELgt5xeqQrQgT48UZNCJM Eyw2QxsPeyS0XokvEHZcJL0fuo4hK9QGuMhqt0lBvkqhJOPiNK9giyP75M2FSisFwsuCwA utmdi/we95dMqzsb/UZth1sRICtX63Vzt3XsghldKnjTPxOBRTOHfmUM+SNyzfOuTUE+Qz VLbMujYDZwmiIO+hvYjkxHMiodzEhcOtsGfvVNQ8stgXWbVAnGMwD7UWueSTvQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1759149608; 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=0O6chSwbdF10T2W6+X2xkaC20akwGe5W66aROX8Cr78=; b=XDSzAkoCaWfGfiFobnYv91V/ULErZKlEvtHl/0EgvP7p5oK3UUJA1xNFPTFOZi6/7ITiLI W3n9Ak8JMfgC95FMB/UnSdjRhRj6PthaxGGghVg0oaBn2wwcHNi8q/2NnO/U4Q3Flr4j5G 5xyEWhRfADQTa+v7SOzwoSJpofGWo5wIUswHrqEfk6WAmdfSCOJiCBntR1/+sCdnZBfkCT 20CxyaSGMz3U0QNtdMt8ZjzdfyF5yUbf3QNWSlxTEZLxTU0KS9VWKCaL7mA6lgsrhRJOys uJ7hNW9BNkXTFg93Cv3I04KU+bJiBKrvf0Bslm/NmorZzORkf+J5QmrSm/Tyiw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1759149608; a=rsa-sha256; cv=none; b=TuYivagpgPYn+ht39lwp8NtPd0SXRvuTdQeTzNuaEfvHInW0foH8atOwiGoMdO/o/bHI7X midygpCgcGBmEPvtvNbJs5gUZP+/m5XDrDDiHbLbBfKpSTEm/qWrDbSVISOeshyRxXP2u9 7W8Cbfl5KxtNEmJWlp5qDLhUzdM+GMT07pk2v+wIrtPCp/v8i2u3iFckkuKcW+bQ3881XV Ld7Cl1c9fV7yusfQ186NnWKXOyMl6Ikk1RqTm0/ZvabVVc6CWc/i+aSCbphpA3Nvw/ah9S rvtZ2TZaOTuM/hNzB8mxtTHA6mmYehR1mFa7HpGoxX5az8qk29VOAWrcXDRB0g== 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 4cb1484WPgz15YT; Mon, 29 Sep 2025 12:40:08 +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 58TCe8SE094918; Mon, 29 Sep 2025 12:40:08 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 58TCe8gw094913; Mon, 29 Sep 2025 12:40:08 GMT (envelope-from git) Date: Mon, 29 Sep 2025 12:40:08 GMT Message-Id: <202509291240.58TCe8gw094913@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Dag-Erling =?utf-8?Q?Sm=C3=B8rgrav?= Subject: git: cf76bfbb2351 - main - 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/main X-Git-Reftype: branch X-Git-Commit: cf76bfbb235116702ea1689bf984f200a72d2790 Auto-Submitted: auto-generated The branch main has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=cf76bfbb235116702ea1689bf984f200a72d2790 commit cf76bfbb235116702ea1689bf984f200a72d2790 Author: Dag-Erling Smørgrav AuthorDate: 2025-09-29 12:36:24 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2025-09-29 12:39:49 +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 --- 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)