From nobody Tue Feb 10 15:33:09 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 4f9QYy1Qtsz6RWLs for ; Tue, 10 Feb 2026 15:33:10 +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 4f9QYx42VTz3GlJ for ; Tue, 10 Feb 2026 15:33:09 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770737589; 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=iaxZI5bq9dRz9aDsDeqNCKjOPQPWmxS0nEKtiPjNCp0=; b=lWuqe86MfwO3mCThoP87S5bTmGjSzyuu1IjsyLStVDWb1HGErj59v1YnbO32SYJP3FqET8 N/xJPy3Unp9nO5jGPN8vVfdhKZ6gDrFNaSFM3sZ1i0oo0/NAvYJwgvwYe/C70fCjJseT8a sKSKhz0oM4PeSHlkimiljWd0CD4FahMJoA+VUiKyrsInzlHrfvqQdWxlSFvZyV4eFy+byu fw5U7FH5W5omSrFkOZQZGD3ijE4lCnwfVcW6LkG92Z2Sn13C6DMYVArGmtptHVsLnMlTs0 p9q2kMsoPFkVG5G+29qDyy1fAHqETfgA7Ojx9tQ2WL11XQZ5kvG/FDGbvEv/SQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1770737589; a=rsa-sha256; cv=none; b=ZUVaAbMDM3LOyDmDpdSWaej80HcFkZGntBqMm0dW11MCuDG1qbzvTzyTCn1ZqJJS+MOCVx kjgYigy5loobZTGG4bDnzWSsKzDLN+S+bN9jiQrgiK6HoDfpNarOa15BdNmWp94u+GR9g1 Lo4KCM5agBEPm4sgQyF8CpDgzyjUQooZfTrxuDYdjYyiXlDD55xQGtgfh3V/5Eq6RVxgae s3lOkLU7tJ4WaF8HHdNqaCZU3lGmJybHqlpFMMiRiUhXndkKhNmlu5xZa4/iWgkCDEDu6i RdwdCAE5LEdOVZCGZvW7+IQxmlGnGAIMa0vUAT+OfFRjTMjlZ2uiAJlYhm/jVQ== 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=1770737589; 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=iaxZI5bq9dRz9aDsDeqNCKjOPQPWmxS0nEKtiPjNCp0=; b=lp9Lb0LU9zDqC+VhZspDhMdg6eguiE+XpKjBWoXFvrAtjlro5eH+zQ7/0HYkeArfqW2IwN 9m1nylTrt4XzSjBEv8cNGz8wsW83vW2iE8XIa+i1x+3J95ai/PNY2siOan3P0WNnO1aYES vjD/WPPwdnvTadPLtwD8YvgDpqnvVp5QTDwuOqAtivSx2SWABtyENwlo9dliBnwGMpKEu4 /t1Bu82uio7DuBsBLZGU+KfaKqIXx07FbBGqrrJ/YxF7zU86M2eRhqVV7iAOjFUBS4rn/W MiwKGtP6ma1R2h6uYOz9jHNsu7HN1cAJQK1YmLUt15306pozUwT0aFwfRp1hag== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4f9QYx3Gzdz1NbZ for ; Tue, 10 Feb 2026 15:33:09 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 45ccf by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 10 Feb 2026 15:33:09 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dag-Erling=?utf-8?Q? Sm=C3=B8rg?=rav Subject: git: 44cf3a1f6da6 - stable/13 - 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: des X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 44cf3a1f6da63b064b4356d2b3c6d7834ee03a97 Auto-Submitted: auto-generated Date: Tue, 10 Feb 2026 15:33:09 +0000 Message-Id: <698b4fb5.45ccf.1b5589c@gitrepo.freebsd.org> The branch stable/13 has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=44cf3a1f6da63b064b4356d2b3c6d7834ee03a97 commit 44cf3a1f6da63b064b4356d2b3c6d7834ee03a97 Author: Dag-Erling Smørgrav AuthorDate: 2026-02-05 14:39:53 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2026-02-10 15:32:47 +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 (cherry picked from commit c3904a7de78ca1ca15fcdf4c09f9d4be7f6fe6f5) --- usr.bin/diff/pr.c | 22 ++++++++++------------ usr.bin/diff/pr.h | 1 + 2 files changed, 11 insertions(+), 12 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; };