From nobody Thu Apr 11 13:25:05 2024 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 4VFgRQ1NjFz5HQHY; Thu, 11 Apr 2024 13:25:06 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4VFgRQ09NDz57WV; Thu, 11 Apr 2024 13:25:06 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1712841906; 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=TSBLpHBV/24tJ84DxPUaARB1y6zWrPlxz3X9ctKx57Y=; b=t2q79QVi29pbXLr6cHwqmPebucYU9O6QzUqJkji8wm3OJeXbZLL4ZbJSdsav431d7ba7Sv k/KyCGqZOeLEDSw2DJSj0eLSv/baksnoB1WLLBCWJfnIngUB1UoRIg4r7pCGtqfP8TJrcl PymlpH3NKp1SUi7OuVBDbrnN9vlIHcGvGTpCMqyLcDu48IVMY3tCzSaH25eFmIWgQBYWnq tYIt2m0Km7wv4pjV8BLfjQMJoIK+hcHmCVynYAIRZexlihzxgYmsH8W5olbYBN3LClB69j uTjUiDB+zPuUzC4vSieqOAPuCPGu5G0prYE5k25QeTIIsxq3qoKXMNpXnczieg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1712841906; a=rsa-sha256; cv=none; b=WxVXnDPpbucG3uL0oV0I8ETMMRrgxZJnZMulnKoI7qlgcqEbcj6m1ZuIORhC7YuCrDMfb7 l0XJ6qfEbVypuxk2Vgplltg/wUI6hVY8BgUbrz+WgJkvZP7Vvh5eawbg9WoIoOcRSh/3ve 7UWrndqieszMe+fRXoYYuexp79SEj1yJNVc4vpYMdMZoMSU7LsmLxwDd3BjySMKTslptcC ciALIBcSDUu+NvjVjBRH193Md1sPaClsWcGlDeEzqwb/CD/Ksh0N9xLe5IXXYxchH5AdYg V2/AMaDKnS5wIOT/oSo2UhwkpAc0ZZGWXCBfx41Iy/j/JOavBmdNKveqWWB9UQ== 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=1712841906; 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=TSBLpHBV/24tJ84DxPUaARB1y6zWrPlxz3X9ctKx57Y=; b=XJh6e0NuR0qtRrotUY6w4qMgpN/yimdCvcxfdZUAkh4z1HdYoAe0PiKxDGdcsTZLfrTWNA 7Z9pEY67q+LPMOH/q6Yplqbr80zqt2rnlVahdSaS1Fi1FOzX4yutDo2l2H1i3tZaZ9nTcN OGT7DpH72Lzitac34oY6rX5oEmtjiywQsRIf256ZbpeQoUguR+mXBYLFzLyUfPyNTedH1b Bcs5kNNBgDBKnNL1fGMOo3/UsEA0+qcjSXSTgcqGoBXVvDDxpX95pdVNAOWEnS7asKvoUP ho1IK+kY5rCdocRyJK8yvojp0rTNlyrLGiDa+89voq30ptazP22OUT/iB3OGfg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VFgRP68Nsz1Mfw; Thu, 11 Apr 2024 13:25:05 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 43BDP54A047127; Thu, 11 Apr 2024 13:25:05 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43BDP50D047124; Thu, 11 Apr 2024 13:25:05 GMT (envelope-from git) Date: Thu, 11 Apr 2024 13:25:05 GMT Message-Id: <202404111325.43BDP50D047124@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Emmanuel Vadot Subject: git: 4d2dad92ee23 - stable/14 - pam_xdg: Reset rv to 0 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: dev-commits-src-all+owner@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: manu X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 4d2dad92ee23f49c38d6dd72581fbee35a2f81b2 Auto-Submitted: auto-generated The branch stable/14 has been updated by manu: URL: https://cgit.FreeBSD.org/src/commit/?id=4d2dad92ee23f49c38d6dd72581fbee35a2f81b2 commit 4d2dad92ee23f49c38d6dd72581fbee35a2f81b2 Author: Emmanuel Vadot AuthorDate: 2024-02-27 07:05:00 +0000 Commit: Emmanuel Vadot CommitDate: 2024-04-11 13:24:49 +0000 pam_xdg: Reset rv to 0 Otherwise on success it ontain the return value of asprintf. Sponsored by: Beckhoff Automation GmbH & Co. KG Fixes: 2d2950c88933 ("pam_xdg: Check asprintf return value") (cherry picked from commit 5acbe6d1fb552eeaf44955c2780f2e9d4a70cad3) --- lib/libpam/modules/pam_xdg/pam_xdg.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/lib/libpam/modules/pam_xdg/pam_xdg.c b/lib/libpam/modules/pam_xdg/pam_xdg.c index d8ba6899da2f..f1a9b13d581c 100644 --- a/lib/libpam/modules/pam_xdg/pam_xdg.c +++ b/lib/libpam/modules/pam_xdg/pam_xdg.c @@ -151,6 +151,7 @@ _pam_xdg_open(pam_handle_t *pamh, int flags __unused, rv = PAM_SESSION_ERR; goto out; } + rv = 0; session_file = openat(rt_dir_prefix, xdg_session_file, O_CREAT | O_EXCL, RUNTIME_DIR_MODE); free(xdg_session_file); if (session_file >= 0) @@ -272,6 +273,7 @@ _pam_xdg_close(pam_handle_t *pamh __unused, int flags __unused, rv = PAM_SESSION_ERR; goto out; } + rv = 0; session_file = openat(rt_dir_prefix, xdg_session_file, 0); if (session_file >= 0) { unlinkat(rt_dir_prefix, xdg_session_file, 0);