From nobody Fri Nov 13 22:07:49 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 4jRBFy00LJz6yCQL for ; Fri, 13 Nov 2026 22:07:50 +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) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 4jRBFx6bVwz3KPv for ; Fri, 13 Nov 2026 22:07:49 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1794607669; 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=5bBQ4PrL8bwXk3zg/rgEWrBJomFfij4VHqANw+Hf8zc=; b=BKjYTZii9yRM39LxBzKJRdwzyy+XW46cdlm6B54meWe+NgDljhZ5s0MEnziJRnQkfs70Vz MtFaOaC8Oh8EnO/KXFee/TdR1P2lyapuVMdnfjpWP/PCqTCtaYmer5jKRZ/w3Cc0Upa91U pUQVxyZG0r/KXwyPFFwng6D+ZkLa9MLApFocEOnKhlBGpC3Eos7hBDF6aei3fn8qH2ytNT hA3c8ULKWXCZFj5OlN0T3tso9KnLGN+OhTCl6dq/EiJiuYBxjvQykYl9Wf8jS1piE2q2/R YtL1ZQyedKCcGNNhsLMkJ16do1dUmn7jkE4m6AXwOIfyqTzeI5fpSpukZecEww== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1794607669; b=BU734cjSISnUSdZP+k7nM/rAumuojWXJFE26ruCmYFnnhuKukhHxDZv61Lt4zp7cC0Cd5M rjyBAR5x3n91vGOo++v0owqhNbZMWah8FyTfYP1yeD3hfhB3yeIykqBb8LWnxs6Dr3UGAc TJHCnXqTTaduF64ziqShwudgCAX9poKAQcOSj/GvlrSHM4QaRavPvEMiSSuUMGIM2ld6lc XAj2dsUfOk9rPOtTjrsiqM8At52ZAkfJR5+ShqvKRfoLEEwazCtczSXGjQbPLK8yMnuCvj OIOP65QVADgQXisUNcQww3p2orvweN3zP0Af5N3+GK8cwOc0KSY9B6WdqccQjQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1794607669; 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=5bBQ4PrL8bwXk3zg/rgEWrBJomFfij4VHqANw+Hf8zc=; b=gslmQecuZCj7+Jbv5i/061jqPQqI6cVQZFBiVDDL90Ukxf4tUzjgufR2WtDz/PRS7Qkw24 e4E5o+mJtrszIwpXnlrSURYX+zLYdzlxKsXbJxcOtBez6nSy19se7qIZefeNCcTOOnnzQM zwB4UlVBNBSCpZikqxuDzFozAv59ErkSlhnCXrWA/jQUzsh67xxpVAr8ZX3WL8vkilTVA8 csRghHTx+4ilcf7isPO89c7VhmBz6EYDhDm5281eyiKa4FCwI1PhHIVwnbgXYOYmE1EZzC EFX0JkD6ubSW/ALV/evt+wCnUa6JAfK4N3nwDgsaHtkrfe6wMujFFfc59zpJWA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4jRBFx60zDzv51 for ; Fri, 13 Nov 2026 22:07:49 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id ceea by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 13 Nov 2026 22:07:49 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Osvaldo Janeri Filho From: Mark Johnston Subject: git: 916b63aeb648 - stable/14 - pam_exec: fix the stderr close test and avoid a double close List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all X-BeenThere: dev-commits-src-all@freebsd.org List-Id: Commit messages for all branches of the src repository List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 916b63aeb6485af3cf3f46b61ccce138e04800b7 Auto-Submitted: auto-generated Date: Fri, 13 Nov 2026 22:07:49 +0000 Message-Id: <6af78a35.ceea.4f12a7c4@gitrepo.freebsd.org> The branch stable/14 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=916b63aeb6485af3cf3f46b61ccce138e04800b7 commit 916b63aeb6485af3cf3f46b61ccce138e04800b7 Author: Osvaldo Janeri Filho AuthorDate: 2026-10-20 22:04:17 +0000 Commit: Mark Johnston CommitDate: 2026-11-13 22:07:31 +0000 pam_exec: fix the stderr close test and avoid a double close The cleanup tested cherr[0] when closing cherr[1]. The parent also closed chin[0]/chout[1]/cherr[1] after pdfork() without clearing them, so the out: cleanup path closed them again. Clear each fd after closing and test the right one. Reviewed by: des, markj MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D60924 (cherry picked from commit 06abe08de45d251410949eac1bbb025367275260) --- lib/libpam/modules/pam_exec/pam_exec.c | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/lib/libpam/modules/pam_exec/pam_exec.c b/lib/libpam/modules/pam_exec/pam_exec.c index c249a654c8be..053f970c3808 100644 --- a/lib/libpam/modules/pam_exec/pam_exec.c +++ b/lib/libpam/modules/pam_exec/pam_exec.c @@ -336,12 +336,18 @@ _pam_exec(pam_handle_t *pamh, OUT(PAM_SYSTEM_ERR); } /* use poll() to watch the process and stdin / stdout / stderr */ - if (chin[0] >= 0) + if (chin[0] >= 0) { close(chin[0]); - if (chout[1] >= 0) + chin[0] = -1; + } + if (chout[1] >= 0) { close(chout[1]); - if (cherr[1] >= 0) + chout[1] = -1; + } + if (cherr[1] >= 0) { close(cherr[1]); + cherr[1] = -1; + } memset(pfd, 0, sizeof pfd); pfd[0].fd = pd; pfd[0].events = POLLHUP; @@ -452,7 +458,7 @@ out: close(chout[1]); if (cherr[0] >= 0) close(cherr[0]); - if (cherr[0] >= 0) + if (cherr[1] >= 0) close(cherr[1]); if (envlist != NULL) openpam_free_envlist(envlist);