From nobody Wed Oct 14 16:04:06 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 4j4bc66X0hz6vmZ8 for ; Wed, 14 Oct 2026 16:04:06 +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 4j4bc64jxCz4b2g for ; Wed, 14 Oct 2026 16:04:06 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1791993846; 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=nBND6qSk+bVLgzGEI1ENcPcpcV+1eNau23AgZhSzMr4=; b=XHK3RTEvaTuR+TuOOFfC07pA8l0nc4wFIDPnoilbzkIKtFHHa04bVlTX5xhwht73JGd9va VfmoDoZMBIlH0KysXdjY48VO66kmxSYfaw84j8C5Mt4AKJdnuxxbwzEKl9eCRgazi6gJVX A/2p3WYkVYUZDa55jcFjdt9uFbVRK5/b7Y3dqWT1IhiZ0vL3W1f5HADPOx0rwA11DjCZ0g i2tZNzR9bIW9jwerNFSeErZzNjpp3EJBO3Kowa4oMEiXF/+yO6nhQGIY9h7MbKZnWM3H/s 920CxUYBwb9nHOR9jHyXZq0+4z5fNt93mJ+wCBP8EpvL4XKtSFjV0yQnbvqUZw== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1791993846; b=ApoixYY0Q/C+JxxW6WwZ7AVSeWuXndXBusf6tIXyK8f//5c9uK+4oXhdOymus01+BU4CYG zDMsiwz0YkcKx9sUvu2zi0M12OiBm7VUP/+DWPa425MupXIpKMX4vcPqqSah8zbiFuDDBh M0MEhcUovQHsycML6bfli7lND7j5gEVMHTCNXdnefSg0BqsXES4yQnYPbqIExZnBeyV2Vo 1IZ8mgxtjRHxyDoZ9UvGGS3HLZ89jmgdJLoFLkzodPcftTdmwWk0rsyYUqoNdQq0MixNgt KAs40UXzyghs5Ovs5q8CPXP7unB76Eehlk7vtxONl/gwh2OLOYYzHNxPv8qe4w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1791993846; 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=nBND6qSk+bVLgzGEI1ENcPcpcV+1eNau23AgZhSzMr4=; b=oIxKb4az0PUVqcmPaoNSC0Ht0UkTlvXV41dmomQAihaAStHX2aG88/+0rbKCCahXCifbtS ZDs3I1/4n5Ag8+50hDnu2uhl5IkpWpgeuFrayzSZKzHodA3tayWVYA8ejtxLqdHtHKwGwK JPCkpb3yw6D400rdpAeN940VPZSRNXTM7bvc8GLGgahRYCCxKFXWTtfDHElOHHw1CW/t2B RLs7qZcn/8Bhjsu0vujBhhPC7W2Zo9k/Nh9upDbX+9qS1pWKtm4kvMn69a+8hek0ETYmE8 YpqhTtONrSpvBOuvo+9KxSNVK4iA6Am+d1zqFr5Y7TPT+GuCfr3uR94W8b+6zg== 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 4j4bc63hBcz18TZ for ; Wed, 14 Oct 2026 16:04:06 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 308e6 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 14 Oct 2026 16:04:06 +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: 3d10f8cdb001 - releng/14.5 - 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.5 X-Git-Reftype: branch X-Git-Commit: 3d10f8cdb001655ba0638c933820abbd0130c1eb Auto-Submitted: auto-generated Date: Wed, 14 Oct 2026 16:04:06 +0000 Message-Id: <6acfa7f6.308e6.1e4382b6@gitrepo.freebsd.org> The branch releng/14.5 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=3d10f8cdb001655ba0638c933820abbd0130c1eb commit 3d10f8cdb001655ba0638c933820abbd0130c1eb Author: Glen Barber AuthorDate: 2026-09-03 07:51:28 +0000 Commit: Mark Johnston CommitDate: 2026-10-13 14:03:00 +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;