From nobody Mon Jun 8 14:57:50 2026 X-Original-To: dev-commits-ports-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 4gYwBl2cP4z6gC89 for ; Mon, 08 Jun 2026 14:57:51 +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 "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gYwBl04W1z4HBq for ; Mon, 08 Jun 2026 14:57:51 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1780930671; 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=tKIXYr6u9WJGz7msFjYUN4vaD2Z610LnsN3+pQCr2Kg=; b=M5pk20XeB/iRjwaCqJTIRgXZN+5fyZt9Rh1flrtkCU68v4S3ITU3N67GaYSPgc6x+ZG0Dz PHSB6feL6VGDAd+ErJkASaCFojD96K87bRDpt5L7wuu1H2+E0ZBXep6a0k59xHn9VDGFe/ bnwFjQiuTiZfSyPJjZrLbnJ9RSNx1aJ/B717S4phyrbPvzm4NQrAu9eeRkWqW+9urpCtFD 4DcZpiCOPR+frNB0g3JZnUoRhyV9/6DvCpg5vgw3mieZoFmeXSngFpE2KeiRxCmpq8TPaG fRh5lmJjWpGTnxYWFk3fXu5fx5noi1JNPhSYw+Wq/9yA/KF1rnfpoZESjdTTEg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1780930671; a=rsa-sha256; cv=none; b=WISsf6mBC4cPugLrfU+EbFfiyRYuES4aOZHgNpsrNsaxhJpo+IB+wV5sphnsX47IgCb0H2 idzcBzQMWxZTI4kd+PEi4qnkaazI+ljeRfouvQ5mKIRqgU6gPb5EldGo19ILnznxsSRpdQ D7vdU9ad1AOtkfv27/nt2dyPlfi+U8mz+xiaNnbmyYaK/S8IYHNYHMpBCwacQi9oSbzpMZ AR/DLSkOIaOqyoj4rrpOHxveHsl2YZd0NhNu/UEH24u1dAU3HASdk5uH9SYLdxzkrdNsEc UXst7mNPZgB+cvx67e0sX4v7ZBmK59VZvayD66MV6ZBp1WkN4v2CYH0S5p3lzQ== 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=1780930671; 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=tKIXYr6u9WJGz7msFjYUN4vaD2Z610LnsN3+pQCr2Kg=; b=UrOo4ei4qwEzLifkl9sL/JcvMl2qKT3y/vQwufNua0z8MI7KjHUs6fh2pC9Djs0icLixOM zZ47aznCPLT101HH+Svy56cLjjGYZVPZ00s3FWJygMulnP3fZTtIDA0NJp5LoNjwHyy4GB Vxu7ZBH1/VabK341RLRPNgVSPL6zpk8qkNZQJzNy9DEqZTmqrWWzSjk4+5gpDWuvUxL0eS QcDnduN9sK7feNSQEtXqmgoHpC7DnpgN8bp1O6jL3uUPcGdTd5V0991oDcETJhKv73Ri0b AsRxBl4NtBpdRLobtnRaAJlkjbQ00b/X5J2CSY87dpb9ccIdHGyOOJQDZzrm8A== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gYwBk6fxWzt4N for ; Mon, 08 Jun 2026 14:57:50 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 18238 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 08 Jun 2026 14:57:50 +0000 To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Cy Schubert Subject: git: 8854e0201abe - main - security/krb5-12?: Fix reachable assert when importing krb5 names List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-all@freebsd.org Sender: owner-dev-commits-ports-all@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list 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/main X-Git-Reftype: branch X-Git-Commit: 8854e0201abe6c8292d0360c23a8be7201240016 Auto-Submitted: auto-generated Date: Mon, 08 Jun 2026 14:57:50 +0000 Message-Id: <6a26d86e.18238.b357cbc@gitrepo.freebsd.org> The branch main has been updated by cy: URL: https://cgit.FreeBSD.org/ports/commit/?id=8854e0201abe6c8292d0360c23a8be7201240016 commit 8854e0201abe6c8292d0360c23a8be7201240016 Author: Cy Schubert AuthorDate: 2026-06-08 14:55:03 +0000 Commit: Cy Schubert CommitDate: 2026-06-08 14:57:37 +0000 security/krb5-12?: Fix reachable assert when importing krb5 names If a name token contains trailing garbage, error out from krb5_gss_import_name() instead of crashing the process with an assertion failure. Commit message details obtained from upstream commit. Obtained from: upstream commit 07818f1fd Reported by: Aisle Research (Ze Sheng, Dmitrijs Trizna, Luigino Camastra, Guido Vranken) to krb5-bugs MFH: 2026Q2 --- security/krb5-121/Makefile | 2 +- security/krb5-121/files/patch-lib_gssapi_krb5_import__name.c | 12 ++++++++++++ security/krb5-122/Makefile | 2 +- security/krb5-122/files/patch-lib_gssapi_krb5_import__name.c | 12 ++++++++++++ 4 files changed, 26 insertions(+), 2 deletions(-) diff --git a/security/krb5-121/Makefile b/security/krb5-121/Makefile index 5de464022eaa..572b0531d90f 100644 --- a/security/krb5-121/Makefile +++ b/security/krb5-121/Makefile @@ -1,6 +1,6 @@ PORTNAME= krb5 PORTVERSION= 1.21.3 -PORTREVISION= 2 +PORTREVISION= 3 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-lib_gssapi_krb5_import__name.c b/security/krb5-121/files/patch-lib_gssapi_krb5_import__name.c new file mode 100644 index 000000000000..fc99a2ad893f --- /dev/null +++ b/security/krb5-121/files/patch-lib_gssapi_krb5_import__name.c @@ -0,0 +1,12 @@ +--- lib/gssapi/krb5/import_name.c.orig 2026-06-08 07:48:11.489573000 -0700 ++++ lib/gssapi/krb5/import_name.c 2026-06-08 07:49:18.639094000 -0700 +@@ -302,7 +302,8 @@ + goto fail_name; + cp += length; + } +- assert(cp == end); ++ if (cp != end) ++ goto fail_name; + } else { + status = GSS_S_BAD_NAMETYPE; + goto cleanup; diff --git a/security/krb5-122/Makefile b/security/krb5-122/Makefile index ba1c1c249666..ea9d71fa098a 100644 --- a/security/krb5-122/Makefile +++ b/security/krb5-122/Makefile @@ -1,6 +1,6 @@ PORTNAME= krb5 PORTVERSION= 1.22.2 -PORTREVISION= 1 +PORTREVISION= 2 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-122/files/patch-lib_gssapi_krb5_import__name.c b/security/krb5-122/files/patch-lib_gssapi_krb5_import__name.c new file mode 100644 index 000000000000..fc99a2ad893f --- /dev/null +++ b/security/krb5-122/files/patch-lib_gssapi_krb5_import__name.c @@ -0,0 +1,12 @@ +--- lib/gssapi/krb5/import_name.c.orig 2026-06-08 07:48:11.489573000 -0700 ++++ lib/gssapi/krb5/import_name.c 2026-06-08 07:49:18.639094000 -0700 +@@ -302,7 +302,8 @@ + goto fail_name; + cp += length; + } +- assert(cp == end); ++ if (cp != end) ++ goto fail_name; + } else { + status = GSS_S_BAD_NAMETYPE; + goto cleanup;