From nobody Fri Nov 06 19:54:48 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 4jLqdh5fV1z6ydx2 for ; Fri, 06 Nov 2026 19:54: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) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 4jLqdh3sdqz4FMF for ; Fri, 06 Nov 2026 19:54:48 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1793994888; 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=5goHYw+LfjB24MtsO4li9ZzBZ/lu0q/ZHESb5/6/9d8=; b=pSM9k8RcDqGoXzbp8PErWXgNWMq8aAXeuRir0toiV3UbIv42lvzR+JAdhZKVkFm4q9Agrb xNRRPyn6+Dxnz5dvWcuFGq/jofyjoF9dzNfBdLJMHlMkeF48PbkenmS62QRNyYOi5EkwrM hVwaI4txHKSphwSYxKp58Xp23I0+Siregx+fUjKuBWZoEQIFsWT+34krg21BSlwB1wck31 c/kDB7T+j6v01a2sckxS4J932xvD/O97vfQ+emV3aE8+IdFFltyx9+QymoAefTB0fpKHx4 KfTnPA8MhrGASg6H8jQyJr+0kR/PXHNk18kDN/EzSpCC9bmmb7m10CNh/wvR4Q== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1793994888; b=Vt+1JtZTku9f+FPWF477LoYtEcOeSoTYfjmm/yV53N0DiMuVeSZML/cl9JVJHqwXkLg8YH 5cOVHiifAtluvSKJw0FoSc767wWL6+isCcfyXw+ubGBI7eUC9JMp5pKsk0D5VLLiNfYYms IRw5IE40IuzB8l/9wvMV/V9xUbmDIV25Ln/AYxdYzVMgHwpf627JShgNhEwsW5k1FJO2VY yUoNNiq3yGC50+i/BhAkVO5G7S6w99c+zzSmglAqpSBUeUG0M8YQB3nifu32xEEA4Gbqff fvK/AuXIwCNnE1tH+MiLQ6bsaKiwRZxHzRPHr6c10TYd0nRAK+LgtGLdVa9xmQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1793994888; 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=5goHYw+LfjB24MtsO4li9ZzBZ/lu0q/ZHESb5/6/9d8=; b=MutiB1oYuhTsGDfMSoK67Yx/zLGbhv7ijKp5D4EMKZ6X5AbrKlC9Q83jmnbt+EAPLHtElN 80Z9POX1w3uSoK6WK98HiHYBCy6wYsQn54JjZKhIV3LNFzvHwSpPHB4Q7LxODShvNgm+e3 F3N0dxjYsK3o9XGO/K0Mk5Sio6kc37/su5OKs8qRuMjwCrWWnNrH0VorhYLJfb0uduDq8T pNlD2a3Ppse3DsOoWjPBROddQmaT0Bv00Be2z+n+esboycexfe6d0epHhPk/Tzkn949iMZ 4vd/ENY2KN7tFiCswaL6xdvt8Clv0oxnfkEbSXCy52+jaQP1wKHpAbryOoTExQ== 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 4jLqdh3XFzzs6T for ; Fri, 06 Nov 2026 19:54:48 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1d808 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 06 Nov 2026 19:54:48 +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: 8e12821ac016 - stable/15 - 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 Sender: owner-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/15 X-Git-Reftype: branch X-Git-Commit: 8e12821ac016f3c8412e7c97dd26b9574162dc58 Auto-Submitted: auto-generated Date: Fri, 06 Nov 2026 19:54:48 +0000 Message-Id: <6aee3088.1d808.3e10ed66@gitrepo.freebsd.org> The branch stable/15 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=8e12821ac016f3c8412e7c97dd26b9574162dc58 commit 8e12821ac016f3c8412e7c97dd26b9574162dc58 Author: Osvaldo Janeri Filho AuthorDate: 2026-10-20 22:04:17 +0000 Commit: Mark Johnston CommitDate: 2026-11-06 15:52:19 +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 800a791f04a1..4151163b7670 100644 --- a/lib/libpam/modules/pam_exec/pam_exec.c +++ b/lib/libpam/modules/pam_exec/pam_exec.c @@ -335,12 +335,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; @@ -451,7 +457,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);