From nobody Wed Oct 14 16:04:30 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 4j4bcZ70B3z6vmXt for ; Wed, 14 Oct 2026 16:04:30 +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 4j4bcZ413dz4bVr for ; Wed, 14 Oct 2026 16:04:30 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1791993870; 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=iV1guunulKoxJ6OJPH2pXxh0oo3TFNNKhROIkTpau64=; b=GW59d5p9xGZShT0aKDBZIE49YbI1R9ErcFBG28Zs8hQNe1RVKI66q02EYLAkHPHUgLELJ8 cxLAfBVzMDit/l6GcT4F/WGDsdRjqreQ1SgQIZc/z03J1Eis019h4IcBUe17mpmcgiZ1Nq 6QbVhzFx5M+FkhzDAO+1hTJiO7QXVyGhdOXGKL1JZMyhLgmK9uycNXy02whS+L9CQvRuUx DsBDZqVJ5igvQs+/Ri5EFlfrf5Qt0mKzrjdRed16mc8mnJTFT9sYFIN3fSUQMlaxwOykd6 nPLqTqnCxpVobfZTrjVRE1iFriApnxGhfCWY5E32+X5wHflHCLbwKib/q9xYuA== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1791993870; b=a8DqQqdXhKngMoC8mnzd1yWX+x/A/bz78nlYJy2yi+hgpwbkIxExv9Gyfx+oQTmF7Ul4Vn CGrh8iXARuothnQrPoBatLCrek/mZ2acWs3cJELDbHPP0HCZGTT7agTAE10xlnHLMle4CH e1HDFu0MjmJ6RaEb4F3P4khxKcBExZH8rq320Se8w6q06lkJsNSEyXPrk6lbDWezNkyKBB 2JP7XRMeSospJT5Z9Dh4I5Loyb8bj9Kx+lsDfO6FaSyOp5kY4nXyxN8/HyK55dGz6ea7Vh eznq5nI7TXXmuAVBAEK3pdnsP5d78cBDJT4xQvEcBAesAFFSAC2tZYcOWdr45A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1791993870; 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=iV1guunulKoxJ6OJPH2pXxh0oo3TFNNKhROIkTpau64=; b=GBcYEaL8kcQXvUb1HyvVWqeqht7xBlykHUhYZliQU2zxBCSMwcFUjgse1q5wFD3pIH5q3s 6jZQyI/JFQ7QhTBFdPOtLtjc5cvAF1vhnbn28ALN+PwO6D2WYRiiiG4dstyvr0fKi1GxCq bTROjb5dOPD7DFe9GZNeCSJR+aBSDBCYv/yPGUaRfp9Ej6sE3sahK7aPZ7lpjQs8EqqpaP SzObIyeKcsg2OC8GdFUQ9O52C26RKK+Dewww6WpRTF1z2SkEtZsI3Kpl2ti7QgBg9WfC5B L9Lt31C8mhwTZzWhN8Y3VEn4pda9dZue6UVbdXuwyd70mjpZdhwZlIC9e5Wkog== 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 4j4bcZ34nLz18Th for ; Wed, 14 Oct 2026 16:04:30 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 27454 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 14 Oct 2026 16:04:30 +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: ddbf289ac125 - releng/15.1 - 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/15.1 X-Git-Reftype: branch X-Git-Commit: ddbf289ac125447c1bcccf784a05f263d8676186 Auto-Submitted: auto-generated Date: Wed, 14 Oct 2026 16:04:30 +0000 Message-Id: <6acfa80e.27454.5172b960@gitrepo.freebsd.org> The branch releng/15.1 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=ddbf289ac125447c1bcccf784a05f263d8676186 commit ddbf289ac125447c1bcccf784a05f263d8676186 Author: Glen Barber AuthorDate: 2026-09-03 07:51:28 +0000 Commit: Mark Johnston CommitDate: 2026-10-13 14:10:21 +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 2581bc3af3815e92b0eef44bee224fff92931de8) --- 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;