From nobody Thu Apr 2 11:20:40 2026 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 4fmfY51XwKz6YH25 for ; Thu, 02 Apr 2026 11:20:41 +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 4fmfY45hG7z3Hyd for ; Thu, 02 Apr 2026 11:20:40 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1775128840; 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=ORof10g33IfYbnL++Kcz7d1qrd75CLI8fuiFwpMOgaI=; b=NRcQGPzqCogDeckLcyElFBDAv2kDc9JOaUZ4iT3D/nik3UKauXYFt3OTztHgBsrYyrmgXC NwyR8nr9pMZRC22HgVq1tEnZwfOtXhRgNgGNXMcifTp+XHjw8u7kXAFoW2ggNTFd3qgQsy SWTTguwu5D7Z9jwKKjBuDLd/yQGaDaGLPoUn7GXoo1kZiIjmn9mI7Nvw/uIiX2F06UdYuG sucTj74/dw50bmio2ycI62ShxDV9hPBOQCe8CMgCmxpujhKvbGGW8u7DQp/k8bv/YKNhMq /hs51Zondna3nBHhvjNniqfQQSZUm8SkEslDbtBypej/eiLRy13KQLDoucDtHw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1775128840; a=rsa-sha256; cv=none; b=kcxj1MlJyFgkNUTAV/cmBDsO4v9Zj+ZZYlxj6fhhu6r3ke38/Juf4oKhm1glsDja5IRMc5 AUooI45fTPdxnUik7zHqBqDId1GlJB1MiF/PJycUH2HClQqrzg3M+XsalAxVL7/XFcemlI +I2pVmZHFxdcpxgZylWJx6DeSgYBuW+Xm2s1UqSXMoCa9LFrxZVu06WP7SNnNg4I/+25Nn R3ke2NTJufiyY2xLaq755PXEaIS9a2aB06BkWFelQFeoFBXBuxKUZDnVBsnmu3DWYLOVW+ aZo3pmd6Kzo3gmU7DC6uG9s91z4izXiD903IirhGhAsHwKQulnHeeQkPB8pYvA== 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=1775128840; 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=ORof10g33IfYbnL++Kcz7d1qrd75CLI8fuiFwpMOgaI=; b=mW2xup5MmihEX4okF5e6pSB+65iWBTGzbagxSKatSpCr9EiK6TdnUnJ7r1er40PIQcH3CN PSqQUILIZZ01oGrowZaQ3NgqNuwV2F+/4c/2eScESZIBTJmBp0zvGO1MFQqS18/Th76qK0 ii2oO4KsRbpBGuMszIYTED24VXbxXGf+e3N2yanvZ0QtBQx0bwlpri4hPL53PHZ5AG+8R2 /GDaZ20v0Fbx0yTAA0InzvgcCMNArm1eZ67ni2EIUu6XseES6QLuTYvYw/FIA7UKPJRKwv 5JXDBMWQIn6UPxwcUJQTFyQsmJiMcbOxLIgEa8FiWGWAEyJTuT+8RMfMyP5wMA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fmfY44fG7z105X for ; Thu, 02 Apr 2026 11:20:40 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1e3fd by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 02 Apr 2026 11:20:40 +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: e58659a5b0d9 - stable/14 - tzcode: Fix TZ for non-setugid programs 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/14 X-Git-Reftype: branch X-Git-Commit: e58659a5b0d9c5bda3b352166b543fb25cd37c0a Auto-Submitted: auto-generated Date: Thu, 02 Apr 2026 11:20:40 +0000 Message-Id: <69ce5108.1e3fd.2ede3cc4@gitrepo.freebsd.org> The branch stable/14 has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=e58659a5b0d9c5bda3b352166b543fb25cd37c0a commit e58659a5b0d9c5bda3b352166b543fb25cd37c0a Author: Dag-Erling Smørgrav AuthorDate: 2025-08-22 07:22:17 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2026-04-02 11:16:00 +0000 tzcode: Fix TZ for non-setugid programs The previous commit had the desired effect for setugid programs, but broke TZ for everyone else. I didn't notice because my test cases swap out /etc/localtime instead of setting TZ, so add a test case that sets TZ. Fixes: b6ea2513f776 ("tzcode: Limit TZ for setugid programs") Reviewed by: cy Differential Revision: https://reviews.freebsd.org/D52108 (cherry picked from commit a6b19979bf13055da5f24d1f240f2acddb35eeac) --- contrib/tzcode/localtime.c | 11 +++-- lib/libc/tests/stdtime/detect_tz_changes_test.c | 61 +++++++++++++++++-------- 2 files changed, 48 insertions(+), 24 deletions(-) diff --git a/contrib/tzcode/localtime.c b/contrib/tzcode/localtime.c index 1a01db931cab..0fe7f1ed3f64 100644 --- a/contrib/tzcode/localtime.c +++ b/contrib/tzcode/localtime.c @@ -535,21 +535,22 @@ tzloadbody(char const *name, struct state *sp, bool doextend, } if (doaccess && access(name, R_OK) != 0) return errno; + fid = _open(name, O_RDONLY | O_BINARY); #else /* __FreeBSD__ */ - if (issetugid()) { + { const char *relname = name; if (strncmp(relname, TZDIR "/", strlen(TZDIR) + 1) == 0) relname += strlen(TZDIR) + 1; int dd = _open(TZDIR, O_DIRECTORY | O_RDONLY); if (dd < 0) return errno; - fid = _openat(dd, relname, O_RDONLY | O_BINARY, AT_RESOLVE_BENEATH); + fid = _openat(dd, relname, O_RDONLY | O_BINARY, + issetugid() ? AT_RESOLVE_BENEATH : 0); serrno = errno; _close(dd); errno = serrno; - } else -#endif - fid = _open(name, O_RDONLY | O_BINARY); + } +#endif /* __FreeBSD__ */ if (fid < 0) return errno; diff --git a/lib/libc/tests/stdtime/detect_tz_changes_test.c b/lib/libc/tests/stdtime/detect_tz_changes_test.c index 9722546747fd..75f55bdede04 100644 --- a/lib/libc/tests/stdtime/detect_tz_changes_test.c +++ b/lib/libc/tests/stdtime/detect_tz_changes_test.c @@ -20,6 +20,26 @@ #include +static const struct tzcase { + const char *tzfn; + const char *expect; +} tzcases[] = { + /* + * A handful of time zones and the expected result of + * strftime("%z (%Z)", tm) when that time zone is active + * and tm represents a date in the summer of 2025. + */ + { "America/Vancouver", "-0700 (PDT)" }, + { "America/New_York", "-0400 (EDT)" }, + { "Europe/London", "+0100 (BST)" }, + { "Europe/Paris", "+0200 (CEST)" }, + { "Asia/Kolkata", "+0530 (IST)" }, + { "Asia/Tokyo", "+0900 (JST)" }, + { "Australia/Canberra", "+1000 (AEST)" }, + { "UTC", "+0000 (UTC)" }, + { 0 }, +}; + static const time_t then = 1751328000; /* 2025-07-01 00:00:00 UTC */ static const char *tz_change_interval_sym = "__tz_change_interval"; static int *tz_change_interval_p; @@ -91,25 +111,6 @@ ATF_TC_HEAD(detect_tz_changes, tc) } ATF_TC_BODY(detect_tz_changes, tc) { - static const struct tzcase { - const char *tzfn; - const char *expect; - } tzcases[] = { - /* - * A handful of time zones and the expected result of - * strftime("%z (%Z)", tm) when that time zone is active - * and tm represents a date in the summer of 2025. - */ - { "America/Vancouver", "-0700 (PDT)" }, - { "America/New_York", "-0400 (EDT)" }, - { "Europe/London", "+0100 (BST)" }, - { "Europe/Paris", "+0200 (CEST)" }, - { "Asia/Kolkata", "+0530 (IST)" }, - { "Asia/Tokyo", "+0900 (JST)" }, - { "Australia/Canberra", "+1000 (AEST)" }, - { "UTC", "+0000 (UTC)" }, - { 0 }, - }; char obuf[1024] = ""; char ebuf[1024] = ""; struct pollfd fds[3]; @@ -272,10 +273,32 @@ ATF_TC_BODY(detect_tz_changes, tc) ATF_REQUIRE_EQ(0, WEXITSTATUS(status)); } +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) +{ + char buf[128]; + const struct tzcase *tzcase = NULL; + struct tm *tm; + size_t len; + + for (tzcase = tzcases; tzcase->tzfn != NULL; tzcase++) { + setenv("TZ", tzcase->tzfn, 1); + ATF_REQUIRE((tm = localtime(&then)) != NULL); + len = strftime(buf, sizeof(buf), "%z (%Z)", tm); + ATF_REQUIRE(len > 0); + ATF_REQUIRE_STREQ(tzcase->expect, buf); + } +} + ATF_TP_ADD_TCS(tp) { debugging = !getenv("__RUNNING_INSIDE_ATF_RUN") && isatty(STDERR_FILENO); ATF_TP_ADD_TC(tp, detect_tz_changes); + ATF_TP_ADD_TC(tp, tz_env); return (atf_no_error()); }