From nobody Fri Aug 22 07:23:12 2025 X-Original-To: dev-commits-src-main@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 4c7Wr11mLGz65QcX; Fri, 22 Aug 2025 07:23:13 +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 4c7Wr10DTmz42JZ; Fri, 22 Aug 2025 07:23:13 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1755847393; 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=J2LSm3gyqfghvd78wDzH6zmvIlXXwsRHCKkL9GEaozU=; b=gwWOuE1qIphSi/Uo1jF1W+YgUDnZxDPD7PrGkl+E6qFq88s6n4DlQUiefdZj7yOsDx+7QJ YB8wwRBm63KSgyY2Ah4p/S89cipHA3+N05IJloDubR+WefgskvIcPyRt/swLeVWSURDPj5 Y5br7efzbeNqI6tgKQtLIToIdMiLyfUVe4qeKefOpVA/2av5W4s54LRN2HDpfnNKg7co6V g7YEQX4FhAAxnZAJuOzSxLuLlptST5fNc6QAfErPtEhvwtOfvB3UlYRUY2mPF8h5HWu9xm /OhPz9dyw9HD9SI6Stz4pcFo2VEFzIVABjNc7kNWIqPgFpMWge1b8TbiEwXPzw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1755847393; 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=J2LSm3gyqfghvd78wDzH6zmvIlXXwsRHCKkL9GEaozU=; b=GmQo+qWWR9rJCakLM34433RXQcpZomGRfWmltuFnaOcTcqs0uKRVd4dRfheSBgveHDqejY grA52liKzxEDZFewyeOpn1o71MyeeaP6z7l+CbAArXOCqTsf/TqrMFMHsChZm/pntsrHjT 76MYgRfTq2UqbDlPS7hz4qAoJQ4tdLPUDPSNUNNQDRm/lmHI50hvRJOFONCDMaoYHrOoFN uoZeM6YHmAzu+RIlwWStFengBKWVNT+cbRQklyiENNQM9Hr382e+e98zBiVaw419u2DY9h k0NyTptT96qHfXx0no0A7qoJ7u7YDtvgBa2my0BTvRzs/bfMAQfGEx9d/J2YUg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1755847393; a=rsa-sha256; cv=none; b=EfHGcahkbzGCnLdXmsr+CX1WH9mk+quLUEWzoWqB16IzHCKzJ0xAgTKeLVHfOLSrBvBKJw Kw/baD/xb1vByaSYesHpi4PEo3YCqIh9IoUfTVC3a5wKqPEccDk9AE3FyUEQ+q4eeiulKa azoaIe2ajZJi22Wrq6wUTA5QCwvQtVkteF1bRUiXMBeB+lXE2KT/pjz3nQni/lyPYYkzWK ptW5RIukXh7cH+n6TVAG2JdW+tvRdETA54wIPdeXeG0WoasXuf9ogOApXwd8SgHMG1RyQp 6p2nukI8gzJcQs7NMSqXwr1vThCzUcU5+IlpImJOrqABZbGGdK+XKSJ/2xB/9Q== 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 4c7Wr06ppGzcWV; Fri, 22 Aug 2025 07:23:12 +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 57M7NCHF012044; Fri, 22 Aug 2025 07:23:12 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 57M7NCS0012041; Fri, 22 Aug 2025 07:23:12 GMT (envelope-from git) Date: Fri, 22 Aug 2025 07:23:12 GMT Message-Id: <202508220723.57M7NCS0012041@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: a6b19979bf13 - main - tzcode: Fix TZ for non-setugid programs List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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: a6b19979bf13055da5f24d1f240f2acddb35eeac Auto-Submitted: auto-generated The branch main has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=a6b19979bf13055da5f24d1f240f2acddb35eeac commit a6b19979bf13055da5f24d1f240f2acddb35eeac Author: Dag-Erling Smørgrav AuthorDate: 2025-08-22 07:22:17 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2025-08-22 07:22:17 +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 --- 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()); }