From nobody Thu Apr 2 11:20:51 2026 X-Original-To: dev-commits-src-branches@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 4fmfYJ1kdgz6YH6y for ; Thu, 02 Apr 2026 11:20:52 +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" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fmfYH5cGsz3JYG for ; Thu, 02 Apr 2026 11:20:51 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1775128851; 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=Ty1DXVyI5EFK0iju1/7robdK+1xmrh+CXlfxfuBVD7s=; b=d9un5qwlqLDn7R1VVxs1pj897XEKphSZYfcW+Qk7hmizSGPnL8DHBKBhbNWXXUJdGkqdCY QEVkYCW6Id3E74vw/b16ldhAmUXs1sM5G29V4+OLTwMtzImlpA0QPQ5gs48iN+FWEPiYBp sQ1aQo2qmc/LMmncUuLk5B6nJmrWVPztnDNFkfuzNxe8K93UgbCkrol8fj0S6uztD49Y2L UDayWiFJeWzFwHuVgb7o9aRGr/JLN7vaM9+E2IzxIVbRJxUAID0rMBPBnkfsapbItCJJZ6 kYaUqmJpjy8+poe0w/8XlWjfJAccm/9ssmpr6PItUz+rraHCwUcyPSz1cj5ygw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1775128851; a=rsa-sha256; cv=none; b=ilEKU5FiFzAISRKagMdMA5Wz/XcbTtbI9x619Y1gWowsVOOIkeQBkrCe36bdXN5P0FybrX xHuh/kpPdBKEZVdkfeaBZheLEENWvJO0W+0VItw9ooOiXxYMwWnwzOs4JVUBoyFw3yyYBN zwfxd4A2YAiI7WAp+ObTDtPozs9kh78iGdRflZPA2oqPr7pNmenL46OQmK2HFpo2zHm8FW S6jdwKpruf8L2ZlufsJCHqr+ukXQCuuFlPMADDIr/gfRGDu3GvvBQ4U1lYjfo1NiSqHdzj GAewVqvj7+w4YkZMN4rqNGRQj8YJxmRi7IBIL0uoKDe0V1sW5Ihe2G8+SsZRvA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1775128851; 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=Ty1DXVyI5EFK0iju1/7robdK+1xmrh+CXlfxfuBVD7s=; b=hiw+gUasnySo25qI8D2y/+/9OgTd0Vut3QWA1aXzjXkgOqv827V9VDNJgmn77+63JtWJ5e OY9E01xezsAXEE16wqiwXneRqlEvn4RLVQfDY9x2stSIgJb/u8w491objFZVQs8VxwGsCO eNjZTeYwJkLLx3EQg4PM+pZ01EdXl3a9VnN9lNCr311+uvdbgZmdNuC/GE79l6+6d6iKrw lxzjoREhiRs5oYCCtU0+/RQfEevHh9nckcts06wGCEtpFSaHbISCV/pvqNscY7OTKEocH3 QL/1ffdV2xT8T2Ynqlk5/9AgfL6BO90+UMyBwge0A5YpyKkNOxkKxxBxUW9kaA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fmfYH58m9z10KR for ; Thu, 02 Apr 2026 11:20:51 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1f0e6 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 02 Apr 2026 11:20:51 +0000 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=B8rg?=rav Subject: git: 58d09e173759 - stable/14 - tzcode: Test escape from TZDIR List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@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/14 X-Git-Reftype: branch X-Git-Commit: 58d09e1737595b28bb3634989c94406d1d793e13 Auto-Submitted: auto-generated Date: Thu, 02 Apr 2026 11:20:51 +0000 Message-Id: <69ce5113.1f0e6.6b377409@gitrepo.freebsd.org> The branch stable/14 has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=58d09e1737595b28bb3634989c94406d1d793e13 commit 58d09e1737595b28bb3634989c94406d1d793e13 Author: Dag-Erling Smørgrav AuthorDate: 2025-09-29 12:36:24 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2026-04-02 11:16:01 +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)