From nobody Mon Apr 06 16:52:20 2026 X-Original-To: dev-commits-src-branches@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 4fqFjx1wftz6YLBr for ; Mon, 06 Apr 2026 16:52:21 +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 4fqFjw6QMJz44KP for ; Mon, 06 Apr 2026 16:52:20 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1775494340; 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=SfFPS1d3uq4bmQV8UhrbH8bS3ETYNRz+9O40Kxlt3so=; b=ZFjiZHfDB2kVFdqYkOpVP8O6Q7ASq2YU43XXdbMGUphKjS/WBOwbyFjFTGIh2jty7D2mSh /ioNv4R8pwmEG0HTK/OFa49YdqClXtMjDFO9+OY/drcTYnNNFbWEPCNXLq6def/0jSfeDE a7NWVjfUhsbOU1x0s4evC0XHI3AUjFX9RtlRjS4CLrkJhVxvc6Ett7vk+OunDfmowGSSIw Aw3eEwuz4+a63u5vFYIwD1eCjvf//J16SY4pp4MNJSgjZn/nW3xM+TznGY0QQuOW+jmb7H 7YKBHY5BHdmnrImRaQQm5pphbHE5DZC9FPaTMVyjYonIvnEghu7OtbVRCeqDyA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1775494340; a=rsa-sha256; cv=none; b=tV8K+tkNOA8Y+niaqw2BZQndtOibloU3fjinx1cRT31na+XZTm7i2ADeTVezE15K/h87K/ M5+w4atBC3KuF+lWc20hjW67zKSQAPHdYL4Esf7Y9ROJEQ7AD7QweCmwEUQYJGBypN5CLH AUA2Y7KXAy5pAILqylQ9twB40B5zsbPxqVnqQhqBacMbvOq6rVC3mxWXySXfIz8EFQe3+h 96o97IrYF4ViX/x+5SqYnTxUO1d5yjCOt8nZ0PSO51zcXCRw5wTEZq1ZdO7E3kxWMFWf0s AbllPrf96TPP0saGMRoTcnFjFZf9BMxDQ7MCl8MNd51SEeCtc5kAib3qThyDsw== 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=1775494340; 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=SfFPS1d3uq4bmQV8UhrbH8bS3ETYNRz+9O40Kxlt3so=; b=MpzBOqXsFD49bqOByr1Q32Piw3+oaGa9R3PU01KeC1VFBk6nzMD1uhQNsqXhRQo0fUKLIC CN0YYTSN1hG4xu8en5gs7Ek4Oc6uvWn2Ce1mXiFm8thG12FqZDS9RGewrjLq0+RxUMXUOc Jqhvl8xlAXIIb6hNXjj6vRYH7WynIQqNDoQVPGSZ038MNBJBmuKwurYFB/oMwDn9FxhNOx GSW9fx7P3ZuvHDsOwSxtCCm+gUdzVtxJHVgPXmeQaDgubuTrkvX6aS3MSQcLQhaY6h6+ni koXXbJra4NRzFCGFbqoCucnObFkuJOMUojihQxYvE9bym35RMGTCSLzAnDuQKw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fqFjw5qbjz11N9 for ; Mon, 06 Apr 2026 16:52:20 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1a13e by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 06 Apr 2026 16:52:20 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Baptiste Daroussin Subject: git: 2abaf8acd51c - stable/15 - diff3: plug fd leak List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@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: 2abaf8acd51cf12a8a2e68b28ec24b9d37cbceaa Auto-Submitted: auto-generated Date: Mon, 06 Apr 2026 16:52:20 +0000 Message-Id: <69d3e4c4.1a13e.46a747e3@gitrepo.freebsd.org> The branch stable/15 has been updated by bapt: URL: https://cgit.FreeBSD.org/src/commit/?id=2abaf8acd51cf12a8a2e68b28ec24b9d37cbceaa commit 2abaf8acd51cf12a8a2e68b28ec24b9d37cbceaa Author: Baptiste Daroussin AuthorDate: 2026-03-26 07:40:29 +0000 Commit: Baptiste Daroussin CommitDate: 2026-04-06 16:51:46 +0000 diff3: plug fd leak MFC After: 1 week Reported by: kib (cherry picked from commit 33424fd50ee0333bc6f70b5b14a270b85e5b5de1) --- usr.bin/diff3/diff3.c | 1 + 1 file changed, 1 insertion(+) diff --git a/usr.bin/diff3/diff3.c b/usr.bin/diff3/diff3.c index 75e8c6297855..8212b51e15a2 100644 --- a/usr.bin/diff3/diff3.c +++ b/usr.bin/diff3/diff3.c @@ -947,6 +947,7 @@ wait_and_check(int pd) if (errno != EINTR) err(2, "pdwait"); } + close(pd); if (WIFEXITED(status) && WEXITSTATUS(status) >= 2) errx(2, "diff exited abnormally");