From nobody Thu Feb 5 14:45:48 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 4f6Klc5hXHz6QdwQ for ; Thu, 05 Feb 2026 14:45:48 +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 4f6Klc2l1Dz3KHx for ; Thu, 05 Feb 2026 14:45:48 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770302748; 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=S2346XhRKLYwBfZ5h2mY3vcRy4SuUXg2pT56bcuuz30=; b=aAgOaK92TdvgeCnGEnqt6z3dLfboKz2LNRXbhO0lm6XA7aCLq5K5ppYrmUcqYFU5AuPoxe 75Ca5x4iSi9YNxb33todnYToFNorMdKRbUdKvrNp5+o0zuHbR36XEAB7AUEOjgID2EdHhN cccuqXrvDL2W3+J0aPOulzKTbqIu2OW257QU6ZAONJ0/u+kuts0fWX/y33IrL5moGmYnLC yIy3HYNRrWV1zYhFstVNxd1ceCfDowbgLrNJOYhdveXuQ57YeBiwqQAjqDz4LOqkUZ3+RS 7YCbbTLDGRbOSC6iV56YP1i+90ryvgzdquUtL6iG0xT+x30eCaiIrnwM3uIi9A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1770302748; a=rsa-sha256; cv=none; b=F+yMqdvtqhdV5hVNJTK7P7ovn8SIuHOlnijM2D3mpAkrHP06NkqIOXA5qKEqoJhVi8pf1k eYH371vBdKwSHNgugz9ennba+3nkMnkT8E0zhYNmpbcQ2tQA5OPxH+Ww2X8icPJxsheqU+ 1S/j3UWY0xow13Bxm3YGcNDpquahrpz8QHr4hL4qX62LmMNS8z9giPGNND87NTcPMOl5gJ 8MHhEynOJgxApNS8/TLR9i23a/594gHckNeZifG4mAZ/bWV+aUUxmA/kGHPKFp0NUG0hZq mCcdWT7m6mB8QYKx+F/7PtT8dD19GALzqzSdxEDKn4TChF6cGrL+DlOKlqy4BQ== 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=1770302748; 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=S2346XhRKLYwBfZ5h2mY3vcRy4SuUXg2pT56bcuuz30=; b=RnyEXSg0LHEu8i+OtNdKN90xaQGGxDa7gT+QxFUoPka7zg7Dqc/zj4UOdmjyOBjUG2ylbj QMddW/rRfg93WhvYi0L7tH0ifNQW4uVeZqkW5v56LLq9uC/j4n93rgpOnAQWkKZ7LPhz/m jcI3WPm/XQfxcNHB6fEqzViDKGpg+o8v/hUEJd6s27eJdFs+9Yh2DuXt9l8HnuZipHKKho HaizbnI5X/I5uYGZfAuiM5Tda0M1jyRAC85ooU175dnYwS4+l6uDkySccyCokYZZ8zR6DW C/b6KMPPVydZv3IX+FRxVo42X+hipx2cVkRZHLGOYJ+S296yn2nxPfmcXkoQvg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4f6Klc21BjzZtL for ; Thu, 05 Feb 2026 14:45:48 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3bd2a by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 05 Feb 2026 14:45:48 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Dag-Erling=?utf-8?Q? Sm=C3=B8rg?=rav Subject: git: c3904a7de78c - main - diff: Fix pagination leak 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: des X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: c3904a7de78ca1ca15fcdf4c09f9d4be7f6fe6f5 Auto-Submitted: auto-generated Date: Thu, 05 Feb 2026 14:45:48 +0000 Message-Id: <6984ad1c.3bd2a.7f1d98c8@gitrepo.freebsd.org> The branch main has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=c3904a7de78ca1ca15fcdf4c09f9d4be7f6fe6f5 commit c3904a7de78ca1ca15fcdf4c09f9d4be7f6fe6f5 Author: Dag-Erling Smørgrav AuthorDate: 2026-02-05 14:39:53 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2026-02-05 14:39:53 +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. PR: 266592 MFC after: 1 week Sponsored by: Klara, Inc. Reviewed by: kevans, markj Differential Revision: https://reviews.freebsd.org/D55112 --- usr.bin/diff/pr.c | 22 ++++++++++------------ usr.bin/diff/pr.h | 2 +- 2 files changed, 11 insertions(+), 13 deletions(-) diff --git a/usr.bin/diff/pr.c b/usr.bin/diff/pr.c index f254fbab28b7..189e6b34649e 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,15 +69,17 @@ start_pr(char *file1, char *file2) execl(_PATH_PR, _PATH_PR, "-h", header, (char *)0); _exit(127); default: - pr->pidfd = pr_pd; /* 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); } return (pr); @@ -98,14 +96,14 @@ stop_pr(struct pr *pr) fflush(stdout); if (pr->ostdout != STDOUT_FILENO) { - close(STDOUT_FILENO); dup2(pr->ostdout, STDOUT_FILENO); close(pr->ostdout); } - while (pdwait(pr->pidfd, &wstatus, WEXITED, NULL, NULL) == -1) { + while (pdwait(pr->procd, &wstatus, WEXITED, NULL, NULL) == -1) { if (errno != EINTR) err(2, "pdwait"); } + 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 b2ff7e5d6798..e6abad4466a6 100644 --- a/usr.bin/diff/pr.h +++ b/usr.bin/diff/pr.h @@ -26,7 +26,7 @@ struct pr { int ostdout; - int pidfd; + int procd; }; struct pr *start_pr(char *file1, char *file2);