From nobody Mon Dec 5 20:09:18 2022 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 4NQvlL3nQLz4jNtD; Mon, 5 Dec 2022 20:09:18 +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 4NQvlL2tWMz3k1N; Mon, 5 Dec 2022 20:09:18 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1670270958; 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=KoKWavJ97Q8yTG2PWbIx1t2G66/AwwUQcXA0Dsuy6UE=; b=VhM5nBXqMht/+wyItsqk0sXrkA6C4+bTWWiIc7NC/fRERwuIU7f/QiiBGe7ED6t25amwv+ gWkT5B8TaEhFpZpxqFgQmHfa5q15uOcHe8cAQCTiIib6MSaUUI6FPfXLDx8W09ZFTKe3HD NiKST17wyWOJXHZAdKa2tasaMnLl2HCnCXbNNDmmGjGUveLGeaTXUZJb+ZugN3RKOOs1UH wcd7QtLL/Kb21zSrwIRTsdBRhNx+i7IZaZDEu5e0/XLKpB7gr1PuOfVZ/Kd8d94O+hbqqO jvMWyAunqHaFIM6hlAWgxujT0VZNrmhH++BuCY5qqL367hpqidxpj7ATx0+6Rw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1670270958; 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=KoKWavJ97Q8yTG2PWbIx1t2G66/AwwUQcXA0Dsuy6UE=; b=gs5SRlLzqmvLWijp4kxLJd+gNBdpVPD+nKnsx7WRzyiAD3HDpsp47IrQHFIWrNs3YBLxym qjAxgrY/aXoxa/2Gne+YX8b8z+WtvRqU8KBS+IQzeKR8vfH+HWufCJrAUwXmIpFdtb7Ma2 vInNPra+JgKC638QfZRa9Ok8k3eI3PO1IvyziMQMfWmNSD7KnT3tDNTojLDdk0k80sRwQ1 ILGHDjtUaiTPbOKGvs71Aj87lkKuzAciYn9v0r8cGFN4cQ7oqiMd8GCqBhAvg5WKvWFMK8 eKtYsT+W9CKIL+JB7ln2uFKu+nQp/USG5LFL0FTb26R9DCSumKBl0jJv2PaBcg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1670270958; a=rsa-sha256; cv=none; b=EUr1pu+1pkkgMGqnEkSXjeEg7D6unpCyGQ98qIezAve+e3AURitUcD9c8qnvsPhpOhHiBi v+RxKBS8rZKFf14A2//2+xfg772LGKt3tpe9uKrqKSfZhEQciU73YYV7kazgvTsZ8pcuBT uivOz5aNlkkvrhyjR2lkcI7a0+j6PH3rJdaHZtmz5lJA4o6rfW22D9aByzU2dj0xduEgeQ gEAUNHvtiSgt0+KcY+Ez3fDmQp4KR2HSAxitR23f+BFOI3tr8ElYB1jLtPWtV+hfmq+/Vb XkYE5Uq5jDs9EMkFU8HTRKvYOA56H6+58vtQ6Sqkc71IPbpz6NtuvE/6cwtE5A== 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 4NQvlL1yBtz190w; Mon, 5 Dec 2022 20:09:18 +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 2B5K9IM7042479; Mon, 5 Dec 2022 20:09:18 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2B5K9Ih2042478; Mon, 5 Dec 2022 20:09:18 GMT (envelope-from git) Date: Mon, 5 Dec 2022 20:09:18 GMT Message-Id: <202212052009.2B5K9Ih2042478@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: a8c5dca736cd - 2022Q4 - security/heimdal*: The version string must always contain a terminating NUL 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/2022Q4 X-Git-Reftype: branch X-Git-Commit: a8c5dca736cdaed68738c39c52a3e0e158951b28 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch 2022Q4 has been updated by cy: URL: https://cgit.FreeBSD.org/ports/commit/?id=a8c5dca736cdaed68738c39c52a3e0e158951b28 commit a8c5dca736cdaed68738c39c52a3e0e158951b28 Author: Cy Schubert AuthorDate: 2022-11-21 22:41:13 +0000 Commit: Cy Schubert CommitDate: 2022-12-05 20:06:14 +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 (cherry picked from commit d831a2fe480fe02126bd5b9aba5569c5e69f1034) --- 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 dacf23ed6f98..890391647bc5 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); +