From nobody Mon Apr 6 16:52:23 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 4fqFk02l47z6YKy3 for ; Mon, 06 Apr 2026 16:52:24 +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 4fqFjz18rDz4472 for ; Mon, 06 Apr 2026 16:52:23 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1775494343; 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=nv2sGzvwdToEkbUva20WB7Dc/pe2CHRCR7EvUuFKtz8=; b=V4Btq3uBt5T2kMVMKDcVSTNjaycwarb6uzKkqtCYvqWc2hFjBhW1arnO6PQdKGLISAlHHy dcn6rPPoTT+zIoS+Fbv0wtAr9v96uzv9uDhrAFfeLkCDjQmJ8RivArARBDQ+3yY/Alfx8e bYiQVOmsIHdL0NbaP0wy0uSedynfux3DFDbJeJyNeLcpyzvBjaimq4C8g76DqcexqGHI4s LeSJK+k0BSUi7cpTNQU2zTioArMVdbhgkJ4sfEtfpPeQvtf7oETF7M3Y98oP7Jvd9/F3Mp LaQzuDcP0Jxdi4/iNcJkYrjQEu7vv37FaF8YkNkg2OGT/x6u7uaDFHVcApNv7g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1775494343; a=rsa-sha256; cv=none; b=uZeMeNGhJjqvKTZSMMr4Ab8j3AdfOVAgA0AHaYdK7SP9qUA8q0DSaSP0Q+bhaKIu4pBTIb Masnw2a/bi+Bo+Z8b2HfX16k7ZOChAp5v5HnALLRZ7w2H0ig8lJHW5F9iU5dVACPXl2m4D U33Ri3d9CY4niXWKtN8rMVSg3AvA+Lgd3sPaV2feY2gpj7oaq8czQnRdnrCkoceW9PMXrd iYrxnDrw2GfRYDnS6mgr/BydetrTAGvgndEeRwbMnz8rqmBsnPPK2c5wQU7gTIKpOb5kYn P4LglOpAyUymq6LalsUTVc2YLhITT+FV8EHfz184Ddu+a59bKBK0mJiHGYQvdA== 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=1775494343; 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=nv2sGzvwdToEkbUva20WB7Dc/pe2CHRCR7EvUuFKtz8=; b=yiUaH3W4QErkSbCPkn/81V1pnsjCroqZyGaoefktVLse7xtxcAM9i7ZmrloCihPLcwzPeM nUvp5Gavh1E//0mLTcGVkZn9+BTtzc+TPv84irEfcI6FaSfm/re4bqIrt7K/SDTZAF4036 V3xK8Kw5AjDmG9UCESx5ug1wai1EmwBLTPkrTYq6MzEu1fNNJWDpLmO9c8uVk5BtTxBJyr 1d76vnZlUzbqLmNi+WTaGd0OlPzdSGJhP7YP/dpzxJSXmiiVnyumvDGnnjc1CiQ9wNOgoK ySQySkbvcKwKbkOfQk+Agi/sRSe+2Nlkp3wHM3G4iwo4nnDHwO3GucGLjgAzaw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fqFjz0HGZz11ZT for ; Mon, 06 Apr 2026 16:52:23 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 19b49 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 06 Apr 2026 16:52:23 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Baptiste Daroussin Subject: git: 8fade076dd25 - stable/15 - diff3: set O_CLOEXEC on pipes 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: bapt X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 8fade076dd257b4aea6eb31c389450cccf6888bf Auto-Submitted: auto-generated Date: Mon, 06 Apr 2026 16:52:23 +0000 Message-Id: <69d3e4c7.19b49.72e4f942@gitrepo.freebsd.org> The branch stable/15 has been updated by bapt: URL: https://cgit.FreeBSD.org/src/commit/?id=8fade076dd257b4aea6eb31c389450cccf6888bf commit 8fade076dd257b4aea6eb31c389450cccf6888bf Author: Baptiste Daroussin AuthorDate: 2026-03-28 08:41:47 +0000 Commit: Baptiste Daroussin CommitDate: 2026-04-06 16:51:46 +0000 diff3: set O_CLOEXEC on pipes This avoid leaking pipe fd in children and simplifies the code MFC After: 1 week Reviewed by: kib Differential Revision: https://reviews.freebsd.org/D56120 (cherry picked from commit 945e60e018c287f8097f3ee4a30ccf4921845aa1) --- usr.bin/diff3/diff3.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/usr.bin/diff3/diff3.c b/usr.bin/diff3/diff3.c index 8212b51e15a2..bbef1f0d21a5 100644 --- a/usr.bin/diff3/diff3.c +++ b/usr.bin/diff3/diff3.c @@ -317,10 +317,7 @@ diffexec(char **diffargv, int fd[]) errc(2, error, "posix_spawn_file_actions_init"); posix_spawnattr_setprocdescp_np(&sa, &pd, 0); - - posix_spawn_file_actions_addclose(&fa, fd[0]); posix_spawn_file_actions_adddup2(&fa, fd[1], STDOUT_FILENO); - posix_spawn_file_actions_addclose(&fa, fd[1]); error = posix_spawn(&pid, diffargv[0], &fa, &sa, diffargv, environ); if (error != 0) @@ -1085,12 +1082,11 @@ main(int argc, char **argv) if (caph_rights_limit(fileno(fp[2]), &rights_ro) < 0) err(2, "unable to limit rights on: %s", file3); - if (pipe(fd13)) + if (pipe2(fd13, O_CLOEXEC)) err(2, "pipe"); - if (pipe(fd23)) + if (pipe2(fd23, O_CLOEXEC)) err(2, "pipe"); - diffargv[diffargc] = file1; diffargv[diffargc + 1] = file3; diffargv[diffargc + 2] = NULL;