From nobody Wed Aug 16 15:31:34 2023 X-Original-To: dev-commits-ports-branches@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 4RQsYf3HWNz4qmWb; Wed, 16 Aug 2023 15:31:34 +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 4RQsYf2T9bz3Dst; Wed, 16 Aug 2023 15:31:34 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692199894; 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=mbhXPqCwRd9zCeXN1j8/NrGwp6cVYDZ+Fwb95TNW+Fk=; b=b/i8Th4cy+IA7yC5BKJtWUQcPBNVpZjuHv9prBt5Y/mR9AJAol4Vjc/gTFegqY0haKS1CT 7eMHE5lyys7a83guTKbHgR8guAHauXDwLelxleu/ikZ0YHru/BzNHQAi0A/cVXBti3ohqV iUQ0tDanWzgmcwL/zEQm2urV85Ed3k2F7MurbVOlekCMbGPn7lE3DS4wW92Q5SBjFexqxX 04shyWRfHCxCDSJjRy33edvi/i2apUcIXIAVKI/RiJr4wmFrziNt0Q4dR49NHOqH6l7qoF Zy5dtjuIUheeiGs0sy5hkUim+0wtdOlqG7Enmp+srDhUyiUwjRqiz1GFMS//AQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692199894; 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=mbhXPqCwRd9zCeXN1j8/NrGwp6cVYDZ+Fwb95TNW+Fk=; b=sYkJtYebjLh0VCiDpQ6oQBaC9hK8VRpiCgQk0368rO+QKCEvDqPRv7X8KXrWt2NaHe5pGy U1DZrExkpKCpBlFE34BYHy2y5Q/cMW5Wk5BKT4f2B/1wWV1ev6xN/+qFofZc0wh1WZGlPk SzQnz2mNKSZ5tjRyaaaw+jLAbeL6wAIy01nQaGzfUR0csg6YlJ2N55Gm4aqGHl5d3iRw9f bhNWgBR8+qwepoDMQctb1ABA7Rprd1iv8S7u84CfFIMYKfa7oAYlj517wTgkGNeskN+9f/ raD9V/l2N474zFey0DhNbDnMi8AfnaIDj0rrSPnT8/ilbus0OmqMhAgECtJAVw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1692199894; a=rsa-sha256; cv=none; b=mkyI7PsxUoWVdgEXHzBD7OHqTUnypKblZ5tU6N2K5+ZYeXBV3ronZvg58GIjzeeOKDRgPx vv9Y0zdn7oBQNaRblUawLRtLQu8sTVhMrAhqZ7Ou9ETdolkP7yREf1/nU29OpeAzJ9nWsm olw+uzccET6CAbLAyJaWWYOquVq9sd8OMu31cgDb7u4YK1iUjsUd+/f59qSKW5/UR89ADe fiF0wiM3Wcf1eLq8+BtXWEWpL3WOWj/aWCzsWfR9OhDXeqTWuvx+vOnB9CuCHiBh2aXf2e bfGAD+ERSU1ij/2z47aTlvi5dmTwLKlGfUXjK0G0wg4tapdbfZzCYEm42x+v0Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4RQsYf1Hxvzwl8; Wed, 16 Aug 2023 15:31:34 +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 37GFVY2Y019047; Wed, 16 Aug 2023 15:31:34 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37GFVYvr019044; Wed, 16 Aug 2023 15:31:34 GMT (envelope-from git) Date: Wed, 16 Aug 2023 15:31:34 GMT Message-Id: <202308161531.37GFVYvr019044@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Cy Schubert Subject: git: aa4e888e949e - 2023Q3 - security/krb5-121: Fix double-free in KDC TGS processing List-Id: Commits to the quarterly branches of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-branches@freebsd.org X-BeenThere: dev-commits-ports-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cy X-Git-Repository: ports X-Git-Refname: refs/heads/2023Q3 X-Git-Reftype: branch X-Git-Commit: aa4e888e949e1a194441551cd28c33f9d0d72b22 Auto-Submitted: auto-generated The branch 2023Q3 has been updated by cy: URL: https://cgit.FreeBSD.org/ports/commit/?id=aa4e888e949e1a194441551cd28c33f9d0d72b22 commit aa4e888e949e1a194441551cd28c33f9d0d72b22 Author: Cy Schubert AuthorDate: 2023-08-14 14:43:21 +0000 Commit: Cy Schubert CommitDate: 2023-08-16 15:31:24 +0000 security/krb5-121: Fix double-free in KDC TGS processing Upstream's commit log message: When issuing a ticket for a TGS renew or validate request, copy only the server field from the outer part of the header ticket to the new ticket. Copying the whole structure causes the enc_part pointer to be aliased to the header ticket until krb5_encrypt_tkt_part() is called, resulting in a double-free if handle_authdata() fails. [ghudson@mit.edu: changed the fix to avoid aliasing enc_part rather than check for aliasing before freeing; rewrote commit message] CVE-2023-39975: In MIT krb5 release 1.21, an authenticated attacker can cause a KDC to free the same pointer twice if it can induce a failure in authorization data handling. ticket: 9101 (new) tags: pullup target_version: 1.21-next Obtained from: Upstream git commit 88a1701b4 MFH: 2023Q3 (cherry picked from commit 73ac8e036934587e606aefad711b19ab9431fe83) --- security/krb5-121/Makefile | 1 + security/krb5-121/files/patch-kdc_do__tgs__req.c | 14 ++++++++++++++ 2 files changed, 15 insertions(+) diff --git a/security/krb5-121/Makefile b/security/krb5-121/Makefile index 4ba2b5aa5cea..fe0251da5e19 100644 --- a/security/krb5-121/Makefile +++ b/security/krb5-121/Makefile @@ -1,5 +1,6 @@ PORTNAME= krb5 PORTVERSION= 1.21.1 +PORTREVISION= 1 CATEGORIES= security MASTER_SITES= http://web.mit.edu/kerberos/dist/${PORTNAME}/${PORTVERSION:C/^[0-9]*\.[0-9]*/&X/:C/X\.[0-9]*$//:C/X//}/ .if !defined(MASTERDIR) diff --git a/security/krb5-121/files/patch-kdc_do__tgs__req.c b/security/krb5-121/files/patch-kdc_do__tgs__req.c new file mode 100644 index 000000000000..b42861d35c02 --- /dev/null +++ b/security/krb5-121/files/patch-kdc_do__tgs__req.c @@ -0,0 +1,14 @@ +--- kdc/do_tgs_req.c.orig 2023-07-10 13:58:20.000000000 -0700 ++++ kdc/do_tgs_req.c 2023-08-14 07:23:14.383349000 -0700 +@@ -1010,8 +1010,9 @@ + } + + if (t->req->kdc_options & (KDC_OPT_VALIDATE | KDC_OPT_RENEW)) { +- /* Copy the whole header ticket except for authorization data. */ +- ticket_reply = *t->header_tkt; ++ /* Copy the header ticket server and all enc-part fields except for ++ * authorization data. */ ++ ticket_reply.server = t->header_tkt->server; + enc_tkt_reply = *t->header_tkt->enc_part2; + enc_tkt_reply.authorization_data = NULL; + } else {