From nobody Mon Aug 25 15:22:49 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 4c9ZL22ZYXz65w1B; Mon, 25 Aug 2025 15:22:50 +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 4c9ZL20rvZz3XZn; Mon, 25 Aug 2025 15:22:50 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1756135370; 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=OkDHJzja20DB22lXXnJhCtsw511yQFe+qceDlU1oa5w=; b=vZgyK+cHb1GKgBbMhS3croRlWZrLZIRzS9ZGNWDUe6HOcVZycN9VK0USOVCJhh7gCzOEBN HcKnarUbxwDoPUv814iUjH7/8wPl27MpKU94fGypFLX6D0WPYPhszfNlQDHO69hSgfAtAJ 4eez7ygx4hn3DPqR9Sg9hPd80DEXcK2456PX/REjgL3PaadGh2krQbTPN/AF30I5ng8Ukv lrbzBwGdWG46UXTn+0Nv52j5i3dda0mxeCKW6zHQ/8/p4d7qCXE/K71a9LcbuSvHmR0U/x twrEIdbOzZF7rn9Jc7k5rrbV3oaj0IvNpt2IJzXwlfmGY/a9fZlIGzT1S/Ym1A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1756135370; 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=OkDHJzja20DB22lXXnJhCtsw511yQFe+qceDlU1oa5w=; b=jjpPelPi3n9OqDI1FaIGpDmH3VtFRatayQCIBivXBbVux3GuYmoBUVF+x4doASBgJs1Nol bppWd7pkUkC9El1U/VR93T0RyV3UVEfFP+1YOygUHw2e8pY5+kNUy4Tq6H2xhENZwjLX76 bi2X4JUtIBMKUTp6LYpEm5/cpt/4uqILRp26jxR5D5rExRwo4qXk/A+tN2Q5wvZrFuykYN k9JkO7Z74Valll6ySXK5zjSpvz/rMjBpvPdZYXBlwH1xRms5H/J0V1zXLh9jsv1IS8Yl7r 4G5Fw5lfVLdif+JRDFBKziM/ET24Nfas473JP+fG+T74cU+8PlXCh1BaA3Fr5w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1756135370; a=rsa-sha256; cv=none; b=vfg6tynjJ5hbp5P9vtGG3lieZ8XbsbmDa8ShmiKGoJlXrT1fv3fVrGHIHwggtZO3FRGYJ3 8imNG8WiH5Pf369/0rFIbzk+LpV8den7jfmvbEk2j/fCygANd1sHp/EdO4bCoEXEYaSEjb PzrnBevUsYVJVMKJ/d9TDgBSPddPek3+XwfPKVyoBD86Np17SL/JBUxCnMwgTGivdVh+ZB A5+qr6ASFSIsaRgBCz9D4VLRkMIbzv11+wVM1xzcB03qm3u4bh2aEb0NjIXepHFkI1JFtS eOb+ae1EhyqeOCRYA3wbM/eCruu/NcCdNFeyQj9nzwMlbkSWaakAxh9B+SXb9A== 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 4c9ZL20CdFzvx4; Mon, 25 Aug 2025 15:22:50 +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 57PFMnrX053889; Mon, 25 Aug 2025 15:22:49 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 57PFMn9x053886; Mon, 25 Aug 2025 15:22:49 GMT (envelope-from git) Date: Mon, 25 Aug 2025 15:22:49 GMT Message-Id: <202508251522.57PFMn9x053886@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: a58eb4d233bf - stable/14 - lib: Fix calls that naively set F_SETFD. 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: markj X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: a58eb4d233bfdddff243faec071f8dc18d3e5492 Auto-Submitted: auto-generated The branch stable/14 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=a58eb4d233bfdddff243faec071f8dc18d3e5492 commit a58eb4d233bfdddff243faec071f8dc18d3e5492 Author: Ricardo Branco AuthorDate: 2025-07-14 20:10:38 +0000 Commit: Mark Johnston CommitDate: 2025-08-25 13:57:56 +0000 lib: Fix calls that naively set F_SETFD. With the recent inclusion of the FD_CLOFORK and FD_RESOLVE_BENEATH flags, we must avoid clearing them when setting only FD_CLOEXEC. Signed-off-by: Ricardo Branco Reviewed by: kib, markj MFC after: 1 month Pull Request: https://github.com/freebsd/freebsd-src/pull/1766 (cherry picked from commit 8768b60de16a3d72a8783ec1241a711a782a36a9) --- lib/libc/gen/fdopendir.c | 10 +++++++++- lib/libc/stdio/fdopen.c | 18 ++++++++++++++---- lib/libc/stdio/freopen.c | 10 +++++++--- lib/libfetch/common.c | 7 +++++-- 4 files changed, 35 insertions(+), 10 deletions(-) diff --git a/lib/libc/gen/fdopendir.c b/lib/libc/gen/fdopendir.c index 67c0766b6d83..85c4451f9b48 100644 --- a/lib/libc/gen/fdopendir.c +++ b/lib/libc/gen/fdopendir.c @@ -49,8 +49,16 @@ DIR * fdopendir(int fd) { + int flags, rc; - if (_fcntl(fd, F_SETFD, FD_CLOEXEC) == -1) + flags = _fcntl(fd, F_GETFD, 0); + if (flags == -1) return (NULL); + + if ((flags & FD_CLOEXEC) == 0) { + rc = _fcntl(fd, F_SETFD, flags | FD_CLOEXEC); + if (rc == -1) + return (NULL); + } return (__opendir_common(fd, DTF_HIDEW | DTF_NODUP, true)); } diff --git a/lib/libc/stdio/fdopen.c b/lib/libc/stdio/fdopen.c index a4f2ac5b699b..59e16c74d51d 100644 --- a/lib/libc/stdio/fdopen.c +++ b/lib/libc/stdio/fdopen.c @@ -49,7 +49,7 @@ FILE * fdopen(int fd, const char *mode) { FILE *fp; - int flags, oflags, fdflags, tmp; + int flags, oflags, fdflags, rc, tmp; /* * File descriptors are a full int, but _file is only a short. @@ -79,9 +79,19 @@ fdopen(int fd, const char *mode) if ((fp = __sfp()) == NULL) return (NULL); - if ((oflags & O_CLOEXEC) && _fcntl(fd, F_SETFD, FD_CLOEXEC) == -1) { - fp->_flags = 0; - return (NULL); + if ((oflags & O_CLOEXEC) != 0) { + tmp = _fcntl(fd, F_GETFD, 0); + if (tmp == -1) { + fp->_flags = 0; + return (NULL); + } + if ((tmp & FD_CLOEXEC) == 0) { + rc = _fcntl(fd, F_SETFD, tmp | FD_CLOEXEC); + if (rc == -1) { + fp->_flags = 0; + return (NULL); + } + } } fp->_flags = flags; diff --git a/lib/libc/stdio/freopen.c b/lib/libc/stdio/freopen.c index f987d273d116..4d9bd3bd785d 100644 --- a/lib/libc/stdio/freopen.c +++ b/lib/libc/stdio/freopen.c @@ -58,7 +58,7 @@ freopen(const char * __restrict file, const char * __restrict mode, FILE * __restrict fp) { int f; - int dflags, flags, isopen, oflags, sverrno, wantfd; + int dflags, fdflags, flags, isopen, oflags, sverrno, wantfd; if ((flags = __sflags(mode, &oflags)) == 0) { sverrno = errno; @@ -116,8 +116,12 @@ freopen(const char * __restrict file, const char * __restrict mode, (void) ftruncate(fp->_file, (off_t)0); if (!(oflags & O_APPEND)) (void) _sseek(fp, (fpos_t)0, SEEK_SET); - if (oflags & O_CLOEXEC) - (void) _fcntl(fp->_file, F_SETFD, FD_CLOEXEC); + if ((oflags & O_CLOEXEC) != 0) { + fdflags = _fcntl(fp->_file, F_GETFD, 0); + if (fdflags != -1 && (fdflags & FD_CLOEXEC) == 0) + (void) _fcntl(fp->_file, F_SETFD, + fdflags | FD_CLOEXEC); + } f = fp->_file; isopen = 0; wantfd = -1; diff --git a/lib/libfetch/common.c b/lib/libfetch/common.c index dfa742577585..22779876ded4 100644 --- a/lib/libfetch/common.c +++ b/lib/libfetch/common.c @@ -278,13 +278,16 @@ conn_t * fetch_reopen(int sd) { conn_t *conn; + int flags; int opt = 1; /* allocate and fill connection structure */ if ((conn = calloc(1, sizeof(*conn))) == NULL) return (NULL); - fcntl(sd, F_SETFD, FD_CLOEXEC); - setsockopt(sd, SOL_SOCKET, SO_NOSIGPIPE, &opt, sizeof opt); + flags = fcntl(sd, F_GETFD); + if (flags != -1 && (flags & FD_CLOEXEC) == 0) + (void)fcntl(sd, F_SETFD, flags | FD_CLOEXEC); + (void)setsockopt(sd, SOL_SOCKET, SO_NOSIGPIPE, &opt, sizeof(opt)); conn->sd = sd; ++conn->ref; return (conn);