From nobody Tue Feb 10 15:27:39 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 4f9QRb55Qpz6RVQp for ; Tue, 10 Feb 2026 15:27:39 +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 4f9QRb28YXz46X7 for ; Tue, 10 Feb 2026 15:27:39 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770737259; 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=42oLt30m+pzt0VhDPC4YohWs7usSyCZhY+G0H3uvpKE=; b=bp37Rqp5R0kc8deo5//zkDc8yBFSwaNPz+/DXULwS843A0D/doWO1XXEGGObuhyAfSE77G UhRdiuuJOWUv16ef58cPinlM5AfliY0P5Ab27rsFL+m638UIXCNaE7CqLHTcWUDlzmYqtG cmU15wJ6xPZm6LzCR7sRuYRHVuQVQJ2SsIeUpAoeehshMCJAfcmCUVslFrUmvKkhzGds9T Iu7GE6bWMDc1BJEKxw2XbpeD7z0hIftVVi/SZDd8q4gsBp6LLJqmO8nx1H+vkQJrnSkhzB bLiU35RLD+9RcNCwkQ5X0wW1UqoSmB0ry6FfwmHIzutKr4FNsr4t0Gk3z78shQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1770737259; a=rsa-sha256; cv=none; b=U2eSv3Wvo8WMyp4SVyocrWIMi6R+GPpye/pvXtgg61xD9P3y1qFKAJpj3N8GxbivxfOejt cQkQPz61lq4Snjb5bksT/z+HBlf1O3p8WEjYVNhqbu8TifBj+dQwdXhYCYYo+Qw8MhXBOb oY1gIbMU5MDwf86t1ojk/o39IWbptGy8KhssPyHYhRDCk2HLGyt10PPuLMESuMYAsou5un dk39qMe8TAxS9J1ZMbRSKD3BNWOOZdBlVVM/7+D1iEjNsIDCzqtSwxWIbdRxc8ly33jI8v Qzl/RMY6jZdh5RHfwZVdobqLbkNlpOibt2N0Q/4NGYuNK+IqrKK9u7um2za7lw== 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=1770737259; 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=42oLt30m+pzt0VhDPC4YohWs7usSyCZhY+G0H3uvpKE=; b=QFUsmBYSKJbX3XzAzlN4ABpny/p0bvTt87bs5702LeexM5g+3TBA6A8yb3xzFUGiJ3oVrh Vn/uPLP/rlENykGGnn4db7Zd0Ar+CCoxV+kbX8XtTpjVfvJZ54l9z69SpPEBRnQSh2INOw cHAVBIM4+ZsaYXcN35E4b9E6wKYWrgZwDizNIR3bKTtzMo7lzcbo3i1qisdFCVA9DUFgWO xav9fhNXkiedxRNezvFjQcJ5Yvr7OD7BSLF+0orFAxZMZNw2LZ549NAGClTkpBi+0deQUr E3RNqvObxQAJSyGwL0oLVy7FzmhfRkebEcDiLWvsoRQYNwKa8qBXEKpj4AeCeQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4f9QRb1Nc5z1MXX for ; Tue, 10 Feb 2026 15:27:39 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 460ec by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 10 Feb 2026 15:27:39 +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: e87b9226551e - stable/15 - 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/15 X-Git-Reftype: branch X-Git-Commit: e87b9226551e88cb0649d4aaa54b041156df83f7 Auto-Submitted: auto-generated Date: Tue, 10 Feb 2026 15:27:39 +0000 Message-Id: <698b4e6b.460ec.1d04ac6b@gitrepo.freebsd.org> The branch stable/15 has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=e87b9226551e88cb0649d4aaa54b041156df83f7 commit e87b9226551e88cb0649d4aaa54b041156df83f7 Author: Dag-Erling Smørgrav AuthorDate: 2026-02-05 14:39:53 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2026-02-10 14:24:08 +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 | 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);