From nobody Thu Nov 24 17:26:40 2022 X-Original-To: dev-commits-src-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 4NJ4fn1BgJz4hhb1; Thu, 24 Nov 2022 17:26:41 +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 4NJ4fn0fkmz3Q8m; Thu, 24 Nov 2022 17:26:41 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1669310801; 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=z8nvk34lJLBYkF5fQyQ4M1Ap7SkCYzfKi8GS0IQrcGM=; b=XnmikhaNpvsPzTZ6JdIMqAroDqj+GmPugAXECN+cY46Y7aIqU5OUMiDeDW5P0j6KAmjYA6 A5ZUsVev4XneTbjfJPLYIM7+Z76kD3A18J2j/nfbNO/2XwIubHVu/Y+RoRd7MTe61EfFwe n9SKY8Il7UdCiUWPix6sBdgEcezdbxb+Y1aB+VGuYNMjbT5Czam1P6u25RqO61gof1agrV xJhTyGX0ymEhhp8ibZxNBWgOCLcgy57fKpkxWeB+/JqhPMX5KQjnv03qCjOXzFQCViVP6D NH+bySmO7DcdPUKvZcmOuC4207M+yp0QzN5+9mti2iO4BsqL5j0CkBgl+XZF0A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1669310801; 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=z8nvk34lJLBYkF5fQyQ4M1Ap7SkCYzfKi8GS0IQrcGM=; b=KueAAwW6UK/ns9K9zNtsn61XKtPJnvVse9EaYvPs1p43Q2CWz006svp0yeTTvpttfS2ScC DgdPJGbsIOeqDD/7fRhnXNMfDRv21cgtyAeJELw7GG8ZCPBnHC1RIi72EpOGxF69oohF97 QZuD39CRJWbNZoJWpHXGYns8jI6x6SNeqwBAuTVH/h9+zN4yQVt7u3MnCUpd5Z+ICMoQqD kP1Ot43+Tr/u9bBZzHN+SOF9LZ4sAkWUnHZnU/hFeFNOYUxa2dfrcZCTmzja+d9t+HeRiP JWl5n5qyWzByZ9M+09DrAzTaN5E6YiAairQHw+yuKBJZrlw8Dxj5rQcmjnhzCA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1669310801; a=rsa-sha256; cv=none; b=E778IQCF2BRUuQvmqbSkOgHcfj7VXMyNovUxzeciZ1FVBzWdDnBlxN/caXckUJ5nCRPgtB BoUyQ24KLWHfP6kWTUBAZfuqNuIPl+7DFpybKnqpfAXlDcGQD2jwOs0vG0xQUcLT4airTr iXo0RSstSLFokTWLWjyx+G0OfGtJL0KS9pkLwjL+IJjuBWroHtMh9hnWIyLIMIfPzsBydw soRUpCOf0ieBhq40u2TGVvWJxNb2dsW8Tgvdy8FMus9wdCRpyqN8VI8O1lDzGoLsl5OZm7 hMTlmoXY17mgXbnCarKytvdwYZnRjbU2qFipaTvNY29VpQ2q7lyDlblZV2YYSg== 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 4NJ4fm6pMkz18qy; Thu, 24 Nov 2022 17:26:40 +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 2AOHQeWT008861; Thu, 24 Nov 2022 17:26:40 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2AOHQe99008860; Thu, 24 Nov 2022 17:26:40 GMT (envelope-from git) Date: Thu, 24 Nov 2022 17:26:40 GMT Message-Id: <202211241726.2AOHQe99008860@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: d7e8666ffb99 - main - heimdal: The version string must always contain a terminating NUL List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-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: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: d7e8666ffb9967a92709a2d2ded4d31568ab1473 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by cy: URL: https://cgit.FreeBSD.org/src/commit/?id=d7e8666ffb9967a92709a2d2ded4d31568ab1473 commit d7e8666ffb9967a92709a2d2ded4d31568ab1473 Author: Cy Schubert AuthorDate: 2022-11-21 15:33:08 +0000 Commit: Cy Schubert CommitDate: 2022-11-24 17:21:13 +0000 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 MFC after: 3 days Differential Revision: https://reviews.freebsd.org/D37471 --- crypto/heimdal/lib/krb5/recvauth.c | 26 ++++++++++++++++---------- 1 file changed, 16 insertions(+), 10 deletions(-) diff --git a/crypto/heimdal/lib/krb5/recvauth.c b/crypto/heimdal/lib/krb5/recvauth.c index 78e98a10fc1b..b63b28628395 100644 --- a/crypto/heimdal/lib/krb5/recvauth.c +++ b/crypto/heimdal/lib/krb5/recvauth.c @@ -75,7 +75,7 @@ krb5_recvauth_match_version(krb5_context context, 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; @@ -139,15 +139,21 @@ krb5_recvauth_match_version(krb5_context context, N_("malloc: out of memory", "")); return ENOMEM; } - 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 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 version (%s)", ""), + her_appl_version); + free (her_appl_version); + return KRB5_SENDAUTH_BADAPPLVERS; + } } free (her_appl_version);