From nobody Sat Mar 28 08:44:22 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 4fjWK556jsz6W8FT; Sat, 28 Mar 2026 08:44:25 +0000 (UTC) (envelope-from bapt@freebsd.org) Received: from smtp.freebsd.org (smtp.freebsd.org [IPv6:2610:1c1:1:606c::24b:4]) (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 "smtp.freebsd.org", Issuer "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fjWK54Y0Rz4B44; Sat, 28 Mar 2026 08:44:25 +0000 (UTC) (envelope-from bapt@freebsd.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1774687465; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=SkBvk7JWcDZIkyx8ZwN15sm2mKdLf04bTW4aaq1gtIg=; b=SW1ZMIobY+ZVuXzJzbaoYEniwDgVXYR0QkBp6Mut/FUeysR0riUFMj6xdOY9gpRbEYDkje 9wTRVibiDw4R9x/iiVWuHjsHnh3mwIDer5mMTVSIH43B2oZaK7RJMoYI48CixZ/NLETp/P kzXcpJlk1FKLjiiLqQ7D7g/GNpiyi3Fdo5Pg1sXdIS6IXObKdGDA32aNPs6PQcYTWILfsN zMaNHSebqS3IoN4607/kXvYpnjCk2sMKLbtfgnqjlFIM95OfS398xiAh4LybKvSuAYq8nT F+hTsjHqSujaPPgysGk01vKcleI/vRfYpVy1xjG9+MpPTxhvg/jNRkdJPj9N+A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1774687465; a=rsa-sha256; cv=none; b=FsEpcXHfrIFHaCoA9IR1zdOf/z2A2VIyR96I2rgRUstXHeO5rWC5cVWfR5v6TZBLcZ5Vjg astMW36VjRYd8al0k5nYe4cQiS3IBmjFk/Q2tJJkFZdruQzkIx/c5o439tHv6WIl4C4Dc6 IIX1IRxM1CmOuOP/i8FNe5zyjughSpU56E5jtKBnFp6FxyHFDcBLipYE4Rm+0Zg6WNLlGN VSIhcu5hrIt9PaYl80gujQh3JWxc1t3M8vArMXdUi47tXHbGDTqJ/0+AQJpWOeIkIc434G Q74jZOFTgI4adnMsiLiVFsrPGKLofNGR3pcrz5DoO8e48ChAZNStHqZewkvWDg== 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=1774687465; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=SkBvk7JWcDZIkyx8ZwN15sm2mKdLf04bTW4aaq1gtIg=; b=JpHl635qq6P1GUSrvMT+CrOmYhVmaMYYQDZ4e3cEO7psIHq1BGtpRKvvHAIZ1kLyooUnG+ dnKYOmHy/p/PEfP2fmqNtc2SxKRlSgWs5bXx31tFAcB2Obz7NQiIM3NolDum9Soxx4beUq VpQAJqhn/XEn+TuqqhcdUsXy9q5c7t+QQkny0ncNfs/LIQ6NBo29qIBFFb5bOca8LU/nek uHsJP5tmtMLtlugayIYschY6hwouVimv4KBOD/cjnsaJxt+ezPN0Y5hYzRM6KA2NPvwWtH cEHh4c+gR0WbxjlyA/1uJ2sc9/hG5iAKFJbaS4V9viGOnlzafJhTZ6Zo8jqOgw== Received: from b.nours.eu (b.nours.eu [IPv6:2001:41d0:303:5e39::1]) (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) (Authenticated sender: bapt) by smtp.freebsd.org (Postfix) with ESMTPSA id 4fjWK53CvRz8D0; Sat, 28 Mar 2026 08:44:25 +0000 (UTC) (envelope-from bapt@freebsd.org) Received: by b.nours.eu (Postfix, from userid 1001) id 12774ED4EA; Sat, 28 Mar 2026 09:44:22 +0100 (CET) Date: Sat, 28 Mar 2026 09:44:22 +0100 From: Baptiste Daroussin To: Konstantin Belousov Cc: src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org Subject: Re: git: 33424fd50ee0 - main - diff3: plug fd leak Message-ID: References: <69c4e316.1c06a.68bddc8@gitrepo.freebsd.org> 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=us-ascii Content-Disposition: inline In-Reply-To: On Sat 28 Mar 02:40, Konstantin Belousov wrote: > On Thu, Mar 26, 2026 at 07:41:10AM +0000, Baptiste Daroussin wrote: > > The branch main has been updated by bapt: > > > > URL: https://cgit.FreeBSD.org/src/commit/?id=33424fd50ee0333bc6f70b5b14a270b85e5b5de1 > > > > commit 33424fd50ee0333bc6f70b5b14a270b85e5b5de1 > > Author: Baptiste Daroussin > > AuthorDate: 2026-03-26 07:40:29 +0000 > > Commit: Baptiste Daroussin > > CommitDate: 2026-03-26 07:40:29 +0000 > > > > diff3: plug fd leak > > > > MFC After: 1 week > > Reported by: kib > > --- > > 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"); > > Well, I pointed out something different. I think that pipes filedescriptors > leak to children. Oh I see you, then I guess this should cover it: https://reviews.freebsd.org/D56120 Best regards, Bapt