From nobody Sat Mar 28 08:56:35 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 4fjWbF0MJYz6W92k for ; Sat, 28 Mar 2026 08:56: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 4fjWbD6Khlz4CWf for ; Sat, 28 Mar 2026 08:56:40 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1774688200; 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=1oydMq2MDoerE+K6tjnk5a3tagAo5Ido6qv7jMdE+xc=; b=Uy5SAGADD5qxJXSvU3CpMLyiBWCsDGn3Jped9lPVDTqdgpU1iBzApMgOb13wl0GHrcSwvl 5fWY/SLxIxgsp6VLgcaiBsfSd2Poa8pODDlX2J/hkKdhalUOLzpU9a1YWtIP4GKnHbIrec cBN6gnMIxAb8azw+NVPa/cH3j9tVO5benD3Y6D5tRI+fKJWbL5zTS84vrjM1ii1HIqbSro Pzx4+Ap6oaV2Si+XkO+gkRI6WZ4mGp/2tqWsjfO1vucqAOWj+o2GTTygNxYAqOSQXE6sE2 76MirNtDtecv2gAbMQPmuLoRbDYLFqsgl+omWi41LxGFyBvgVk+mThFutHzSKg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1774688200; a=rsa-sha256; cv=none; b=jwFJwsOuOVueaDnLOSCVwW7WwIgwhDCQ76cFiBGagJqcVkXI0TumvVFxyqBPPsxN+P1g1q qJufoaHxBHtH4WFx1h+4VLvtMksY3MJjEnYNajIWkpfE+ND3dx51W5gn2+TZUxe9iP0GRm 0ZQ0MJ1EDA5ygniDg8YownPtKoxWONbm4ifXxT942auwVoqAgn/BI8pF8EokUaHYTtBgQ5 qOEKhSXSlTkHMZuSaxVdnLPHkeuYsKlVdnxE2YG47wjy5OTHtnwN8pT8CmojTS1imdlVA/ VLuUNgZ7hZq9ZV5reSUkJghEqP6lWWlJ48NGjZcX6GxThkd9RnS3XTANu3awBA== 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=1774688200; 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=1oydMq2MDoerE+K6tjnk5a3tagAo5Ido6qv7jMdE+xc=; b=rO7ny3Amyk8aHIOkCWXN/jmLsJ2Iu4PyJikqlqErN3h67LfETQgruzZzCjvCBGLREAlt0m PBhqIEytjo85WVSUNFjnTWu/PUMigM4YqEpxMFoVh02ZyArE0pSckeqp4ooFJWUIfHN5m2 vkxdjJGjfxp7v/AdG7TkIiCB6K3MqqxPEPz11cXgtRbo4yAvc/Frvduvjd8a+ojv3H7b0E jLmgPxm7rnFBi5MAlj/xiFycNAH9dlzgiwNYJ/bQBFbh4w5aTTMJi8DFU4w3vgNv2s2CRf ofIOv5Q5nVg1wfudiQaJf8nMX+55SeUMRQU/4pDiIUSIvDriqcesgfznzXCdGQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fjWbD5qNHz3dT for ; Sat, 28 Mar 2026 08:56:40 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 228d1 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sat, 28 Mar 2026 08:56:35 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Baptiste Daroussin Subject: git: 945e60e018c2 - main - 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/main X-Git-Reftype: branch X-Git-Commit: 945e60e018c287f8097f3ee4a30ccf4921845aa1 Auto-Submitted: auto-generated Date: Sat, 28 Mar 2026 08:56:35 +0000 Message-Id: <69c797c3.228d1.4b34fa8c@gitrepo.freebsd.org> The branch main has been updated by bapt: URL: https://cgit.FreeBSD.org/src/commit/?id=945e60e018c287f8097f3ee4a30ccf4921845aa1 commit 945e60e018c287f8097f3ee4a30ccf4921845aa1 Author: Baptiste Daroussin AuthorDate: 2026-03-28 08:41:47 +0000 Commit: Baptiste Daroussin CommitDate: 2026-03-28 08:51:48 +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 --- 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;