From nobody Mon Sep 29 11:57:58 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 4cb07V6hHPz69MLR; Mon, 29 Sep 2025 11:57:58 +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 4cb07V5rZLz3bd5; Mon, 29 Sep 2025 11:57:58 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1759147078; 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=3MtQAyt97Zh+PY0f2lbAaf5C1qKwx/28Mkyhz90s3W8=; b=vniv6pV/UidNM6k/xJaAvZIpw5mA4bn9+tEPEmp7oeyjsikrSEB4qOAnOD5PROxG9rioyX 6LUbMv4slzuQAJUjOwJzglg2Bg/K0SVeEo1Xvj83s19ikORQHrFzWguKeiK/if1WRXrZo3 mneoptTxRr2aYXR8E91mgbONUrU77OuyDLyxzhK/CoVWkt7zVP0DtFDSEDge72PZZ8Bt+3 EJ+5A8AJ/NYmB4Bo71cq76AcfalbLDboIauvzr7i1J8n1+q4bc2Fw99eOFbAyJ31Dxp1l4 xuq4dN2iLKtqbyCUBHe3/vXHN8HyMoDAuoNKRzdgrdUUkuSNTeWpNI/ZfJlGnA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1759147078; 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=3MtQAyt97Zh+PY0f2lbAaf5C1qKwx/28Mkyhz90s3W8=; b=TLI3lzkntftlyMXMdHNHCWZE19P6n7GB1SGH4lHsxEZjtxaOw4qDHdlG5L1e2IRYdvW10W PZeiuYuBeWG2G70ViErjLb4/o4tVHBxWIpfhPNI9IwF/P7P5FjEyt2MLMy1T1TMsGBPFAu 6EKVSmC8Xm5h8b3Jsj3RKUVgWiT1H/cxUNiwv/QTC05BZa9+Uv0dDHk3C97aHTDR74nmZF dTdFh5pq7q43ng/TuQbdMwfv339INSIuLoZzJ4yBRHobajSsKoDfq/nscJ3LZvcsZHd6nu v9Xt0Ohia2NeLKnyKDhc+aCBC4+UhA1+tx58wl0RyPVzVNzEvCyD0tKENm3cGQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1759147078; a=rsa-sha256; cv=none; b=j5/3szExBkSpwAycvTlNmRSlRuNJVOwkXw76+XZZHadYiiaKBX10qViIKNXQrTJdFqDvP2 SW4h/IyypJD/JE+UYMKk7YhSLcRfVE48sNAvZyW83xpLbPqjwm+vEWLpZ7Yt1wqWO5pBh7 Ni1wQCsvHz71UlkFMEUBfdATxDufsYv8S3wIra7mChpTdXU6px1H0AdFth6Prx7G+C+Gw4 rYIWqi5hq7OFqmOIqWTNkRVDxRcmHuWcbnD2ondJ2YzKmOL4jY9hjcItIS1WG8/xI2luV2 zbYOPgzS8YTM21Lcvmgu1kicW5SP257PfS1xiry6lDMfcamq4WrJYUHZfh2ULA== 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 4cb07V5RJfz13qt; Mon, 29 Sep 2025 11:57:58 +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 58TBvww6014868; Mon, 29 Sep 2025 11:57:58 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 58TBvwmE014865; Mon, 29 Sep 2025 11:57:58 GMT (envelope-from git) Date: Mon, 29 Sep 2025 11:57:58 GMT Message-Id: <202509291157.58TBvwmE014865@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: d28e4ce6cb61 - main - tzcode: Tweak open flags. 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: d28e4ce6cb61916b4f6bedcf4205a4da1ae121e1 Auto-Submitted: auto-generated The branch main has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=d28e4ce6cb61916b4f6bedcf4205a4da1ae121e1 commit d28e4ce6cb61916b4f6bedcf4205a4da1ae121e1 Author: Dag-Erling Smørgrav AuthorDate: 2025-09-29 11:48:02 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2025-09-29 11:57:32 +0000 tzcode: Tweak open flags. Upstream uses a set of flags that reduces to O_RDONLY | O_CLOEXEC when you ignore flags that either don't exist in FreeBSD or have no effect. We were using O_RDONLY | O_BINARY, which reduces to O_RDONLY. Add O_CLOEXEC. Also replace O_RDONLY with the more accurate O_SEARCH when opening TZDIR. MFC after: 3 days Fixes: 967a49a21a27 ("Update tzcode to 2025b") --- contrib/tzcode/localtime.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/contrib/tzcode/localtime.c b/contrib/tzcode/localtime.c index 8638ac9ba2cd..1668475ea646 100644 --- a/contrib/tzcode/localtime.c +++ b/contrib/tzcode/localtime.c @@ -677,7 +677,7 @@ tzloadbody(char const *name, struct state *sp, char tzloadflags, while (*relname == '/') relname++; } - dd = open(TZDIR, O_DIRECTORY | O_RDONLY); + dd = open(TZDIR, O_DIRECTORY | O_SEARCH | O_CLOEXEC); if ((tzloadflags & TZLOAD_FROMENV) && issetugid()) { if (dd < 0) return errno; @@ -687,14 +687,14 @@ tzloadbody(char const *name, struct state *sp, char tzloadflags, fid = -1; errno = EINVAL; } else { - fid = openat(dd, relname, O_RDONLY | O_BINARY, AT_RESOLVE_BENEATH); + fid = openat(dd, relname, O_RDONLY | O_CLOEXEC | O_RESOLVE_BENEATH); } } else { if (dd < 0) { relname = name; dd = AT_FDCWD; } - fid = openat(dd, relname, O_RDONLY | O_BINARY, 0); + fid = openat(dd, relname, O_RDONLY | O_CLOEXEC); } if (dd != AT_FDCWD && dd >= 0) { serrno = errno;