From nobody Wed Oct 14 16:04:32 2026 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 4j4bcd2f4wz6vmck for ; Wed, 14 Oct 2026 16:04:33 +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 4j4bcc5mX0z4bvD for ; Wed, 14 Oct 2026 16:04:32 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1791993872; 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=T9bluKbYd1IeL+9WlBRR4bQFmIKJS9QB7eizrJvp+hU=; b=bBy5ud3lKyGjRSZIN16wPf1yg+C03SxAvrjgt4vsVekZkxaUs+I4q6pOAogDEJpwVjcxfS iLMPGNyBVaGktcwEt9kDoBCccTepOUAmfvXHom9cIF6qWuhleElNe4k7zyttzrn57HTMMM vSN8lRnRM64UEt91vn/aW16xcOxlPC4qSMd/eaTcBR8Nvqz0o8mp2ompYrGYkbtldjJdh4 q74x/4rbNQR6Hm5NWK9KxsAnAMlPjM+xooEW7e0PcOkUqJwEs6MfNShwxCJ+pXJrP4qgyT 6eQ00xuP1DEChtvruAQBzEjGgynP4ZBkK4IivaECue/4WD/y0AxHg64gxGXomg== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1791993872; b=x4eLVZ3eVpSVDel1SrrU+/ggLib4UPo/WSxWKm/erDVTTd2j/KKNk2GdaAeq52fYxVNRnB Gl6fR9Lgv7IsykQPxlYWnhZhD7P8zLjzhKuq/RdOtpI5Bdd4t/hotqTN1SDheko4tNG/2q VY8WQz+5rRsDICwKerjlnFP8b9/FkjB1MjuOpa1a1hJ3ODXLgisMB5E6EIm6s78POhIhEW IkZBtHb/s/xXjp0Pbd5yXMtyyNf4lR7rgdrG/f1dyBlXYGRFKlbQnBCCHxO/Jrh3ueFKZy Z25as3lWHld6uCAi9f580qDF/Z66gDwFe7n6S7xY8CMgoPbCtolZ4nM3pZD59w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1791993872; 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=T9bluKbYd1IeL+9WlBRR4bQFmIKJS9QB7eizrJvp+hU=; b=k7IIV68ZTyDn2sMPz2v/mWMudPhJzdjdm1CzZUt1VozWwDMuHUaV0LX3tOxWYoYZ6YC5Fz t7LN5nX0m7rTD+geoikzApi3nmvO6QhWPWlRBAuzH59oHkNqkmEjVkq7XYqY/uWCmAGs/C 9FaKMf2jG/uZy9zEeSVoSw4Pu6L2IfxVp2HOZ1vOb3H1sGYX2hnl+cklp8VethvnsZSew7 m931x7T9uwJ4nSUf8M2Aq4A4e8KZpeOZ3pHHhz9hMjit4IUtnKeQX21cgCRdP6CHOBEN1Q 5XfwR+HCPYP645v4qOGVJBoBu9j0sofI2SgP1DgdGQijdO3N6d7av0fHTmznzA== 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 4j4bcc4lJpz18Wr for ; Wed, 14 Oct 2026 16:04:32 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 2755f by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 14 Oct 2026 16:04:32 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Dag-Erling=?utf-8?Q? Sm=C3=B8rg?=rav From: Mark Johnston Subject: git: c8fe55b4726a - releng/15.1 - hastd: Use fixed-length protocol names List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org List-Id: Commits to the stable branches of the FreeBSD 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: c8fe55b4726ae56ceaa6d0828403780dcef72c54 Auto-Submitted: auto-generated Date: Wed, 14 Oct 2026 16:04:32 +0000 Message-Id: <6acfa810.2755f.58ab4a74@gitrepo.freebsd.org> The branch releng/15.1 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=c8fe55b4726ae56ceaa6d0828403780dcef72c54 commit c8fe55b4726ae56ceaa6d0828403780dcef72c54 Author: Dag-Erling Smørgrav AuthorDate: 2026-09-08 20:55:15 +0000 Commit: Mark Johnston CommitDate: 2026-10-13 14:10:21 +0000 hastd: Use fixed-length protocol names All communication between hastd nodes and internally between hastd and its worker children passes through the same pair of send / receive functions. The receive function uses recv(2) with the MSG_WAITALL flag, which in theory means we should never get a short read. However, when handing off a socket to a worker child, we also pass a variable-length string identifying the type of socket we're passing, and reading this string relies on a short read. This used to work because the arrival of the descriptor would interrupt the recv(2) call, but this bug was fixed when the AF_UNIX code was rewritten a while ago and hastd has been broken ever since. Fixing the length of the protocol name to four characters including the terminating null solves the short-read bug by never requiring a short read (nothing else in hastd requires one). Note that this issue appears to have been reported independently first by Alessandro Sagratini in PR 292322 and then by Martin Vidovic in D57511. I ended up going in a different direction than Martin's patch, but his analysis was invaluable, hence the double credit below. Approved by: so Security: FreeBSD-EN-26:26.hastd PR: 292322 Reported by: Martin Vidovic MFC after: 1 week Event: EuroBSDcon DevSummit 2026 Reviewed by: xtronom_gmail.com, kevans, glebius, gjb Differential Revision: https://reviews.freebsd.org/D59521 (cherry picked from commit b7e5c2e008f5b441611830ad3a0329de0882419e) (cherry picked from commit cd8eef45d2d0296afe0226bde587f52eb0404516) --- sbin/hastd/proto.c | 15 +++++---------- sbin/hastd/proto_impl.h | 2 +- sbin/hastd/proto_socketpair.c | 2 +- 3 files changed, 7 insertions(+), 12 deletions(-) diff --git a/sbin/hastd/proto.c b/sbin/hastd/proto.c index 70166271a747..56cac566bad0 100644 --- a/sbin/hastd/proto.c +++ b/sbin/hastd/proto.c @@ -281,7 +281,6 @@ proto_recv(const struct proto_conn *conn, void *data, size_t size) int proto_connection_send(const struct proto_conn *conn, struct proto_conn *mconn) { - const char *protoname; int ret, fd; PJDLOG_ASSERT(conn != NULL); @@ -293,11 +292,9 @@ proto_connection_send(const struct proto_conn *conn, struct proto_conn *mconn) PJDLOG_ASSERT(mconn->pc_proto != NULL); fd = proto_descriptor(mconn); PJDLOG_ASSERT(fd >= 0); - protoname = mconn->pc_proto->prt_name; - PJDLOG_ASSERT(protoname != NULL); ret = conn->pc_proto->prt_send(conn->pc_ctx, - (const unsigned char *)protoname, strlen(protoname) + 1, fd); + mconn->pc_proto->prt_name, sizeof(mconn->pc_proto->prt_name), fd); proto_close(mconn); if (ret != 0) { errno = ret; @@ -310,7 +307,7 @@ int proto_connection_recv(const struct proto_conn *conn, bool client, struct proto_conn **newconnp) { - char protoname[128]; + char protoname[sizeof(conn->pc_proto->prt_name)]; struct proto *proto; struct proto_conn *newconn; int ret, fd; @@ -321,10 +318,8 @@ proto_connection_recv(const struct proto_conn *conn, bool client, PJDLOG_ASSERT(conn->pc_proto->prt_recv != NULL); PJDLOG_ASSERT(newconnp != NULL); - bzero(protoname, sizeof(protoname)); - - ret = conn->pc_proto->prt_recv(conn->pc_ctx, (unsigned char *)protoname, - sizeof(protoname) - 1, &fd); + ret = conn->pc_proto->prt_recv(conn->pc_ctx, protoname, + sizeof(protoname), &fd); if (ret != 0) { errno = ret; return (-1); @@ -333,7 +328,7 @@ proto_connection_recv(const struct proto_conn *conn, bool client, PJDLOG_ASSERT(fd >= 0); TAILQ_FOREACH(proto, &protos, prt_next) { - if (strcmp(proto->prt_name, protoname) == 0) + if (memcmp(proto->prt_name, protoname, sizeof(protoname)) == 0) break; } if (proto == NULL) { diff --git a/sbin/hastd/proto_impl.h b/sbin/hastd/proto_impl.h index 0a0074545f38..181a4cd4a17d 100644 --- a/sbin/hastd/proto_impl.h +++ b/sbin/hastd/proto_impl.h @@ -53,7 +53,7 @@ typedef void prt_remote_address_t(const void *, char *, size_t); typedef void prt_close_t(void *); struct proto { - const char *prt_name; + char prt_name[4]; prt_client_t *prt_client; prt_connect_t *prt_connect; prt_connect_wait_t *prt_connect_wait; diff --git a/sbin/hastd/proto_socketpair.c b/sbin/hastd/proto_socketpair.c index 59ac9553ff6e..31b657f17c32 100644 --- a/sbin/hastd/proto_socketpair.c +++ b/sbin/hastd/proto_socketpair.c @@ -219,7 +219,7 @@ sp_close(void *ctx) } static struct proto sp_proto = { - .prt_name = "socketpair", + .prt_name = "skp", .prt_client = sp_client, .prt_send = sp_send, .prt_recv = sp_recv,