From nobody Fri Mar 10 20:32:32 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 4PYHmJ6ktJz3xvCv; Fri, 10 Mar 2023 20:32:32 +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 4PYHmJ6Hrfz4MqG; Fri, 10 Mar 2023 20:32:32 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1678480352; 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=RKNqhQtMXe526nf+8wL4YL2d/CPgpAF1QetDbgIiMmQ=; b=d4WWyU/2cQYZ9RKUMLS4jdAhciiBDKqfZN+9ba5mzGBA0XvMQm7uvVn+q+vkDPIPD6RIIe Jj3LWL0CoIjld7Ub0v7EEfRYSyx7GC/LL1sfMEfWoGmAgqdagZEKJHOjsm24xxutDjDPxX FKpRiRM7vTRESXmvehwOPRnmyVUDlnkBKZomi4y3BCfG4PlnZncUp76I1uUs3rzrf6qtjn Bu89c99QAFRDH+dGO8wP50z1csyJYDII9YR/xD5z15EcqKXX+kFxybDOQT+fHPoPXFc62e MHWFPUf9fKZVBebHyIM+bkkCPAunzgkQPSBEM/RaNizlK1TX3QpDdhdNVrTDhQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1678480352; 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=RKNqhQtMXe526nf+8wL4YL2d/CPgpAF1QetDbgIiMmQ=; b=IbHBYX0p8l+6lgs9uPUzl1h2oXbxhEX/2gSOvrUjJdnuX4DiFkoBtEyb8+NGDQdSAh11/o uP6N1kLFtpJ0FUyRdHlqAWqDvARl3JzAICSDMOFDbqi/2IRF38MAO+Am1XPgbZBbCU2RbK d9VDrhTuQFWb4+FptU15u3FBaOmfwtQFo0BUo5roNIepbP6Vlh02roOKDhUuZPuFD+GZdz LY6/zU7idmvwBDH8FA4fMe6y+UiAEpBmxJBDTMEKx72eQGXgBNc1p2AtNYTBw2LiQdI5Sw gHEU6hs+vFS5llPmqQTFsK3mMeQrmJ6G+F2pynYDqIkRbd6/c11dOuTdt8ER1Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1678480352; a=rsa-sha256; cv=none; b=MZbqH7chMIwt3e9wKY+FL+j/FfQ0DmUxBRlsltXauJkZRlNZcXCcsIma/+ndILZ0x3olOL f8mwlpstCDW3T+xcH0zNAdw+ZLLBZFWI6NHticm2UI8bF7HHum1ojYPjoDrG62OyalZtvm k52xR5hl/S14GnlhAzzjPP9YfB3HZe83AYR0qjBxxyCLzzL1LRTSXZ/LhMMFdMA9ihnNwN 0UKtErNLBEcupLT+ZwtlAK0Q9BzOFlriwEGKBYyFg8Vyw058QQJfX3ipWe2robICCjuz7R PexYKZr/ZtNxE3G2RhQLqBe/9E4c/RJqt0VNj9C8REA1j0oL5x7jRP9L/0F8pA== 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 4PYHmJ5LGcz130q; Fri, 10 Mar 2023 20:32:32 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 32AKWWvB096006; Fri, 10 Mar 2023 20:32:32 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 32AKWWNu096005; Fri, 10 Mar 2023 20:32:32 GMT (envelope-from git) Date: Fri, 10 Mar 2023 20:32:32 GMT Message-Id: <202303102032.32AKWWNu096005@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Cy Schubert Subject: git: c4c0bd4d0102 - stable/12 - heimdal: Fix CVE-2022-4152, signature validation error 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: cy X-Git-Repository: src X-Git-Refname: refs/heads/stable/12 X-Git-Reftype: branch X-Git-Commit: c4c0bd4d0102feef22157491538b78c0e894b1aa Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/12 has been updated by cy: URL: https://cgit.FreeBSD.org/src/commit/?id=c4c0bd4d0102feef22157491538b78c0e894b1aa commit c4c0bd4d0102feef22157491538b78c0e894b1aa Author: Cy Schubert AuthorDate: 2023-03-10 01:03:52 +0000 Commit: Cy Schubert CommitDate: 2023-03-10 04:07:43 +0000 heimdal: Fix CVE-2022-4152, signature validation error When CVE-2022-3437 was fixed by changing memcmp to be a constant time and the workaround for th e compiler was to add "!=0". However the logic implmented was inverted resulting in CVE-2022-4152. Reported by: Timothy E Zingelman Security: CVE-2022-4152 Security: https://www.cve.org/CVERecord?id=CVE-2022-45142 Security: https://nvd.nist.gov/vuln/detail/CVE-2022-45142 Security: https://security-tracker.debian.org/tracker/CVE-2022-45142 Security: https://bugs.gentoo.org/show_bug.cgi?id=CVE-2022-45142 Security: https://bugzilla.samba.org/show_bug.cgi?id=15296 Security: https://www.openwall.com/lists/oss-security/2023/02/08/1 (cherry picked from commit 5abaf0866445a61c11665fffc148ecd13a7bb9ac) --- crypto/heimdal/lib/gssapi/krb5/arcfour.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/crypto/heimdal/lib/gssapi/krb5/arcfour.c b/crypto/heimdal/lib/gssapi/krb5/arcfour.c index 3b8d452877dd..7d1143c95d83 100644 --- a/crypto/heimdal/lib/gssapi/krb5/arcfour.c +++ b/crypto/heimdal/lib/gssapi/krb5/arcfour.c @@ -307,7 +307,7 @@ _gssapi_verify_mic_arcfour(OM_uint32 * minor_status, return GSS_S_FAILURE; } - cmp = (ct_memcmp(cksum_data, p + 8, 8) == 0); + cmp = (ct_memcmp(cksum_data, p + 8, 8) != 0); if (cmp) { *minor_status = 0; return GSS_S_BAD_MIC; @@ -695,7 +695,7 @@ OM_uint32 _gssapi_unwrap_arcfour(OM_uint32 *minor_status, return GSS_S_FAILURE; } - cmp = (ct_memcmp(cksum_data, p0 + 16, 8) == 0); /* SGN_CKSUM */ + cmp = (ct_memcmp(cksum_data, p0 + 16, 8) != 0); /* SGN_CKSUM */ if (cmp) { _gsskrb5_release_buffer(minor_status, output_message_buffer); *minor_status = 0;