From nobody Fri Dec 9 14:13:22 2022 X-Original-To: dev-commits-src-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 4NTCfp5R5qz4jP5C; Fri, 9 Dec 2022 14:13:22 +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 4NTCfp4wGgz481l; Fri, 9 Dec 2022 14:13:22 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1670595202; 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=eL/eSGfWv+KYMX9B+/+JrVtyFxluJ2Z3bG6xJYTz3Ek=; b=VBw+Y9nj9jmXsgsZBNEei3JZ4/NSbH5kFWdwDqSUcnDVTDVMEnc0qepVmpAzSyMST0fwDp WR04jdFnu9yf+CM2PEgryvWHO2+yw9w5EhQNWH/BaN3F0Fxv4gnH3i0TOHy33ivvNudDBt gvR5LahkJKAWSSkaQhw9YBifoqW6qhOU2CTfPK/D3COJkVL/ODR7y5UeQ50rT4XECSkFkk bgN6I+oYNPH5OMcPqzmBs3DQpa7w3+hua2EdyyaIpE/QmtWx5dnmJiiniwr6ic5U9/1b0o yRQ7AltXpfRDqYA3KrHoBgOxFk9V+XL9bsfLCI0MoOLTmd0yBfSwVB15m/mCZg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1670595202; 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=eL/eSGfWv+KYMX9B+/+JrVtyFxluJ2Z3bG6xJYTz3Ek=; b=tTRaaLEXJeHTRQYq+uunuwcgVobfh2p7w33YeBQTShai9x7C03cTyPAso8LcX696y6A4Ga K0/7L76UAz7ZCxXyW5ahZJKGYVZntPe2SS+SRGs5EZFvx7zoOJ97bscVOcdaJimnyP1GEO IDX32n2JQHURG860clE70lf8LJQuuUEpTC4eoFAapKekhkNedi7Ek+SA9mzK/1Xx7kWXIS F/IuFO1aA8QFbgnpcWO92X3Cx5ynyqJG7ZjBYcsFz/N/yCFHzoaZzfJTt9iwaMBn04eT51 iL0KD7wQnp2391WGjigM49MFjngW/igyN5kNXmSUPnNs2MyHv5zv7iLUKvX58Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1670595202; a=rsa-sha256; cv=none; b=p9MfptZv4+IeefLXk8AMjD0NFr72N1cmyvbM6KSJZuZXnz2RtzgCaFL69tRXI7Z7KPv9rt oVwK4ajo0HJC+LIYf3aJYDPM5y8CQmOjeNMjlOGrkVvaMXaNn5Jx2VwR2OwR8fJ2N9xKUh JxD/nSLK69rgaptaJapKrfkQO7nOHkvW40wa5l4XlBDCsOnuQK0LXVY6Gs26rHimkojhSe 0OV2PrHAhPX0kie+Mz3wGo1YOlqtopeNWTNkqvtXyNFBr8iWIR6ysz3SnNnmHosKvgcIrN wJaOxhelDPBPCOgmdd4WQvgDLM7vunjHl9Ll42RNf+T69OC0H9NA8srGav03dQ== 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 4NTCfp3zR4zf2d; Fri, 9 Dec 2022 14:13:22 +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 2B9EDMNn058360; Fri, 9 Dec 2022 14:13:22 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2B9EDMDa058359; Fri, 9 Dec 2022 14:13:22 GMT (envelope-from git) Date: Fri, 9 Dec 2022 14:13:22 GMT Message-Id: <202212091413.2B9EDMDa058359@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: 4ed9d88da492 - stable/12 - Revert "heimdal: Fix bus fault when zero-length request received" List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-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: src X-Git-Refname: refs/heads/stable/12 X-Git-Reftype: branch X-Git-Commit: 4ed9d88da4923be646a98f471323ee3b7a080e4e Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/12 has been updated by cy: URL: https://cgit.FreeBSD.org/src/commit/?id=4ed9d88da4923be646a98f471323ee3b7a080e4e commit 4ed9d88da4923be646a98f471323ee3b7a080e4e Author: Cy Schubert AuthorDate: 2022-12-08 16:08:50 +0000 Commit: Cy Schubert CommitDate: 2022-12-09 14:13:09 +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);