From nobody Tue Aug 1 20:06:24 2023 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 4RFmMl275cz4pp2w; Tue, 1 Aug 2023 20:06:24 +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 4RFmMh1rfZz3Gp3; Tue, 1 Aug 2023 20:06:24 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1690920384; 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=fLgX2l+1G11Fl5EOSabsceQO1WoE/AH/pZ3OjaIsGOg=; b=nWtdz1NPNm4ZF9ZlKIJwzwgEavSwctE27A5N7xHZm1TggmZRDv/yFA7yJiTuImHsbe81e6 dF7fWdwxh4TqmsKLaCscJpcXDD6j+/PO/vklfYisLyNEYXPP0pr2v4++0MDlDHGM7Ao81x aJvuWny+QLVyK0qm/xouSc9DtaqQCiGwb0XFXsomQ62xH9D2ZB71wGTXrwmIYeaoQhu1Am 8uo82q826zUZc0pebYXyrT9fJDIpBKRgbQGpVEGdM7jz0yIekQZ3uuRIcwhECRnUwG7lm2 7c3wMk6J1Dm2FYNO+4fqw4L6ZzMelMdmomoUAHV1NpE4+MTHUZC38OZW52KZkg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1690920384; a=rsa-sha256; cv=none; b=JW/CQyy+eBL5hRn1lZ7AEDgeV1L+XJsOga10t6J4hN7nRJaj5hoik81LMrmlXGWg+9H7OO 3CeabDQIkw/JngH6rH5MfqfMgdFgmJg7LG4Spfb2DA7x+37q9owKYcM69op5M47WcMgM7R IecTmbyoG2eHe3i/Olg2Cg9cxHh6S3D2D1j3ruz3iZkHhPsTZxtvM+9eIva303ajl6Yh1o Wkb9NlQH2UgeqRZRbnMySuqouTIcaNrGHT78nJXK19VRoEK6JJwg9tBGeJuiUXxkgNlZWB rjEijjfmfRoOvJ59VtYce2klCXVTFY8mGTA5pGfcENsSRpfnpg9K/7qgeZKiDQ== 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=1690920384; 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=fLgX2l+1G11Fl5EOSabsceQO1WoE/AH/pZ3OjaIsGOg=; b=p1G5vSXcbMPmpKl6wcwCIF00a5kWoevCsmERj+J69laQftlAEBP0dEyU4HHVN2qwm6D109 D//0RV9WBVF9NcKHHh8+h3HXltgfgWXQGmhhO7LKSYHPfXoR4d4xrj5FBB0MtT8sqRSh4p Lzw8dpQrOSEO1ZXK/1v3ug4gNqOQz/54cxXF1QfcZNNREJe/Y9CPjR/uPLouYwVoI1YyJF SdkcJjKKvyJZQqwe2PV5ohtEU6jsGRjLJjkegrvHOqhEnDnWAku0arydewYCmRMlcr6GNb Yu1jbv3+BLW7kPjliGTh2vdU4SA5izJrBDYZO2OAYWZSa1Epgm8Uy+u9vkWVhg== 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 4RFmMh0l5czrD6; Tue, 1 Aug 2023 20:06:24 +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 371K6OwT014067; Tue, 1 Aug 2023 20:06:24 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 371K6Ogb014066; Tue, 1 Aug 2023 20:06:24 GMT (envelope-from git) Date: Tue, 1 Aug 2023 20:06:24 GMT Message-Id: <202308012006.371K6Ogb014066@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: abe05d13d575 - releng/12.4 - pam_krb5: Add missing patch 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: owner-dev-commits-src-all@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: markj X-Git-Repository: src X-Git-Refname: refs/heads/releng/12.4 X-Git-Reftype: branch X-Git-Commit: abe05d13d575f0299653067614169460d33aab13 Auto-Submitted: auto-generated The branch releng/12.4 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=abe05d13d575f0299653067614169460d33aab13 commit abe05d13d575f0299653067614169460d33aab13 Author: Cy Schubert AuthorDate: 2023-07-08 03:09:18 +0000 Commit: Mark Johnston CommitDate: 2023-08-01 19:46:53 +0000 pam_krb5: Add missing patch Include a portion of the patch that was missed in 813847e49e35. Reported by: markj Fixes: 813847e49e35 (cherry picked from commit bfa51318dee8afd9307f15e49a6a521938dccd06) (cherry picked from commit 6edaf8c7aeada2ab6b84c8ce56fc179d5cf2eecd) Approved by: so Security: FreeBSD-SA-23:09.pam_krb5 Security: CVE-2023-3326 --- lib/libpam/modules/pam_krb5/pam_krb5.c | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/lib/libpam/modules/pam_krb5/pam_krb5.c b/lib/libpam/modules/pam_krb5/pam_krb5.c index 3972479a581f..3c7976297ed2 100644 --- a/lib/libpam/modules/pam_krb5/pam_krb5.c +++ b/lib/libpam/modules/pam_krb5/pam_krb5.c @@ -938,18 +938,6 @@ verify_krb_v5_tgt_begin(krb5_context context, char *pam_service, int debug, continue; break; } - if (retval != 0) { /* failed to find key */ - /* Keytab or service key does not exist */ - if (debug) { - const char *msg = krb5_get_error_message(context, - retval); - syslog(LOG_DEBUG, - "pam_krb5: verify_krb_v5_tgt(): %s: %s", - "krb5_kt_read_service_key()", msg); - krb5_free_error_message(context, msg); - } - retval = 0; - } if (keyblock) krb5_free_keyblock(context, keyblock);