From nobody Wed Oct 14 16:03:48 2026 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 4j4bbn0MCjz6vmQH for ; Wed, 14 Oct 2026 16:03:49 +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 "YR2" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4j4bbm63qcz4ZXb for ; Wed, 14 Oct 2026 16:03:48 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1791993828; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=zHCos9RIBdWVUt7GLkySvwoKM7voguj/WAfwk0Ct/IU=; b=ETJK4YKmDarNpo/JLnVoTVVfZkOsvmknNuYmnAc5zmG0lDMMnX8+jVlgbBjyYkpaNmSlDN DrcmiFXxcijyPiqqpiMZsK+uWDAqTfbQhz5tCHx7vcFJZcgJrsjbe8OAlvnf6Yg8wPEI3Y C7d0lR5q/Ue9gNFPM9dtAgWNIiJutTxZW7qvTOlES1Ziv0rbDjPqhIabLn3sK5do0m4D7I GFgLYnk0y2ck0NPOWpXdzJvI0VqkFeqdxQKAw0dJZagTu2TcJsbaILeHoqzojv40iu0js+ 4Rz1bRyurzZ23JwMVv8QB55/PaN7HQBbLr1JObjJTF0zWh3OqLFIHbaEZtXzEQ== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1791993828; b=GBY44aFpUlKouERKxdK71cQbk0baK1uZWqEnOg7yFdaFt8qKS19Izni6I0GaQdcZFNtBcU T0Z+N3KMhhxRn7u+XJe0QEdmaMRF6XlC1KVBEZBGXwEEoVCWtxidrf4WcCIyqgucqakPoC KvxVa02UvhldbOU+IMVn4YvR1qYARklOIeQMIE70v+udLx8/9fBzGAOmaGh0/u2p4PmmNV caOpX4BXx3uLY5TXRBB0AWl5RWBe1gJYclfIXskRqvZpy1/pkaso6oiY401hUyUWX5jPVB 9NLEHW8ghyZJoJy9uUE83TE0rcJZ/NoXsN9Rscjz/1U/8W5GWNbx6FAhhcohug== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1791993828; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=zHCos9RIBdWVUt7GLkySvwoKM7voguj/WAfwk0Ct/IU=; b=jr4J56tIRIW4CxTsYl77DRo/x2hXQVIl1PrC8PYorK2EPEqPH47ZZgdVr1+9NtxC0vwoDG U//1tCRoPBfXWj2t6AOhNug/aXV1LunV+b1XwglwtHHvfg2NgvQPdqiDQBM6hULuI2/GnL lSL/tNwc2k28mNpZPYPyuFa9C13OPOqz3rVEbpA1bWir7NNUBkEvS5PrmuxpAPLiioRpnf omy1hnfT16OOeyHNHzu8ZgjqztDoTbClevF2/iV7wrUVKorislXub3yWCf6XmzK1WC4fuq nNcjY+B8JjrzNdkjFnOIeE/kHR5NAXwvBFrhm+T2h6sFHld9zBMVlYWNiuSb+w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4j4bbm4zHxz18Qv for ; Wed, 14 Oct 2026 16:03:48 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 30020 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 14 Oct 2026 16:03:48 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Glen Barber From: Mark Johnston Subject: git: a6ccb9d6905b - releng/14.4 - hastd: Fix crash on empty message List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: Commit messages for all branches of the src repository List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/releng/14.4 X-Git-Reftype: branch X-Git-Commit: a6ccb9d6905beabbfccb18b01d454695b496deea Auto-Submitted: auto-generated Date: Wed, 14 Oct 2026 16:03:48 +0000 Message-Id: <6acfa7e4.30020.44c0b9bb@gitrepo.freebsd.org> The branch releng/14.4 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=a6ccb9d6905beabbfccb18b01d454695b496deea commit a6ccb9d6905beabbfccb18b01d454695b496deea Author: Glen Barber AuthorDate: 2026-09-03 07:51:28 +0000 Commit: Mark Johnston CommitDate: 2026-10-13 13:47:11 +0000 hastd: Fix crash on empty message A HAST message can be empty, in which case ebuf_add_tail() does nothing and ebuf_data() returns NULL because the size of the ebuf is zero, but hast_proto_recv_hdr() asserts that the return value is not NULL, resulting in an immediate crash if hastctl or hastd receive an empty message. This is trivially reproducable by running `hastctl status` or `hastctl role init` (as the rc script does prior to stopping hastd). To avoid this, don't try to grow the ebuf or receive additional data if the header size is zero. Approved by: so Security: FreeBSD-EN-26:26.hastd PR: 298085 MFC after: 3 days Reviewed by: kevans, gjb Differential Revision: https://reviews.freebsd.org/D59306 (cherry picked from commit 8646d65b45339642d4aab1de35a2bc79fc45f09e) (cherry picked from commit 4d83686bc38780405459b45819e9f6482dcd335c) --- sbin/hastd/hast_proto.c | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/sbin/hastd/hast_proto.c b/sbin/hastd/hast_proto.c index d9f231e7b007..fc90bf59dc8a 100644 --- a/sbin/hastd/hast_proto.c +++ b/sbin/hastd/hast_proto.c @@ -150,12 +150,14 @@ hast_proto_recv_hdr(const struct proto_conn *conn, struct nv **nvp) eb = ebuf_alloc(hdr.size); if (eb == NULL) goto fail; - if (ebuf_add_tail(eb, NULL, hdr.size) == -1) - goto fail; - hptr = ebuf_data(eb, NULL); - PJDLOG_ASSERT(hptr != NULL); - if (proto_recv(conn, hptr, hdr.size) == -1) - goto fail; + if (hdr.size > 0) { + if (ebuf_add_tail(eb, NULL, hdr.size) == -1) + goto fail; + hptr = ebuf_data(eb, NULL); + PJDLOG_ASSERT(hptr != NULL); + if (proto_recv(conn, hptr, hdr.size) == -1) + goto fail; + } nv = nv_ntoh(eb); if (nv == NULL) goto fail;