From nobody Fri Feb 16 17:34:06 2024 X-Original-To: dev-commits-src-main@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 4TbzZ65y7Zz53sQd; Fri, 16 Feb 2024 17:34: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 4TbzZ635rYz56C5; Fri, 16 Feb 2024 17:34:06 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708104846; 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=GI18JAzZ1rNvzX3Mbwvc9nKd1hCF0Z5GxhkO1O6nSsM=; b=mL5NW/SjLZnjcIMSj3GKm0bi3PGKkX0YurnPhJUp3gERuIB7VsuMNX2hGZm9lWGX5h6rZF aNv26jyQsLf6rULpHUUfe4rNOSuNQnLsvkdL57TmXMHxEgptlSX8AgTKK3zeFptOj2TK0u xIZXIO2W6yc7iCBvzOAAQAJHfmXnVDY0l1M/4aae17zR0hGGXByYI5l34F8LfP/jLMnQSf EAS9fEYQS17anLuuSfBleq6M0GtxClB+tywSSyjvfG+SQsBYNbcdFUGMPU2X72kfgf3VNI LiTgD86yObzUtAbk9DplJEpNKaf4Fx5SJuYe57oRsuS/zRdIfsTda1TPiLIKZA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708104846; 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=GI18JAzZ1rNvzX3Mbwvc9nKd1hCF0Z5GxhkO1O6nSsM=; b=eAf4Mq5PzcjLyExrDij5EMmCMUC1pU+pDJ1Ky5+Bk8G8SEWn0j7fztsEk4W82BqVkcNVx0 Gtir6izivzc/d4SsrSeBluimZZK/135C90NTzQ7o2Ifrste0IwTJgIHW+/6BmUi7Em0/6U RKdFQ1dyCxDNFH+hf2NmyTuBxwBi2RDyy1ru2PAxM0tTVWYY6oBQruaN0zdgG55RbQ+fCP 6iaCun004hh80/i+/OZxod26QfvqQ04sU4qHkAvdxMFSoFww5Ouq6CKIx1mISWFLRHISFy gBG+tWjIFMxrA52od+23FlIN8Fi+gxa4V7gEPmNZLi03p8keBKCn3Pu2Vt+OmQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1708104846; a=rsa-sha256; cv=none; b=N3FcLE22FQrq4Gg1kioMxKog3iOi7cvQTiKGoA/evQVckcSCEDJ+0lbbwgExRgd5cADW4R yehsxAaqcShIos16+h6I+y3fvDYRu4Zf02Md7D9ftasyztq6/1TyTTYvcBJrqxqocjq6Nr RE7ICYaNCFZ7XfmZFnc+gW6V6klVrzG+D+eqeEQpcpGhh5iiGVBmpbpF4g8cY2ugwJy7Tt wz8tAQQKSDuXtL+mQreFW1GMfaF+JmPUiThA+4gm40+0+aG1vxwX7iiZR7q/EXMfD4rMiY GvfRzyq9lJkMm0xS8Szkh27rIZQHnw6MIhgeE+gfhFgUneMenChsid80NCYjfA== 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 4TbzZ62B05zZhK; Fri, 16 Feb 2024 17:34:06 +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 41GHY6Y9089563; Fri, 16 Feb 2024 17:34:06 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41GHY6al089560; Fri, 16 Feb 2024 17:34:06 GMT (envelope-from git) Date: Fri, 16 Feb 2024 17:34:06 GMT Message-Id: <202402161734.41GHY6al089560@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Cy Schubert Subject: git: 5130b35ef561 - main - Revert "heimdal: CVE-2022-41916: Check for overflow in _gsskrb5_get_mech()" List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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/main X-Git-Reftype: branch X-Git-Commit: 5130b35ef561edf87be53721ed68de7927843fd4 Auto-Submitted: auto-generated The branch main has been updated by cy: URL: https://cgit.FreeBSD.org/src/commit/?id=5130b35ef561edf87be53721ed68de7927843fd4 commit 5130b35ef561edf87be53721ed68de7927843fd4 Author: Cy Schubert AuthorDate: 2024-02-16 17:31:13 +0000 Commit: Cy Schubert CommitDate: 2024-02-16 17:31:13 +0000 Revert "heimdal: CVE-2022-41916: Check for overflow in _gsskrb5_get_mech()" This was already applied by ed549cb0c53f. Repored by: Gunther Nikl This reverts commit 9286d46a794f25482880d29864a8901ef6666fae. --- crypto/heimdal/lib/gssapi/krb5/decapsulate.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/crypto/heimdal/lib/gssapi/krb5/decapsulate.c b/crypto/heimdal/lib/gssapi/krb5/decapsulate.c index 7a18708a633a..343a3d7acb97 100644 --- a/crypto/heimdal/lib/gssapi/krb5/decapsulate.c +++ b/crypto/heimdal/lib/gssapi/krb5/decapsulate.c @@ -56,8 +56,6 @@ _gsskrb5_get_mech (const u_char *ptr, return -1; if (total_len < 1 + len_len + 1) return -1; - if (total_len < 1 + len_len + 1) - return -1; p += len_len; if (*p++ != 0x06) return -1;