From nobody Fri Dec 09 14:12:57 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 4NTCfK470qz4jP2B; Fri, 9 Dec 2022 14:12:57 +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 4NTCfK3Kngz47YZ; Fri, 9 Dec 2022 14:12:57 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1670595177; 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=yvEX/ID6ZZRgpDaf4nH2PwwSsvyHQJlkQMDfhxeMwLc=; b=R8iTWf3vKsz0idUAhDHLca6HIwMCQnns/JGKDhojDN0Dsd+3LpIIM49LCWSAeZPLnlXnQi kDebKUxoz+K4Q/on1zTnu1jK5kg/lP9lFm4gbpYVSn2YaG/fYNP6VqvXxea5PqBatHMngP 9OZQM2bbMR1rih4+Vtx6ns18dc6GVoWsVlvN1OwDm2Esxp8W0dAlWTFFDdRRs2HBBhpLIR XxyTczCn9krr+H/CCmcjiAp6HUfWHbfviard34i8qelTsR5ufVgSOagI9Jjyo0UoPyw1rl Xa+ugFWBL5ODhQ2ngwjqvhJ+Ude01CmehgbWyKLAXoz9/w2NZRYGXK2nobXZMA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1670595177; 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=yvEX/ID6ZZRgpDaf4nH2PwwSsvyHQJlkQMDfhxeMwLc=; b=HRVJ39xHXnN8Xw2ofj3UBmX/r1gx/2OSQDU0uVBAJuxBlopuECw844UlyLsd1eUa28duXy S4ixCPAGw/PuBtX1TOupqmxiAw4+5hSDOfmbT1Y/lqiQOQRrz3Yp1gvxc73UnroUa9XjxA 0CvLvy/+wEPoxlq6zJU+x5M7HpKhSq4rOY1y00RQXh6tQQvbLelL4/88wJrB1hveCt4dsM XvXixbjl1vVwDQrMuFoqQR9dg2wmx5vwD5eHw2ryPs72vqC8EIzZALTYZ+TKbGhPDRDXzT RuwZLxXHR6O8IGmijX2ZZDsSGP7FB6QrexB8dDGz8wV5Et4W3rpyIonqOZVQ5g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1670595177; a=rsa-sha256; cv=none; b=DTe/eyjVmZph1GSim8Y6qal3/l4DvcHKSeR4bxlbwFb4tiGC5NTmG1d2HKhLWXQ5zSiDpQ 74DMU3PgyQV/9LHVFLltgnjRZAs/SHrCKBIiKfDaC588mBjB7wEUTnTAaVLWW054Sh57rn SJKfrLVM4lCdiOTkOsdsHEhqX4nJZrLgyAmlZM4SuFVFwxOf/Ttsqlp0jwvs9/pzWbJ90h ULEzBJDCjDxVo4QNa2fMEmhj4Y77n/Rp7yF4FLOa/TltsplB4FsEEXvi2Kr4ZiEyDUNclf /SgbMYEPt7XAI46SHjkhJEerZjoTuGKiChbjQ1N8d3gzhUYWHr+CQWka4vZv6Q== 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 4NTCfK2PMyzdXd; Fri, 9 Dec 2022 14:12:57 +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 2B9ECvmQ058198; Fri, 9 Dec 2022 14:12:57 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2B9ECvlo058197; Fri, 9 Dec 2022 14:12:57 GMT (envelope-from git) Date: Fri, 9 Dec 2022 14:12:57 GMT Message-Id: <202212091412.2B9ECvlo058197@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: 09072186eec1 - stable/13 - Revert "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: 09072186eec1854f2a66cd1be441adcbe331c357 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by cy: URL: https://cgit.FreeBSD.org/src/commit/?id=09072186eec1854f2a66cd1be441adcbe331c357 commit 09072186eec1854f2a66cd1be441adcbe331c357 Author: Cy Schubert AuthorDate: 2022-12-08 16:08:50 +0000 Commit: Cy Schubert CommitDate: 2022-12-09 14:12:51 +0000 Revert "heimdal: Fix bus fault when zero-length request received" This is the wrong fix for PR/268062. This reverts commit 6742ff42ab3b6e65239f975314060b1393e22d62. (cherry picked from commit 5319949668a5cb4d182d7252ce26799506b3585d) --- crypto/heimdal/lib/krb5/read_message.c | 5 ----- 1 file changed, 5 deletions(-) diff --git a/crypto/heimdal/lib/krb5/read_message.c b/crypto/heimdal/lib/krb5/read_message.c index e994b0f09133..4e9bd012dd67 100644 --- a/crypto/heimdal/lib/krb5/read_message.c +++ b/crypto/heimdal/lib/krb5/read_message.c @@ -55,11 +55,6 @@ 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);