From nobody Sat Mar 28 08:56:35 2026 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 4fjWb74ycFz6W8yk for ; Sat, 28 Mar 2026 08:56:35 +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 4fjWb74H1fz4CtT for ; Sat, 28 Mar 2026 08:56:35 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1774688195; 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=meyvlTZNpAE0v9AkqfOm4a2x2bOEQGgNl1ooBuCH9vis6pL1XM70JDwcg3jPSz7o096oTB E5KrIblZ67rHaxK1xol2AMNM/9OxQ/fFHOX0MUqOjWYvtTX/gqpsNOi3i7xZ9HgTpQxS03 0RZGCW6PjdGXM3Xij/mTucYdaIh4XsnZoT9n1GQfy5GV4nRCZA3v9PC9DBAlx3Wjs+BKP2 AzSEmT9fAGvjjUdebTKUR/C92xG+nYXWe0EVHRc/0YY70KePaqM8DCXH07bQC7MMgr+esI kk0cOYwbu+Tfwcr5dsPlJZL20WBN2DHWCjPqagnY1QXwqSIFg71sFiLmxX3Vpg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1774688195; a=rsa-sha256; cv=none; b=q+0jA89AlA1csYRbY6JXxiBYvq5YBD2sHjIwLT1JX+5uWpyCvfkbX/6Z7I6UY2+QKQnwrH eDM07B5+W89JHEY2mvmMRSVyru+KoakVMorhdMT19U/xCfjwoW3ApbhY1Z8GeAiG4oUAET iEcSY+ZDeesILTNMNJzS3vqMmsx1RV7DT77qrk5LCC4+AenNPuq8GLVNPtG2iD5FM0VCF1 +XQvL6LcLCx9uuF4bC47lFuE/cIHsL4BIfUhe/0wrzZGFyl4+Pc+a5tz22l3vbdqhGAlRr 8euQE0x+CExN50G28ifDM+v2T8U6CXg/XxZ2EZO29eVb5ddX4HsnWFyHAv5Eow== 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=1774688195; 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=Cby4Zc2exnr2lGj9vMm652li1RkfU6WuUh+TTAUpdnnjCvscoi3cNvyirm4n9mKjw+DwW5 4tFU1ZauBYsqTkHlqPHgx09nQofzdQWL518yEDdd3dofKdJy24uhkaqsEyMX2FyuLUp4Km J3yY1fwUm/F5TeqLh4r+loWSvb/5UeVqel4Y4ReSuZ68GkkP5igpWrN+O9WcuArCzEW6s8 h37KXotKmY3DMbltbtEdx5tIfyjuG1oklZA+Hlzq9TsdUDCNegEcghpgG+N75L1hrYqHib 7UVcNsTHFoKGa4xQVSpcqVcRK94xvrq3L5qO4O2n23y1fvVfbf2HCy8iUOd4Xg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fjWb73prDz3gg for ; Sat, 28 Mar 2026 08:56:35 +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 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: 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;