From nobody Mon Dec 5 21:50:35 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 4NQy0D1m3Sz4jdsr; Mon, 5 Dec 2022 21:50:36 +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 4NQy0D0fh7z3sr8; Mon, 5 Dec 2022 21:50:36 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1670277036; 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=QO9t05QXEHKkXZfue/QuU1Dr0FnlOb4NQm7nc7ifMDg=; b=drCRHNH4NVYGepE/CJb0ophVIEcTOz6kRE/iirvLeGCMSJqzu8s5/kFuxoGKU1T0O1dciR l1W07IH/XhvAh0HllRvCJIaD9Fv851Xr/+a96cLeZ0Qv4sAyQ+0FHxZz8dR7nNkcDt/m07 WwL/SprvRKGlGaLIxG/AMOajw/SZITPFCTvVWH4VD46en9VzO2vSUl0FGirbOgCi+5nmBb r7Zdh63z5fVTJgGhpI4V1Va9bc3r2C1mxlY5+588j6jX706XnpuUJrb8lFELYvcdUuURSl f7qIFR7nWmo9UcceDTc9UizjdKmCFigMMFoyVvfhLecTEoNJIs1igltNu+UWoQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1670277036; 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=QO9t05QXEHKkXZfue/QuU1Dr0FnlOb4NQm7nc7ifMDg=; b=L5HsA38TkUAh5WzeIrMgMFMa4uXPzkY1FQbHWhaZOVjltrkru8Wzg7i/dHbkxddxF6uey5 meg+AwRlyIMkTA+gXDK6LsR5HluXu6fdw7KIUre0EPpsi25eueTDVsjyjVW7HFOpAruoO6 VFeAxNYXmxeoUk3zeo1phLU9Siv32em9hex3YhuLRuReu7biuQWR9ocf7y7I9zqkznzFlp bHEL0hFJfGejnH9PHHbmtnN2TceYnOgZmpTTGFClTrbrEccSH5L9JBv6UdxDOrg2l3xUfd zoyf5K/ZwtejZhxZRvW3/I3x0VDA2vhwwkNzUkSx49FR3+WvqQqfRTTAI9hE0w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1670277036; a=rsa-sha256; cv=none; b=wM+hiLjlRGseSLN33EPmtbVVLY86Lx1CIn/CoOvPAzbDHxKY+xmyuArX8FhdP6a2kPfOYY aFX3QfIzD0XtZc1Yb9EAMhK1Fitnr7u3ED3jvmKPFTT07t/htriL5EQbGY2/lOlQSEB3oz hS/SCPuwYDBH1UhR7+kDMSuVv2fccFl2MWX7U+0840kMrfDI62i2AwWIenePuMKXhaYWuW LvSZ3c9ZKnXbhZOZuTh0L9NMBOxAac8YFQ1qoii6i2w4+awS4jekBSyt1DrTu2ZWD9OEoz lnxtlCuGU6SpqCPboRv8PFXoHYWNgDvey+84N3C/f/aPSDZimK5LVL+0Odj2Hg== 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 4NQy0C6p4lz1CZh; Mon, 5 Dec 2022 21:50:35 +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 2B5LoZUD093065; Mon, 5 Dec 2022 21:50:35 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2B5LoZwt093064; Mon, 5 Dec 2022 21:50:35 GMT (envelope-from git) Date: Mon, 5 Dec 2022 21:50:35 GMT Message-Id: <202212052150.2B5LoZwt093064@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Cy Schubert Subject: git: 95240a65fb18 - stable/13 - heimdal: Fix bus fault when zero-length request received 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/stable/13 X-Git-Reftype: branch X-Git-Commit: 95240a65fb18985378988d5077fbac43fba30c5c Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by cy: URL: https://cgit.FreeBSD.org/src/commit/?id=95240a65fb18985378988d5077fbac43fba30c5c commit 95240a65fb18985378988d5077fbac43fba30c5c Author: Cy Schubert AuthorDate: 2022-12-01 00:11:18 +0000 Commit: Cy Schubert CommitDate: 2022-12-05 21:50:28 +0000 heimdal: Fix bus fault when zero-length request received Zero length client requests result in a bus fault when attempting to free malloc()ed pointers within the requests softc. Return an error when the request is zero length. PR: 268062 Reported by: Robert Morris (cherry picked from commit 6742ff42ab3b6e65239f975314060b1393e22d62) --- crypto/heimdal/lib/krb5/read_message.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/crypto/heimdal/lib/krb5/read_message.c b/crypto/heimdal/lib/krb5/read_message.c index 4e9bd012dd67..e994b0f09133 100644 --- a/crypto/heimdal/lib/krb5/read_message.c +++ b/crypto/heimdal/lib/krb5/read_message.c @@ -55,6 +55,11 @@ krb5_read_message (krb5_context context, return HEIM_ERR_EOF; } len = (buf[0] << 24) | (buf[1] << 16) | (buf[2] << 8) | buf[3]; + if (len == 0) { + krb5_clear_error_message(context); + return HEIM_ERR_EOF; + } + ret = krb5_data_alloc (data, len); if (ret) { krb5_clear_error_message(context);