From nobody Thu Nov 24 17:27:06 2022 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 4NJ4gG5Rnxz4hhLk; Thu, 24 Nov 2022 17:27: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 4NJ4gG502Kz3RJ4; Thu, 24 Nov 2022 17:27:06 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1669310826; 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=gdVH2thzMrxAU2C7ES9ebtx3DqOBUDfuZon4U1RBzm8=; b=vIJRE/zF0wlts4Fg89NZCe799F6LrvRG4K/JbzyzsctsYBFEOquRFlED1Gy12CC9T9vwYs YXBa/HOCp3rWZSwM+RcEhUPoqzUJvJCBoUeW6QeVR6GoRFQf10P7kENRg+lAeqs9M+392Z IdYqsotDzFnfSonVDB54ES1ILgNdwUaZP3USvfM6JReK/Ur0ZYmCg7GPhUAeZoZLr8Z7oa U9JED+j5E2G336aR6Rc2KH1Sxlg8EFiEIPpvy9IqgDvnB3fNKv1sebXDOPiF/Q0gYiZC0w zTavPQdRA+5AL9GvbKQfg0/QSSDob6scRV/qL19DHJKTjgcYI1nOnsepcbc95A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1669310826; 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=gdVH2thzMrxAU2C7ES9ebtx3DqOBUDfuZon4U1RBzm8=; b=moy0Cd9mhLqAFJa/E9is/Ozvt7OuSDWzzJXeDKS6F0ZaFLvGvIAiIsx2gGR78RFyMWtOom yo7b0HpU+bsoFUjlAlRVwMx6pt8VorjJE/eeyE/roQnTdaJ0UDvszpB8djwavhfuZ7+vE6 Y0EmlsZkpG3qU84Q374gkNLxm8njRMLwzfmb/o2Vbm0phV+hTHD1AJ8udmqj/xl37LT8SO fnI+jhQARWs3TSc1pCd5uFqg9ZE9Ex5gSK5zUFBdhPXkCzERBP4DR7N8qSNoCXGseD4Ean /IdFiUfs/qdCGTtNR0oFLHxyB3WBHBIUhq+RSK6DUiooIwD59S98SUthmQ7yag== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1669310826; a=rsa-sha256; cv=none; b=IgyKKSWJSlGaIkdgGNaNIt44hSSHoVqGhxFCns7wOQSJdE++yFcfHqvGjnylAWPJJurerL FsC0Ptx9vHlIw3CXWXsYa88sXqBrajq1KDOUQ3PWeRmqpD7Xhb3jRA8mVFMkpC/G9mEZgg FNKGAUENWMnR/QXuu+XBuJLMYCcF9VvKqKmSkjE9dwSPhT4n2pAsSUv/lL2WxfdMsQhHPV IEm7aDCiyvuW6zjy0ORjIRIil/mi/qpW+CCJQMTQB0Bc5dHFSxXdWeYS1VBL/Oyt0ySeaN T+Xm4yDvRQG/wArAmg4bg0MA9ebmSI19YDxqJmR0t2t/neSheHmNxFFav4wsuQ== 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 4NJ4gG45Vkz18Rp; Thu, 24 Nov 2022 17:27:06 +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 2AOHR687009215; Thu, 24 Nov 2022 17:27:06 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2AOHR6iD009214; Thu, 24 Nov 2022 17:27:06 GMT (envelope-from git) Date: Thu, 24 Nov 2022 17:27:06 GMT Message-Id: <202211241727.2AOHR6iD009214@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Cy Schubert Subject: git: d831a2fe480f - main - security/heimdal*: The version string must always contain a terminating NUL 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: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-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: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: d831a2fe480fe02126bd5b9aba5569c5e69f1034 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by cy: URL: https://cgit.FreeBSD.org/ports/commit/?id=d831a2fe480fe02126bd5b9aba5569c5e69f1034 commit d831a2fe480fe02126bd5b9aba5569c5e69f1034 Author: Cy Schubert AuthorDate: 2022-11-21 22:41:13 +0000 Commit: Cy Schubert CommitDate: 2022-11-24 17:22:01 +0000 security/heimdal*: The version string must always contain a terminating NUL Should the sender send a string without a terminating NUL, ensure that the NUL terminates the string regardless. And while at it only process the version string when bytes are returned. PR: 267884 Reported by: Robert Morris MFH: 2022Q4 --- security/heimdal-devel/Makefile | 2 +- .../heimdal-devel/files/patch-lib_krb5_recvauth.c | 42 ++++++++++++++++++++++ security/heimdal/Makefile | 2 +- security/heimdal/files/patch-lib_krb5_recvauth.c | 42 ++++++++++++++++++++++ 4 files changed, 86 insertions(+), 2 deletions(-) diff --git a/security/heimdal-devel/Makefile b/security/heimdal-devel/Makefile index 7953a8364e8c..5d03e274c83c 100644 --- a/security/heimdal-devel/Makefile +++ b/security/heimdal-devel/Makefile @@ -1,6 +1,6 @@ PORTNAME= heimdal PORTVERSION= ${HEIMDAL_COMMIT_DATE} -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= security PKGNAMESUFFIX= -devel HASH= 8f9c2d115 diff --git a/security/heimdal-devel/files/patch-lib_krb5_recvauth.c b/security/heimdal-devel/files/patch-lib_krb5_recvauth.c new file mode 100644 index 000000000000..95d8acf15baf --- /dev/null +++ b/security/heimdal-devel/files/patch-lib_krb5_recvauth.c @@ -0,0 +1,42 @@ +--- lib/krb5/recvauth.c.orig 2022-09-15 16:54:19.000000000 -0700 ++++ lib/krb5/recvauth.c 2022-11-21 14:37:31.130429000 -0800 +@@ -98,7 +98,7 @@ + const char *version = KRB5_SENDAUTH_VERSION; + char her_version[sizeof(KRB5_SENDAUTH_VERSION)]; + char *her_appl_version; +- uint32_t len; ++ uint32_t len, bytes; + u_char repl; + krb5_data data; + krb5_flags ap_options; +@@ -166,15 +166,21 @@ + krb5_net_write (context, p_fd, &repl, 1); + return krb5_enomem(context); + } +- if (krb5_net_read (context, p_fd, her_appl_version, len) != len +- || !(*match_appl_version)(match_data, her_appl_version)) { +- repl = 2; +- krb5_net_write (context, p_fd, &repl, 1); +- krb5_set_error_message(context, KRB5_SENDAUTH_BADAPPLVERS, +- N_("wrong sendauth application version (%s)", ""), +- her_appl_version); +- free (her_appl_version); +- return KRB5_SENDAUTH_BADAPPLVERS; ++ if ((bytes = krb5_net_read (context, p_fd, her_appl_version, len))) { ++ /* PR/267884: String read must always conatain a terminating NUL */ ++ if (strnlen(her_appl_version, len) == len) ++ her_appl_version[len-1] = '\0'; ++ ++ if (bytes != len || ++ !(*match_appl_version)(match_data, her_appl_version)) { ++ repl = 2; ++ krb5_net_write (context, p_fd, &repl, 1); ++ krb5_set_error_message(context, KRB5_SENDAUTH_BADAPPLVERS, ++ N_("wrong sendauth application version (%s)", ""), ++ her_appl_version); ++ free (her_appl_version); ++ return KRB5_SENDAUTH_BADAPPLVERS; ++ } + } + free (her_appl_version); + diff --git a/security/heimdal/Makefile b/security/heimdal/Makefile index 6508bf471ee0..3d92a0c2fd3b 100644 --- a/security/heimdal/Makefile +++ b/security/heimdal/Makefile @@ -1,6 +1,6 @@ PORTNAME= heimdal PORTVERSION= 7.8.0 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= security MASTER_SITES= https://github.com/heimdal/heimdal/releases/download/${DISTNAME}/ diff --git a/security/heimdal/files/patch-lib_krb5_recvauth.c b/security/heimdal/files/patch-lib_krb5_recvauth.c new file mode 100644 index 000000000000..95d8acf15baf --- /dev/null +++ b/security/heimdal/files/patch-lib_krb5_recvauth.c @@ -0,0 +1,42 @@ +--- lib/krb5/recvauth.c.orig 2022-09-15 16:54:19.000000000 -0700 ++++ lib/krb5/recvauth.c 2022-11-21 14:37:31.130429000 -0800 +@@ -98,7 +98,7 @@ + const char *version = KRB5_SENDAUTH_VERSION; + char her_version[sizeof(KRB5_SENDAUTH_VERSION)]; + char *her_appl_version; +- uint32_t len; ++ uint32_t len, bytes; + u_char repl; + krb5_data data; + krb5_flags ap_options; +@@ -166,15 +166,21 @@ + krb5_net_write (context, p_fd, &repl, 1); + return krb5_enomem(context); + } +- if (krb5_net_read (context, p_fd, her_appl_version, len) != len +- || !(*match_appl_version)(match_data, her_appl_version)) { +- repl = 2; +- krb5_net_write (context, p_fd, &repl, 1); +- krb5_set_error_message(context, KRB5_SENDAUTH_BADAPPLVERS, +- N_("wrong sendauth application version (%s)", ""), +- her_appl_version); +- free (her_appl_version); +- return KRB5_SENDAUTH_BADAPPLVERS; ++ if ((bytes = krb5_net_read (context, p_fd, her_appl_version, len))) { ++ /* PR/267884: String read must always conatain a terminating NUL */ ++ if (strnlen(her_appl_version, len) == len) ++ her_appl_version[len-1] = '\0'; ++ ++ if (bytes != len || ++ !(*match_appl_version)(match_data, her_appl_version)) { ++ repl = 2; ++ krb5_net_write (context, p_fd, &repl, 1); ++ krb5_set_error_message(context, KRB5_SENDAUTH_BADAPPLVERS, ++ N_("wrong sendauth application version (%s)", ""), ++ her_appl_version); ++ free (her_appl_version); ++ return KRB5_SENDAUTH_BADAPPLVERS; ++ } + } + free (her_appl_version); +