From nobody Wed Feb 11 06:15:36 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 4f9p890Ng3z6S0vr for ; Wed, 11 Feb 2026 06:15:37 +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 "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4f9p885n6Sz3kMm for ; Wed, 11 Feb 2026 06:15:36 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770790536; 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: content-transfer-encoding:content-transfer-encoding; bh=NUcQXPbLYuJFcuXxXGiybz71yaT94JkWmBzhh6q56Ww=; b=IC4921Vnjc10HUKvPxeUTuH8lf2kAu/NvSlm3snYRD64Tk6mG4IRhRmEBpqdoxKbQcfK67 9LAKtmsZ6qGe+xXUqURCn3A9Fc01xOkKjaEdyyulG8GOBjki5u9amLIFKe/xiKCl7v9IQW jox9U71e1hvdmxHpjRYDtnPzExD0ZKLBAnD1f4cbL2gbYfbdWplimHAKJqwU0SnMFacj8/ CV5tYgJxNNO10YonQi5i1NGfDqaqmuyQXN/aC139MQtMgAVjGtFPY4gntkJnzfA99EsjDr WrXEd5h2r06h1uHHJJNzXvYeqrJSDiJvE0L+3XMOa9aWc+GLYF2xUgSNnwdCrA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1770790536; a=rsa-sha256; cv=none; b=QPTI1GeyCjrpxESxFMQSEdcuKVWaixb9TnFpMEIE6e45hxJCyFYXFsDXpRj7C/aVO9WDqK sQrf4FThGdkhBOakIx6NXRdLt6/s05N6/80/ymjIhNYpc3sQMiC5U0ujG7k9HmxN9iVhWJ 13lAda9OPLBr7Z2r9Pp/wdcRp7zmaEHkKcx82R4WIFM2ThR+hU7v8ihNPaABz8arBRcG/P RH2aGsGNHhdogXY0p3zUcM86G+mE+n2jLkQJs9i02uTvHojOg35RIV2YvB4hGwbYtiezU6 jhw5a5A2otwdHyq4S79vMWeMHuf1phoaPrfmg9jJfNRubSnQyixswtTitozT1Q== 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=1770790536; 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: content-transfer-encoding:content-transfer-encoding; bh=NUcQXPbLYuJFcuXxXGiybz71yaT94JkWmBzhh6q56Ww=; b=VvtkDDn1bKq5DUMgBY1xgE+0lxnUJem92NKXVK2wkh/lH2fU8l6lM7uTvt9DtFWln1NqRG 3+Plf7aaZy+helNqVM+EFb04uzkTD8c70kANMq14IdOB4ov6ccId7mdx+xua2aASSgL3gR uXP/eRXVivLQF9BUw/KpSTvZIw0NH4p1RkphZGb8G3a+kNJqdkBHVncKRSUfEs8VG6KUC0 MIzi6fz6pRXueb0w9aTE0Pg7NXfeGIUe0UsG1cNjDw9PVRbgS+8zgpE6/ZGt6M5pdFyo1p 87r7zg3flbnYTrxnmWTO/cPwPpcSanNaWMiq5gKJiFxNZxJP68WbDMeXnl6nyQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4f9p882G26zdRR for ; Wed, 11 Feb 2026 06:15:36 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 34a1d by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 11 Feb 2026 06:15:36 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Dag-Erling=?utf-8?Q? Sm=C3=B8rg?=rav From: Colin Percival Subject: git: 6761e555376e - releng/14.4 - diff: Fix pagination 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: cperciva X-Git-Repository: src X-Git-Refname: refs/heads/releng/14.4 X-Git-Reftype: branch X-Git-Commit: 6761e555376e375f89fe36c72f2813f5e64a7f63 Auto-Submitted: auto-generated Date: Wed, 11 Feb 2026 06:15:36 +0000 Message-Id: <698c1e88.34a1d.245c14d2@gitrepo.freebsd.org> The branch releng/14.4 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=6761e555376e375f89fe36c72f2813f5e64a7f63 commit 6761e555376e375f89fe36c72f2813f5e64a7f63 Author: Dag-Erling Smørgrav AuthorDate: 2026-02-05 14:39:53 +0000 Commit: Colin Percival CommitDate: 2026-02-11 06:14:26 +0000 diff: Fix pagination leak * Drop an unnecessary variable and rename pidfd to procd. * Rewinding stdout serves no purpose, so stop doing it. * Don't bother freeing memory or setting the global status right before erroring out. * Error out if dup(2) or dup2(2) fail. * In the unlikely case that our pipe is equal to stdout, we need to record that information so we don't close it when cleaning up. * Don't bother closing a descriptor before dup2(2)ing to it. * Don't forget to close the the process descriptor after reaping the child process. Approved by: re (cperciva) PR: 266592 MFC after: 1 week Sponsored by: Klara, Inc. Reviewed by: kevans, markj Differential Revision: https://reviews.freebsd.org/D55112 (cherry picked from commit c3904a7de78ca1ca15fcdf4c09f9d4be7f6fe6f5) (cherry picked from commit 144455c333dc0d3db369596038de2e3dd6113b46) --- usr.bin/diff/pr.c | 22 ++++++++++------------ usr.bin/diff/pr.h | 1 + usr.bin/diff/tests/diff_test.sh | 1 - 3 files changed, 11 insertions(+), 13 deletions(-) diff --git a/usr.bin/diff/pr.c b/usr.bin/diff/pr.c index 5dedf689351c..20869e494d4a 100644 --- a/usr.bin/diff/pr.c +++ b/usr.bin/diff/pr.c @@ -45,7 +45,6 @@ struct pr * start_pr(char *file1, char *file2) { int pfd[2]; - int pr_pd; pid_t pid; char *header; struct pr *pr; @@ -55,13 +54,10 @@ start_pr(char *file1, char *file2) xasprintf(&header, "%s %s %s", diffargs, file1, file2); signal(SIGPIPE, SIG_IGN); fflush(stdout); - rewind(stdout); if (pipe(pfd) == -1) err(2, "pipe"); - switch ((pid = pdfork(&pr_pd, PD_CLOEXEC))) { + switch ((pid = pdfork(&pr->procd, PD_CLOEXEC))) { case -1: - status |= 2; - free(header); err(2, "No more processes"); case 0: /* child */ @@ -73,21 +69,23 @@ start_pr(char *file1, char *file2) execl(_PATH_PR, _PATH_PR, "-h", header, (char *)0); _exit(127); default: - /* parent */ - if (pfd[1] != STDOUT_FILENO) { - pr->ostdout = dup(STDOUT_FILENO); - dup2(pfd[1], STDOUT_FILENO); + if (pfd[1] == STDOUT_FILENO) { + pr->ostdout = STDOUT_FILENO; + } else { + if ((pr->ostdout = dup(STDOUT_FILENO)) < 0 || + dup2(pfd[1], STDOUT_FILENO) < 0) { + err(2, "stdout"); + } close(pfd[1]); } close(pfd[0]); - rewind(stdout); free(header); pr->kq = kqueue(); if (pr->kq == -1) err(2, "kqueue"); pr->e = xmalloc(sizeof(struct kevent)); - EV_SET(pr->e, pr_pd, EVFILT_PROCDESC, EV_ADD, NOTE_EXIT, 0, + EV_SET(pr->e, pr->procd, EVFILT_PROCDESC, EV_ADD, NOTE_EXIT, 0, NULL); if (kevent(pr->kq, pr->e, 1, NULL, 0, NULL) == -1) err(2, "kevent"); @@ -106,7 +104,6 @@ stop_pr(struct pr *pr) fflush(stdout); if (pr->ostdout != STDOUT_FILENO) { - close(STDOUT_FILENO); dup2(pr->ostdout, STDOUT_FILENO); close(pr->ostdout); } @@ -114,6 +111,7 @@ stop_pr(struct pr *pr) err(2, "kevent"); wstatus = pr->e[0].data; close(pr->kq); + close(pr->procd); free(pr); if (WIFEXITED(wstatus) && WEXITSTATUS(wstatus) != 0) errx(2, "pr exited abnormally"); diff --git a/usr.bin/diff/pr.h b/usr.bin/diff/pr.h index 2ff5949f282f..0a1275cfeab5 100644 --- a/usr.bin/diff/pr.h +++ b/usr.bin/diff/pr.h @@ -28,6 +28,7 @@ struct pr { int ostdout; + int procd; int kq; struct kevent *e; }; diff --git a/usr.bin/diff/tests/diff_test.sh b/usr.bin/diff/tests/diff_test.sh index 2a07535d3d86..b499bb709cdd 100755 --- a/usr.bin/diff/tests/diff_test.sh +++ b/usr.bin/diff/tests/diff_test.sh @@ -421,7 +421,6 @@ prleak_body() ulimit -n 1000 ulimit -u 1000 atf_check diff -rul a b - atf_check diff -Astone -rul a b } atf_init_test_cases()