From nobody Mon May 11 08:41:52 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 4gDY9r2VKrz6cPV2 for ; Mon, 11 May 2026 08:41:52 +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 "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gDY9r20wWz4NxD for ; Mon, 11 May 2026 08:41:52 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778488912; 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=C+Z0asD0XWEtgPgxEylElyv3+DBapbcYMNaLI/sVgd4=; b=dckyk+vkol3WMzEiI7EzztPNBrwQFZQLZh28YAT2YA42Me5yODEGWcJ/XBMiYh8UJ9+UPt e/lsVFDlcsuKLpsnUDMp6mT3Jl/ifsbaHjD5TIeBAjc+IqxsLZ/ghOke2OvA78281UNxBt yM6HYwnq+3/k+6WGKpvv6oyr+/Hfsw5CyHACio/bZcEvWmk9vp+Ee/8ieqt6tkJwKe6v9w c1fNCFRcsGMkYYVnMJJfZMB4ACLfRJJGxdB/oeliw1byIqeN/L1kGwdtkeVo3TVTFdYGQ1 ZZ3n3DuSTh2ogFFkmWY7NpAhR6T+Jg4RZDZivehGQ+qyXLIgdvEtsVTrJMWosw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778488912; a=rsa-sha256; cv=none; b=x4aEU3mvp48RJ3TcRxayD0soAHRu81nXSXdCnnYwRnse/7v/TiSLeHBn4aJPoz8iTdPruJ scEHW0hy1SEruy81OjzVtE9G0wwmU6GUjWu5pXNq3vACQSvKrN/cIP7ow7vduQnl6UChCI tRfnuDXajbKa6GAEp3sLOhYpB162sRBwsrDoQlaKyqEAbnjt1yfrMENACdmnWXH4b9ZpGx XihMn/N/Xx82Y4t+K9+Wr5ATe+N0bGqWN7Zo+/kKM4OCk21CG5HFvWXfW7QCmT+j1rbFyC BG3UUtDSYx4Us0LUKN5QUQu00ll5ykhMUpEqksyyKEi3QnLzWgl2+9bZlzpz9w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778488912; 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=C+Z0asD0XWEtgPgxEylElyv3+DBapbcYMNaLI/sVgd4=; b=DqST8rb/c5izN/Bwoe3hEHWXQfMI3fp4hU5hFHw7Qc845WdudqTBAo4TLZaqyI9HjfgmcY zUDRS3wb+2DSUmvjQBAIThI8j10+05543yGSsg2OQYlgWcze+gjAcooTv7QdvFbtetdy4i w9RtVOeij82GHv8m/Hx5ccmRBQViaJCbnvvvviRnMiANDj+h7JLrj363a2k/08Ssd0tVre 5RSKMZdXMc02TazyK5punk3tYP12aGR9fRzvbKYnhdkZwdSZcGoNGhiHgfnQdR7Ohz4yFR ESZEZsjQga4KGmVnmCywecYDtw0IpVFvVD+Rqbzg9Gji/u2aXQfdmWHZyLLEAA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gDY9r1bQcz17kD for ; Mon, 11 May 2026 08:41:52 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 30d1e by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 11 May 2026 08:41:52 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Wei Hu Subject: git: b0f19adbd5df - stable/14 - Hyper-V: hn: just call vf's ioctl when changing mtu 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: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org List-Id: 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: whu X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: b0f19adbd5df12aee46f00a0c1edbee1600c9712 Auto-Submitted: auto-generated Date: Mon, 11 May 2026 08:41:52 +0000 Message-Id: <6a019650.30d1e.65f5c777@gitrepo.freebsd.org> The branch stable/14 has been updated by whu: URL: https://cgit.FreeBSD.org/src/commit/?id=b0f19adbd5df12aee46f00a0c1edbee1600c9712 commit b0f19adbd5df12aee46f00a0c1edbee1600c9712 Author: Wei Hu AuthorDate: 2025-12-23 04:23:39 +0000 Commit: Wei Hu CommitDate: 2026-05-11 08:28:29 +0000 Hyper-V: hn: just call vf's ioctl when changing mtu When changing mtu, if a vf is attached to the netvsc interface, just calling its ioctl to change vf's mtu is good enough. Tested by: whu MFC after: 3 days Sponsored by: Microsoft (cherry picked from commit 44f656641c238cb3db31026f3e3bef36cd5231a8) --- sys/dev/hyperv/netvsc/if_hn.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/sys/dev/hyperv/netvsc/if_hn.c b/sys/dev/hyperv/netvsc/if_hn.c index 24b0beac8075..937aae05320d 100644 --- a/sys/dev/hyperv/netvsc/if_hn.c +++ b/sys/dev/hyperv/netvsc/if_hn.c @@ -3763,14 +3763,16 @@ hn_ioctl(if_t ifp, u_long cmd, caddr_t data) ifr_vf = *ifr; strlcpy(ifr_vf.ifr_name, if_name(vf_ifp), sizeof(ifr_vf.ifr_name)); - error = ifhwioctl(SIOCSIFMTU,vf_ifp, + error = ifhwioctl(SIOCSIFMTU, vf_ifp, (caddr_t)&ifr_vf, curthread); + HN_UNLOCK(sc); if (error) { - HN_UNLOCK(sc); if_printf(ifp, "%s SIOCSIFMTU %d failed: %d\n", if_name(vf_ifp), ifr->ifr_mtu, error); - break; + } else { + if_setmtu(ifp, ifr->ifr_mtu); } + break; } /* From nobody Mon May 11 08:41:53 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 4gDY9s3r6yz6cfDW for ; Mon, 11 May 2026 08:41:53 +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 "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gDY9s2yfsz4NxG for ; Mon, 11 May 2026 08:41:53 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778488913; 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=SUyjonThgb/O80+MMPV0ram0NquG7vgGezxUcjesrlw=; b=uNgzHnGBrBO0S7u2EEpV2DZ/roE0wKE1OwZ3yRwuz290e3OfRCiB4Fh4QtNhGTQqY1dg2D pE1eOtZ48tNw/4ajJ1A36I2wKcIZ0keRCvE1Oo9vWG3NwI8aFlkPgUxEBYXjsP5fW8A8bA ZfUgRHWJoLi4bmesAmn3JffZsqWcE8OVXN/cFgjdvuXlfALAtkmPnqN51gag1agJSlD+OL VvCUDeCnEBugEPAu5sSHwFt4lFS4QA6ov4U5qsI7LWBCmFdQkQj1Lglw8C9KesO5sBNvIf OR7oa//w/4UuywiUSjNxhRX3gP/RS/Mw1knjI3vRHubjafJXP0CIhwmnwwzvoQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778488913; a=rsa-sha256; cv=none; b=JDT67zQqEvPSfeAfr8PvqEsuuWdY49+eQ3IMv1EGqgpLFTiGtB80JhzoNfstf0sicInvcU FLJvbJ6bR4GQZIm/aMDwPwLqBfyEvbt7hwvVk1dOpOps3WvxAYFFrDgLjUyy4Ckum682Dz xlhsN5EKee5Pp7gaYQNL/5Ccbg2uJ8C8CbfNaFTQtFtQ1WRAY1r34i0Zf0q4IB/qOCRak/ ToEtL+xe1fH5ONDWbCU+HmnJu+xAYAo1GXwHhBg42jwjWLJFo4ikbMvAFZ4Gof5fv64Ggv SxXYQVB1WFmDSn035C9EjjC0MXRX1Zdw3ROUdLPek//+Vb5QB9ZgNcKGCY2vJA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778488913; 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=SUyjonThgb/O80+MMPV0ram0NquG7vgGezxUcjesrlw=; b=N7jxGfsQPO5ZorGf2oY5p72MNLUr5WZTUhDyo4KUP4AVf+9i7FTMD4yaxGweedCc4L2ESf LkpYbJm54WDy+bareAN+eI53wGCTHsXWYBIME5zyRNEAIglrHtw0QC643S7HasfBrQ3mru OrsSKUDDH0edoYQRJM2eyCphgEGzBB0ZJmqxG2DDl7/XoUh//hfU2alW9R6spoPjDLLAvS +o5z3d20XMNb+SQn3gVsNRw9dysppJcAtDc9nT1ju4fkGMEwuJfv/x/3gQps++V4gRWWnt vFnTHGsx5zhtEgOKdZS1znE2kqjH9lR5orILNW+e28g+sGiQ7zNsYQmlamTwow== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gDY9s2MlCz17kG for ; Mon, 11 May 2026 08:41:53 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 30f98 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 11 May 2026 08:41:53 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Wei Hu Subject: git: 97cc6bd98fc4 - stable/14 - mana: support jumbo packet size 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: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org List-Id: 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: whu X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 97cc6bd98fc4b3fe1ec9ee3ba9d5c091d1f0dcb3 Auto-Submitted: auto-generated Date: Mon, 11 May 2026 08:41:53 +0000 Message-Id: <6a019651.30f98.456ae013@gitrepo.freebsd.org> The branch stable/14 has been updated by whu: URL: https://cgit.FreeBSD.org/src/commit/?id=97cc6bd98fc4b3fe1ec9ee3ba9d5c091d1f0dcb3 commit 97cc6bd98fc4b3fe1ec9ee3ba9d5c091d1f0dcb3 Author: Wei Hu AuthorDate: 2025-12-23 07:00:38 +0000 Commit: Wei Hu CommitDate: 2026-05-11 08:29:49 +0000 mana: support jumbo packet size Remove the restriction of up to 4k packet size. Now the driver supports up to MJUM16BYTES size packets as long as hardware supporting it. Tested on VMs in Azure. Tested by: whu MFC after: 1 week Sponsored by: Microsoft (cherry picked from commit d0a2bd2765b365c4be9b17c29306f848953e55a5) --- sys/dev/mana/gdma.h | 6 ++++ sys/dev/mana/mana.h | 11 +++++-- sys/dev/mana/mana_en.c | 79 ++++++++++++++++++++++++++++++++------------------ 3 files changed, 65 insertions(+), 31 deletions(-) diff --git a/sys/dev/mana/gdma.h b/sys/dev/mana/gdma.h index 9e32d58dbfdc..90cd908055af 100644 --- a/sys/dev/mana/gdma.h +++ b/sys/dev/mana/gdma.h @@ -193,6 +193,9 @@ struct gdma_general_req { }; /* HW DATA */ #define GDMA_MESSAGE_V1 1 +#define GDMA_MESSAGE_V2 2 +#define GDMA_MESSAGE_V3 3 +#define GDMA_MESSAGE_V4 4 struct gdma_general_resp { struct gdma_resp_hdr hdr; @@ -409,6 +412,9 @@ struct gdma_context { struct gdma_resource msix_resource; struct gdma_irq_context *irq_contexts; + /* L2 MTU */ + uint16_t adapter_mtu; + /* This maps a CQ index to the queue structure. */ unsigned int max_num_cqs; struct gdma_queue **cq_table; diff --git a/sys/dev/mana/mana.h b/sys/dev/mana/mana.h index a037eb3f05c7..de34f8a82c6a 100644 --- a/sys/dev/mana/mana.h +++ b/sys/dev/mana/mana.h @@ -102,9 +102,6 @@ enum TRI_STATE { #define COMP_ENTRY_SIZE 64 #define MIN_FRAME_SIZE 146 -#define ADAPTER_MTU_SIZE 1500 -#define DEFAULT_FRAME_SIZE (ADAPTER_MTU_SIZE + 14) -#define MAX_FRAME_SIZE 4096 /* Unit number of RX buffers. Must be power of two * Higher number could fail at allocation. @@ -534,6 +531,9 @@ struct mana_port_context { uint16_t port_idx; uint16_t frame_size; + uint16_t max_mtu; + uint16_t min_mtu; + uint16_t mtu; bool port_is_up; bool port_st_save; /* Saved port state */ @@ -613,6 +613,11 @@ struct mana_query_device_cfg_resp { uint16_t max_num_vports; uint16_t reserved; uint32_t max_num_eqs; + + /* response v2: */ + uint16_t adapter_mtu; + uint16_t reserved2; + uint32_t reserved3; }; /* HW DATA */ /* Query vPort Configuration */ diff --git a/sys/dev/mana/mana_en.c b/sys/dev/mana/mana_en.c index 9eeaec11d1b2..ee2e99359498 100644 --- a/sys/dev/mana/mana_en.c +++ b/sys/dev/mana/mana_en.c @@ -181,18 +181,19 @@ mana_ioctl(if_t ifp, u_long command, caddr_t data) new_mtu = ifr->ifr_mtu; if (if_getmtu(ifp) == new_mtu) break; - if ((new_mtu + 18 > MAX_FRAME_SIZE) || - (new_mtu + 18 < MIN_FRAME_SIZE)) { + if ((new_mtu > apc->max_mtu) || + (new_mtu < apc->min_mtu)) { if_printf(ifp, "Invalid MTU. new_mtu: %d, " "max allowed: %d, min allowed: %d\n", - new_mtu, MAX_FRAME_SIZE - 18, MIN_FRAME_SIZE - 18); + new_mtu, apc->max_mtu, apc->min_mtu); return EINVAL; } MANA_APC_LOCK_LOCK(apc); if (apc->port_is_up) mana_down(apc); - apc->frame_size = new_mtu + 18; + apc->frame_size = new_mtu + ETHER_HDR_LEN; + apc->mtu = new_mtu; if_setmtu(ifp, new_mtu); mana_dbg(NULL, "Set MTU to %d\n", new_mtu); @@ -421,17 +422,11 @@ mana_load_rx_mbuf(struct mana_port_context *apc, struct mana_rxq *rxq, if (alloc_mbuf) { mbuf = m_getjcl(M_NOWAIT, MT_DATA, M_PKTHDR, rxq->datasize); - if (unlikely(mbuf == NULL)) { - mbuf = m_getcl(M_NOWAIT, MT_DATA, M_PKTHDR); - if (unlikely(mbuf == NULL)) { - return ENOMEM; - } - mlen = MCLBYTES; - } else { - mlen = rxq->datasize; - } + if (unlikely(mbuf == NULL)) + return ENOMEM; - mbuf->m_pkthdr.len = mbuf->m_len = mlen; + mbuf->m_pkthdr.len = mbuf->m_len = rxq->datasize; + mlen = rxq->datasize; } else { if (rx_oob->mbuf) { mbuf = rx_oob->mbuf; @@ -911,9 +906,9 @@ mana_init_port_context(struct mana_port_context *apc) BUS_SPACE_MAXADDR, /* lowaddr */ BUS_SPACE_MAXADDR, /* highaddr */ NULL, NULL, /* filter, filterarg */ - MJUMPAGESIZE, /* maxsize */ + MJUM16BYTES, /* maxsize */ 1, /* nsegments */ - MJUMPAGESIZE, /* maxsegsize */ + MJUM16BYTES, /* maxsegsize */ 0, /* flags */ NULL, NULL, /* lockfunc, lockfuncarg*/ &apc->rx_buf_tag); @@ -994,6 +989,9 @@ mana_query_device_cfg(struct mana_context *ac, uint32_t proto_major_ver, mana_gd_init_req_hdr(&req.hdr, MANA_QUERY_DEV_CONFIG, sizeof(req), sizeof(resp)); + + req.hdr.resp.msg_version = GDMA_MESSAGE_V2; + req.proto_major_ver = proto_major_ver; req.proto_minor_ver = proto_minor_ver; req.proto_micro_ver = proto_micro_ver; @@ -1016,8 +1014,14 @@ mana_query_device_cfg(struct mana_context *ac, uint32_t proto_major_ver, *max_num_vports = resp.max_num_vports; - mana_dbg(NULL, "mana max_num_vports from device = %d\n", - *max_num_vports); + if (resp.hdr.response.msg_version >= GDMA_MESSAGE_V2) + gc->adapter_mtu = resp.adapter_mtu; + else + gc->adapter_mtu = ETHERMTU + ETHER_HDR_LEN; + + mana_dbg(NULL, "mana max_num_vports from device = %d, " + "adapter_mtu = %u\n", + *max_num_vports, gc->adapter_mtu); return 0; } @@ -2295,7 +2299,7 @@ mana_alloc_rx_wqe(struct mana_port_context *apc, uint32_t buf_idx; int err; - if (rxq->datasize == 0 || rxq->datasize > PAGE_SIZE) { + if (rxq->datasize == 0) { mana_err(NULL, "WARNING: Invalid rxq datasize %u\n", rxq->datasize); } @@ -2359,6 +2363,28 @@ mana_push_wqe(struct mana_rxq *rxq) return 0; } +static uint32_t +mana_calc_rx_datasize(struct mana_port_context *apc) +{ + uint32_t effective_mtu = 0; + + if (apc->frame_size > MJUM16BYTES) { + mana_err(NULL, "mana frame_size %u is too big\n", + apc->frame_size); + effective_mtu = MJUM16BYTES; + } else if (apc->frame_size > MJUM9BYTES) { + effective_mtu = MJUM16BYTES; + } else if (apc->frame_size > MJUMPAGESIZE) { + effective_mtu = MJUM9BYTES; + } else if (apc->frame_size > MCLBYTES) { + effective_mtu = MJUMPAGESIZE; + } else { + effective_mtu = MCLBYTES; + } + + return effective_mtu; +} + static struct mana_rxq * mana_create_rxq(struct mana_port_context *apc, uint32_t rxq_idx, struct mana_eq *eq, if_t ndev) @@ -2381,14 +2407,8 @@ mana_create_rxq(struct mana_port_context *apc, uint32_t rxq_idx, rxq->ndev = ndev; rxq->num_rx_buf = apc->rx_queue_size; rxq->rxq_idx = rxq_idx; - /* - * Minimum size is MCLBYTES(2048) bytes for a mbuf cluster. - * Now we just allow maximum size of 4096. - */ - rxq->datasize = ALIGN(apc->frame_size, MCLBYTES); - if (rxq->datasize > MAX_FRAME_SIZE) - rxq->datasize = MAX_FRAME_SIZE; + rxq->datasize = mana_calc_rx_datasize(apc); mana_dbg(NULL, "Setting rxq %d datasize %d\n", rxq_idx, rxq->datasize); @@ -2914,10 +2934,13 @@ mana_probe_port(struct mana_context *ac, int port_idx, mana_rx_req_size); apc->port_handle = INVALID_MANA_HANDLE; apc->port_idx = port_idx; - apc->frame_size = DEFAULT_FRAME_SIZE; apc->last_tx_cq_bind_cpu = -1; apc->last_rx_cq_bind_cpu = -1; apc->vport_use_count = 0; + apc->max_mtu = gc->adapter_mtu - ETHER_HDR_LEN; + apc->min_mtu = MIN_FRAME_SIZE; + apc->mtu = ETHERMTU; + apc->frame_size = apc->mtu + ETHER_HDR_LEN; MANA_APC_LOCK_INIT(apc); @@ -2932,7 +2955,7 @@ mana_probe_port(struct mana_context *ac, int port_idx, if_setioctlfn(ndev, mana_ioctl); if_setgetcounterfn(ndev, mana_get_counter); - if_setmtu(ndev, ETHERMTU); + if_setmtu(ndev, apc->mtu); if_setbaudrate(ndev, IF_Gbps(100)); mana_rss_key_fill(apc->hashkey, MANA_HASH_KEY_SIZE); From nobody Mon May 11 15:26:30 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 4gDk8k4gvmz6dB50 for ; Mon, 11 May 2026 15:26: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 "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gDk8k38BFz40qZ for ; Mon, 11 May 2026 15:26:30 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778513190; 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=T4gsW2UcW6E7Gw9yu4uF0j0m6ZlJyEBz5azkWCc9yWI=; b=RyjvaoOEvXv04NidRCdSD8/CdxOdiwQd5cZdBUKtlU96/Wbra5Bzdb8BOK0Ip3gAS4DwQq OtBaKKSyw3alujUs5pej/5nErqq6EorkenaJMP6fWLjvcElRW+eTXDvJFM81RehaT/6hKN HlZdc9euggFrOYz3YEDKmZ6H5eIhkp+mRpbZCXOefivSO83ZpVReMYYgOcJ8sPK6xjxVB6 rJ7e6ayWXQwxjgPqssPYKlLsTp//CYrTSzD7eY3wz5t5TD8DVenEGsGk1USv9K4HQPFnuq cu+t6bP2g4FhHaU1NDYdoCTXIEeMK12F+9j78Xs/463hcunxlJS7Br0xMT1vwA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778513190; a=rsa-sha256; cv=none; b=VxUsDvrre0IIur5WN/F+iofeJUf+mjDmIdNLAvZdM1qLce4pz5gFKjQfbjGqFlq00USN93 07wP4moy8AeEgdCCIdibFhWR+l0TTt4/ZVvhfVAJSaCJDwZE/rzRB5rjdBJ2ccW5ro7eAi sBJdWn9T0Oy+E4IN0iT7sJT3eGBHqAvXVY5jFo4LQGg53STo++YlOjWdFPfyqbHf+921QU lcz3DT0sInVjNjwZcYIO8viQA5GJkadj1pDshWYe9pMEuGE7TSI2GCIVwdhDH67m/XAuc7 DnekVGCCllxxYFOTChzqppizoA16cjv99CoLHdM472Bh46dP1SvROUH7ep8fkQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778513190; 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=T4gsW2UcW6E7Gw9yu4uF0j0m6ZlJyEBz5azkWCc9yWI=; b=dfAlorCXvGBBOmAHjSCuGEm5YM06BAgeWMu+ksTQb2MCHucJJ5+wGhY0EP3U098qF4iGMV a3p+fON9LVh7v69kIAtC7bMLXp6AFZCJYAWo4kHbB61zrP+HIPiDn/hQvx9jx7y90h2L4d hOMzgW3kJysoVxCmJpAQ5H5+qQOjrervdta/AbC2J+EiO7UEqH0eBvTsfmZrkFo6/2pe8E emXOkmHLSZzPmhXtkylQi38jh0yZDb0L/BBSlMre6GXO8W2McVeNFoV4A6e4Nl/CtSFAmn 9cqw/YRu61kZcpg6qIYSqyFLsoPeGfqMBjhSOlBofpUUkrho+G+zOIlkrr4kAg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gDk8k2jPqz7CF for ; Mon, 11 May 2026 15:26:30 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 33028 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 11 May 2026 15:26:30 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Kyle Evans Subject: git: d64438a09dc8 - stable/14 - libregex: fix our mapping for \w 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: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org List-Id: 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: kevans X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: d64438a09dc8e466c969fbe94c1a2fa500554da4 Auto-Submitted: auto-generated Date: Mon, 11 May 2026 15:26:30 +0000 Message-Id: <6a01f526.33028.3f375504@gitrepo.freebsd.org> The branch stable/14 has been updated by kevans: URL: https://cgit.FreeBSD.org/src/commit/?id=d64438a09dc8e466c969fbe94c1a2fa500554da4 commit d64438a09dc8e466c969fbe94c1a2fa500554da4 Author: Kyle Evans AuthorDate: 2025-08-08 18:21:03 +0000 Commit: Kyle Evans CommitDate: 2026-05-11 15:20:50 +0000 libregex: fix our mapping for \w A small oversight in our implementation of \w is that it's actually not strictly [[:alnum:]]. According to the GNU documentation, it's actually [[:alnum:]] + underscore. The fix is rather trivial: just add it to our set explicitly, and amend our test set to be sure that _ is actually included. PR: 287396 (cherry picked from commit d0ff5773cefaf3fa41b1be3e44ca35bd9d5f68ee) --- lib/libc/regex/regcomp.c | 1 + lib/libregex/tests/gnuext.in | 6 +++--- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/lib/libc/regex/regcomp.c b/lib/libc/regex/regcomp.c index eae4d02657e8..d1f0fc0d862f 100644 --- a/lib/libc/regex/regcomp.c +++ b/lib/libc/regex/regcomp.c @@ -1170,6 +1170,7 @@ p_b_pseudoclass(struct parse *p, char c) { /* PASSTHROUGH */ case 'w': p_b_cclass_named(p, cs, "alnum"); + CHadd(p, cs, '_'); break; case 'S': cs->invert = 1; diff --git a/lib/libregex/tests/gnuext.in b/lib/libregex/tests/gnuext.in index 8f49854235a9..3ce0f4af1b34 100644 --- a/lib/libregex/tests/gnuext.in +++ b/lib/libregex/tests/gnuext.in @@ -10,9 +10,9 @@ a\|b\|c b abc a (ab)\1 - abab abab \1(ab) C ESUBREG (a)(b)(c)(d)(e)(f)(g)(h)(i)\9 - abcdefghii abcdefghii -# \w, \W, \s, \S (alnum, ^alnum, space, ^space) -\w+ - -%@a0X- a0X -\w\+ b -%@a0X- a0X +# \w, \W, \s, \S (_alnum, ^_alnum, space, ^space) +\w+ - -%@a_0X- a_0X +\w\+ b -%@a_0X- a_0X \s+ - aSNTb SNT \s\+ b aSNTb SNT # Word boundaries (\b, \B, \<, \>, \`, \') From nobody Tue May 12 05:16:14 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 4gF4ZD2fVvz6d2dL for ; Tue, 12 May 2026 05:16:20 +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 "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gF4ZC6q20z3m7B for ; Tue, 12 May 2026 05:16:19 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778562980; 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=YNdJ/cOP0aL93twws1FB/Jl6MhBUQ+57afngCahteUU=; b=OOZOoMmKlGW7a1o35vlhFY0iijXKtU2RVfdQQe7QvBESjdae0fVQTXXaKVVq7TJnZUDyfe NmNcC1z80WjU4sn6UZpzeBLHdDsHNQwGriN/yq5rBLmnlSquYzPGwZ+fEBYfiFrh4vmV4s SBwsWetI9fIgWU8xIy8QIDhn27hv4PDwpn0uPYBbSKRs9TRRggrrsyoxZPWMWGIENB361+ lnlO3oZAoLphQvmJt+RiAJFdD3K7shFENyzXlr8B7Zx0ZALJv16jlhnThv8yincv7ba5iZ ByxYt7QyDUAWNHgoZu0othT3EVTUBVg/BeoOys0etLkJH+yo/MhS9oJuk4mZHg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778562980; a=rsa-sha256; cv=none; b=HkI/RtXGuK/24lG9EvaA1IPh52uLjIQW/vBoj2LHH3bMbaqZ+pzXVJ9wh23rzbL2agrOaO 0WwfaCPeo+K4chxqHJ2z+rAbDYvXZ5dwh4UNI38GkcFBQCP14dN5/DDsoOaoVLHlz1ZiZ9 5zOv7fcror7mrO0wQdIdPSPw0j4bm3nVDBntviGGGOxeseEVgCHEApihF8s+0VmwLAijbL CwJoyqshBZkKQAqEPeIp0kwyCCxHU+TW0HzpDxrzw/UxoMLqS2O0ZCpEWAY65hMSTX9osh 8BGqEfd6AHEetct4xt8pQAPWgl/dh/54N0qNPjSoxBau+SzPA5r5ZVvTigHO1Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778562980; 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=YNdJ/cOP0aL93twws1FB/Jl6MhBUQ+57afngCahteUU=; b=NtSeXqhmDVuSmwC7G+vmjU2Ez5VfDXyDFZJBeNsAoWiduQ3wh3tdcYw4B++9ExF/D/kjXv sZ6anRBdaST1ZRPABRAjhW/dogcU6Uppzfe0HBOSDzZRyW5lG7UTvg1YLYmyXU7x/7rBd6 wNfMEtv2NKHOeQKWawCKTFaIugAZCHksTtqxk2cTuvaTEh4bCDcUHYK1IMwaDTdgmcc5oa kc0Qz4EV0g3oj9LY6FoGEA607KT4rNYAAPUTIIrYLiszoJ/1LyRk9yhBz8W2wJ/NTDNoWz sLdTfC4p07s0w16ODR6vY2kyW32UFI/RFb2ru/K8Sebm3zR8rICAbS3WU7o7Eg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gF4ZC5v3gzpLX for ; Tue, 12 May 2026 05:16:19 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 426e3 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 12 May 2026 05:16:14 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Lianwei Wang From: Xin LI Subject: git: ae32d61a2e3e - stable/15 - fsck_msdosfs: fix FAT header correction not persisting in cache mode 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: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org List-Id: 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: delphij X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: ae32d61a2e3e47bed54d861893d8e2da90fb7c76 Auto-Submitted: auto-generated Date: Tue, 12 May 2026 05:16:14 +0000 Message-Id: <6a02b79e.426e3.32abb9a9@gitrepo.freebsd.org> The branch stable/15 has been updated by delphij: URL: https://cgit.FreeBSD.org/src/commit/?id=ae32d61a2e3e47bed54d861893d8e2da90fb7c76 commit ae32d61a2e3e47bed54d861893d8e2da90fb7c76 Author: Lianwei Wang AuthorDate: 2026-05-09 04:56:12 +0000 Commit: Xin LI CommitDate: 2026-05-12 05:15:41 +0000 fsck_msdosfs: fix FAT header correction not persisting in cache mode When fsck_msdosfs runs with FAT32 cache mode (used for large filesystems that cannot be mmap'd), a detected FAT header correction was written into the in-memory buffer but the corresponding cache entry (fat32_cache_allentries[0]) was never marked dirty. As a result, fat_flush_fat32_cache_entry() skipped it, the corrected bytes were never written to disk, and copyfat() propagated the uncorrected on-disk data to all backup FAT copies. Every subsequent fsck run would repeat the same "FAT starts with odd byte sequence / FIXED" cycle indefinitely. Fix by marking fat32_cache_allentries[0].dirty = true after applying the in-memory correction, ensuring the chunk is flushed before copyfat() runs. Obtained from: https://android-review.googlesource.com/c/platform/external/fsck_msdos/+/4047981 (cherry picked from commit 10e342c1ec78af5a0b97739c806b16a632118fa5) --- sbin/fsck_msdosfs/fat.c | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/sbin/fsck_msdosfs/fat.c b/sbin/fsck_msdosfs/fat.c index 567bfcd428cb..5ead0b1bf783 100644 --- a/sbin/fsck_msdosfs/fat.c +++ b/sbin/fsck_msdosfs/fat.c @@ -927,6 +927,17 @@ readfat(int fs, struct bootblock *boot, struct fat_descriptor **fp) default: break; } + /* + * In cache mode the header lives in + * fat32_cache_allentries[0]. Mark it + * dirty so it is flushed to disk (either + * on eviction or in writefat()) before + * copyfat() copies the primary FAT to + * backup copies. + */ + if (fat->use_cache) + fat->fat32_cache_allentries[0].dirty = + true; } } } From nobody Tue May 12 05:18:04 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 4gF4cL0qNFz6d2VG for ; Tue, 12 May 2026 05:18:10 +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 "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gF4cK5QsSz3mJV for ; Tue, 12 May 2026 05:18:09 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778563089; 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=od1hh4CfKm/1aaluInhBp5cQw3fA2h6OuXMcSAFea68=; b=YahZTgoboywZQsVilDQfWklqyB5v9s+RwlfDasc9Ye1nIxpK5FQ5WX624ggRzXb3tSI9Tc 2p3qArA+ofVnX0V+ildxV9tKaL2Y0qdH+jj9+of1rLRYFpO1qzlY3c3vmiBDz8ao+uLkXX Xf0XSOJ0YNtE6pmgGNlO422860UsnZYDO5Y9z0de7/HLsMAGLtuwdagYERA4Bj6THKnq+b nyCWAeo4eqU/Yk3uM3cDgUtSBQ0vRMBgCyzhOKuV7bA+7P+RzgimvZfSTVcvSCiADM6yP6 cP6CBmvEXq8zIb/oFw81QlW12PLJuGTGRliBATH3ovjx0ExDo8bDY3eEUj2JJQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778563089; a=rsa-sha256; cv=none; b=e0k5ssIlA438wiVYlxWtSbzepQY3KB2Rohbg4mGbj2y1kjzAa/NtWHubkaIdVKoZQPAMxo G4hO8gEq3EBFrHdUKDDTkW57+4HWFGuhIR2PgDtdlVKMcBRYJObCUJV5LB1M7DfiG3EcxR XUMhEiu4BRfqohq/009d+6O/XVReD3Bh+whmVt2a1fJDZA0PNDq1qMEwXAMnEwshkEEuF2 DNv5gP9wdPxbUxM7uXrTJVMDzKHnhOmWKPZHjmzICGm43ql1+aKbl2wunSPp0JQ/+zHemw NcEiDPD76hprDxaxrI1BCRsB8h2McqhhDXBfgFlAmKnRJ0mYYBV4rQVlABN14A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778563089; 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=od1hh4CfKm/1aaluInhBp5cQw3fA2h6OuXMcSAFea68=; b=Mhth1Swk/pI+rxHmypLfou7g0ThWnROIyHvXzZlv4aeWOl8tRCnmGpFequcs4s0uoc85WC A5+j+tHCS+wINYonSf4M2Fp63kRRyktw339yEI9ft08cI6kyy7WiUaAjlhy+4MwDdXxiIp 1Qedz9Pgvux0XNcuVmCJvKQutraH7kjJ7wnEbTjO5pr+ukDCBvB+j/GSk1wP2DqkyPyP1n 6713RFntdbY+JUsiPgaPVK0dQfhqZYHO4SWyMiOlcFyIT4O1nqnr/xn9CK+9VaKO+y1Dpc /MDOEArvp/M4gOZiBd5RB3ywr93qAo+asS3g17dsvPLamvH8cXl+hsX0y4CT+Q== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gF4cK4LXVzqWn for ; Tue, 12 May 2026 05:18:09 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 4390a by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 12 May 2026 05:18:04 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Lianwei Wang From: Xin LI Subject: git: 302545bcbc1c - stable/14 - fsck_msdosfs: fix FAT header correction not persisting in cache mode 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: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org List-Id: 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: delphij X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 302545bcbc1c81076123cb69a12a5514661972df Auto-Submitted: auto-generated Date: Tue, 12 May 2026 05:18:04 +0000 Message-Id: <6a02b80c.4390a.4a1f31dd@gitrepo.freebsd.org> The branch stable/14 has been updated by delphij: URL: https://cgit.FreeBSD.org/src/commit/?id=302545bcbc1c81076123cb69a12a5514661972df commit 302545bcbc1c81076123cb69a12a5514661972df Author: Lianwei Wang AuthorDate: 2026-05-09 04:56:12 +0000 Commit: Xin LI CommitDate: 2026-05-12 05:17:53 +0000 fsck_msdosfs: fix FAT header correction not persisting in cache mode When fsck_msdosfs runs with FAT32 cache mode (used for large filesystems that cannot be mmap'd), a detected FAT header correction was written into the in-memory buffer but the corresponding cache entry (fat32_cache_allentries[0]) was never marked dirty. As a result, fat_flush_fat32_cache_entry() skipped it, the corrected bytes were never written to disk, and copyfat() propagated the uncorrected on-disk data to all backup FAT copies. Every subsequent fsck run would repeat the same "FAT starts with odd byte sequence / FIXED" cycle indefinitely. Fix by marking fat32_cache_allentries[0].dirty = true after applying the in-memory correction, ensuring the chunk is flushed before copyfat() runs. Obtained from: https://android-review.googlesource.com/c/platform/external/fsck_msdos/+/4047981 (cherry picked from commit 10e342c1ec78af5a0b97739c806b16a632118fa5) --- sbin/fsck_msdosfs/fat.c | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/sbin/fsck_msdosfs/fat.c b/sbin/fsck_msdosfs/fat.c index 567bfcd428cb..5ead0b1bf783 100644 --- a/sbin/fsck_msdosfs/fat.c +++ b/sbin/fsck_msdosfs/fat.c @@ -927,6 +927,17 @@ readfat(int fs, struct bootblock *boot, struct fat_descriptor **fp) default: break; } + /* + * In cache mode the header lives in + * fat32_cache_allentries[0]. Mark it + * dirty so it is flushed to disk (either + * on eviction or in writefat()) before + * copyfat() copies the primary FAT to + * backup copies. + */ + if (fat->use_cache) + fat->fat32_cache_allentries[0].dirty = + true; } } } From nobody Tue May 12 16:44:44 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 4gFMrX2r9Xz6ckMY for ; Tue, 12 May 2026 16:44:44 +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 "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gFMrX2BVbz3swS for ; Tue, 12 May 2026 16:44:44 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778604284; 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=eVS0UlS/z9GXBqi/dxtCUkoPzGw7oNLyecGFOB/bYC4=; b=rbourm8y43IJ+vFO7omDP1OhcIHbPpuspkaFC+6T46ctqpEzMUm6bVMGUGTfUguvy4C6yK 238r/pNyzBeWlDWfBv8vLrdGU3L8N+SquDdTsCNY7r0BspBJwqCQv0/aMsWyPTtKhYMT2e rGL6JYq4xFpkHfUbcaJlveA//icpGRJSa1OYd5Cs7jFEOQj3s/tfD6E/ptJNK8HopALDpJ 4c7b/G4HH2Wc7k5mZyZHilNAn7+QSehd/2idKR0I54ObCLWJ77Czj5mAb+3IKsIfCAzAdh ihMR8lM2Peu4n8a/K4lCkonETpPiVGLUk2eB3E2GcucynXqru2x8wM2jjklQ6g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778604284; a=rsa-sha256; cv=none; b=A9T6AGWLIVva+wuO4SAgEzEw4kb3C0khQdBwSKE/4YNi7H8exA+ScyypqMUMeBDk3kmyRG 8/cZ+Y6wKxcDlFuKE0NCXm9MgOrvh14knVViD46tQlULtQjkQGQ/hej7jFYeROi9mllePL 1mQsSyCyb4k7QKO7sE85SnpnXeB0qjTVv+8+E4dH/TftE3ctjQ7oO85YPeRpb9vdBQNHjE Kvw9mXXnqC21I3P9S/pMV78EitH6hBvKwEEwYgFK6CCyqxAPcU9UidzEg1lg+ChbGM4ZzV pr5bmwLQwMrQPjeBjbZBBRdevPF+hDl+2U5YKjsXfH0mTR+VJfTPgIp+Cf/4jg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778604284; 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=eVS0UlS/z9GXBqi/dxtCUkoPzGw7oNLyecGFOB/bYC4=; b=JbIj5PGO2ztCI0IFQx2adCXMIJXoL6U+UG5X/osY+By94MOGw9Lppbs0/rLPAJiSFvJ2Zs 2qHaiiEpO2bIC9qWlOdRthUlnNZZtqHWbDxjAdl94TRLak4K8JgnTj2DbRYv+/AFnqzYIv K19MLEQXs2+QGea2mRnsocE1uH3i25ksz8SzwLoGVKnv2q+K3Uopmd2UwaDfOGLfdgl8Vd MOt4hLURqKdX3vfoMTItKEmzH1Zo7Wjd509gEvY4doDPgziGDr/diyOEujke9cXBs4G5Ni o2YBDZA9eA+TDNsda48rwKULLIEpXwel9bvAHgX8WnoBbGVdsg2uP1pKXnSwPQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gFMrX1ljhz19kt for ; Tue, 12 May 2026 16:44:44 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3ce12 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 12 May 2026 16:44:44 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Kristof Provost Subject: git: 8d583858e499 - stable/14 - pfsync: reject invalid SCTP states 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: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org List-Id: 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: kp X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 8d583858e499dcc23a1c7b6b9c80e2e84f245d04 Auto-Submitted: auto-generated Date: Tue, 12 May 2026 16:44:44 +0000 Message-Id: <6a0358fc.3ce12.672d0d5a@gitrepo.freebsd.org> The branch stable/14 has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=8d583858e499dcc23a1c7b6b9c80e2e84f245d04 commit 8d583858e499dcc23a1c7b6b9c80e2e84f245d04 Author: Kristof Provost AuthorDate: 2026-05-04 16:08:35 +0000 Commit: Kristof Provost CommitDate: 2026-05-12 07:54:38 +0000 pfsync: reject invalid SCTP states SCTP states should always have a src scrub object associated with them. Crafted pfsync packets might not have this, leading to us derferencing a NULL pointer on cleanup. Validate the pfsync state insertion packet to make sure this is correct. PR: 294989 MFC after: 1 week Sponsored by: Rubicon Communications, LLC ("Netgate") (cherry picked from commit bf6d00afdb6171ba04a1c5a7fde904cde87d212d) --- sys/netpfil/pf/if_pfsync.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/sys/netpfil/pf/if_pfsync.c b/sys/netpfil/pf/if_pfsync.c index 6b828989c54d..10883e233b03 100644 --- a/sys/netpfil/pf/if_pfsync.c +++ b/sys/netpfil/pf/if_pfsync.c @@ -706,6 +706,13 @@ pfsync_state_import(union pfsync_state_union *sp, int flags, int msg_version) (st->act.rtableid >= 0 && st->act.rtableid < rt_numfibs))) goto cleanup; + if (sks->proto == IPPROTO_SCTP && st->src.scrub == NULL) { + if (V_pf_status.debug >= PF_DEBUG_MISC) + printf("%s: invalid SCTP state from creator id: %08x\n", __func__, + ntohl(sp->pfs_1301.creatorid)); + goto cleanup; + } + st->id = sp->pfs_1301.id; st->creatorid = sp->pfs_1301.creatorid; pf_state_peer_ntoh(&sp->pfs_1301.src, &st->src); From nobody Tue May 12 16:44:45 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 4gFMrZ0Br1z6ckRJ for ; Tue, 12 May 2026 16:44:46 +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 "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gFMrY655pz3stH for ; Tue, 12 May 2026 16:44:45 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778604285; 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=aIHpMFldcMXvMDXQSQTzY7E4Fgx6f1JAa6jvWjU1riI=; b=a3mvyf0IeeAbC32aO3XYhTKMmmmlOXhb1elXlc+3OFbrQ7x5AEiNPT0wfECGBnTmpVUYfj knt0IGCryVZqfLthPN08nDzpm8f1xSBHd6SrW9ChlRTRb51hg6eBdn41lKRYavnCE8cjl6 i24JQGUuH3DMDSQCyAWXz3BBqOlr8s2PJkshWmnYs0vDpHp2wkmDA+o7DKfP1DOwl87F8V qcmTCwSoly48v5b6OF95O8aW7UPuyFEECQH0i1cfuDE9rJvhnEclGfO7FqaZLregrea8pf SCJURVkqq43yxoPh+YBMNFlv8YPR2Bd1bVOU/ttUxYaLvxbn1AUU6K8zemNkjw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778604285; a=rsa-sha256; cv=none; b=ZtDi6a6O9kOpdQzAkzDJln5rOURei6VHs3CvYVjpJwMOrD0XxPBLs14xQwtZs9jdpXxROz CMV3S6wb/nklLDH12xXhCThiL+PTsamrXd+w3I9LkXa+F5DqF+AWAFiBWyxnBWXk7WZH3f 1cOk/25tYyBi8xwXze8Pyr5aqNIBlRWKIwFuUl9V3FGLaRhkWEWABBEeqnQzIo1bs7UsvS BQh8utzRMyuL7t4T6jNkKDT7f5gKm0vF7FZiIAVUn5z84f5R0sYg74dxmRoNo7Bo9QBkS4 e/LnIIu6bt20QHX7EB2cF3Widw6y5Vz5DtXXHvBtLzhJKKhHehmidOI3LzPWCw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778604285; 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=aIHpMFldcMXvMDXQSQTzY7E4Fgx6f1JAa6jvWjU1riI=; b=s6stwmZiZS/0U08ia/fkKbN1mNm7T3QlUAfpcjIc3/RtloatuQgBuXdMHAVVFSWsPpNYkC lgmDm2R0CpFcPhXbvbOjapD1FSJ7UhC0b0BQQOe79su2ckuXiPbPTN/4Zz8GFUGsaYvnht SejvnRn6DCN/F+5EbDI/TCpDdbeIwSX1Wrg3gtjUJ7CSHtIZZBTdxs+phmWDjG1waEHy3Q RkWAkKEVPMucUXO7mQ18CoJ3BHo/q6bcQKRvzcWrYlVPDiQeqKtd0TyX5fqlKV/0hPaeYk 9Eb9gr37QAKjwslnJ07tuJrkgJXuzoaohUgX2nTgFCve+LFTHuDSMvLOXbMwtg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gFMrY5P3Hz19YV for ; Tue, 12 May 2026 16:44:45 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3d501 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 12 May 2026 16:44:45 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Kristof Provost Subject: git: 91d1c1c2b1e7 - stable/15 - pfsync: reject invalid SCTP states 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: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org List-Id: 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: kp X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 91d1c1c2b1e74e776641a0923a9796b018c610d2 Auto-Submitted: auto-generated Date: Tue, 12 May 2026 16:44:45 +0000 Message-Id: <6a0358fd.3d501.11255333@gitrepo.freebsd.org> The branch stable/15 has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=91d1c1c2b1e74e776641a0923a9796b018c610d2 commit 91d1c1c2b1e74e776641a0923a9796b018c610d2 Author: Kristof Provost AuthorDate: 2026-05-04 16:08:35 +0000 Commit: Kristof Provost CommitDate: 2026-05-12 07:54:34 +0000 pfsync: reject invalid SCTP states SCTP states should always have a src scrub object associated with them. Crafted pfsync packets might not have this, leading to us derferencing a NULL pointer on cleanup. Validate the pfsync state insertion packet to make sure this is correct. PR: 294989 MFC after: 1 week Sponsored by: Rubicon Communications, LLC ("Netgate") (cherry picked from commit bf6d00afdb6171ba04a1c5a7fde904cde87d212d) --- sys/netpfil/pf/if_pfsync.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/sys/netpfil/pf/if_pfsync.c b/sys/netpfil/pf/if_pfsync.c index 3edf08aefeb5..a5f377e84307 100644 --- a/sys/netpfil/pf/if_pfsync.c +++ b/sys/netpfil/pf/if_pfsync.c @@ -873,6 +873,13 @@ pfsync_state_import(union pfsync_state_union *sp, int flags, int msg_version) (st->act.rtableid >= 0 && st->act.rtableid < rt_numfibs))) goto cleanup; + if (sks->proto == IPPROTO_SCTP && st->src.scrub == NULL) { + if (V_pf_status.debug >= PF_DEBUG_MISC) + printf("%s: invalid SCTP state from creator id: %08x\n", __func__, + ntohl(sp->pfs_1301.creatorid)); + goto cleanup; + } + st->id = sp->pfs_1301.id; st->creatorid = sp->pfs_1301.creatorid; pf_state_peer_ntoh(&sp->pfs_1301.src, &st->src); From nobody Tue May 12 17:02:53 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 4gFNFT73wZz6clMk for ; Tue, 12 May 2026 17:02:53 +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 "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gFNFT5S9Dz415l for ; Tue, 12 May 2026 17:02:53 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778605373; 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=BT9YtlokYONbATQEH1s4/ZQu+C4tmC3/XZ2Xtey1EHo=; b=oGSbl8+2ZaVtzNV9iN65SdSWAZyWlqLeaRfwRvM1HlKsN2f8DcgB/YTRPTEN34i2X4/y1c 0cmCykA8VFl9QrbxMdMRRPffi2BroTqQ6Am8Uk8RROsBHTy2u+kV+ScXJvjgVvfuJ/xG86 CBesW+0MuqidSKu8/y1hXj5w/ateKI+KMAGnTGKSbBTZRU1CGtQpaW3UdJ3eA2pG4TnZ/F eJA0tvwJLFTS064jMP39To0uj1SWb+S2A8AdupA2JVNbBCSxvWHGllH5/z9WFtsRVZdIZw /5j4I+FD/lx1AQdkdRxw2z5MDa3UhTlmxKqXyjAGOT+0KrZ4oOEPuiGmgvthlQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778605373; a=rsa-sha256; cv=none; b=sE9rmYPmJNA8sxfsI4OXYXwlAGIV63SwrqzjNufBipti/3bb9ZnQPXqcTtHVTHjkvvpezo JNJ7NvNKebpdHKt41JM3nReqG+NXcU8ku385x4IZ7d0JwNB9EKZkjZnaq+WjXWRBkFVn8X J7Am6Nkx6Vh3gwBYtJpkI1Q1LlmtYkAqykEhmudRMZgQRj57QBUyGtI3xsUIDseaZQYX8X I8mlFFDe8+edeT2m6CVLFx7PSraak0o01jzvLXE0pJ+N4wTOhdjfO19YpcKFVWolle0w3/ p+qjYiKewVO/YJO7lYJ72cBKKeU8ZmHp+x0rU4fiCc/OMydRQmy9B3qFMHRSgA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778605373; 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=BT9YtlokYONbATQEH1s4/ZQu+C4tmC3/XZ2Xtey1EHo=; b=Cp2vjIL1h3lbJ2lrq/FkrxMUbiasEb+xPfbQ5uSSOALxOx08cnZUK9Pzv5ULKiko4/Nbtk RZbfZMxSLEK/Ms6BOWO/l5ik63vwt3zuW9rrwxKzG6wiaxdQbw4RMwU1zIuZ9C2XcdEKlQ /kqrnNOJytmCaXR1eoMlMHq2o4dyXM1gsTogpyYimZ2SO1mAAKOBEJL5UuGnelnrDRDJtn zhWN71h048PUc4iSoz+iw+fTugvepbnM6tqIKBvX02elb2FrbqtlLMjditpSgZZ5ShL7u0 yXxLiMIvmG57JjEOCWNHbU9oKCIBV8GSazSvYAz9QaDMfXdUvkjIgGIQV4aS+A== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gFNFT5362z19ns for ; Tue, 12 May 2026 17:02:53 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3efc8 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 12 May 2026 17:02:53 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Wei Hu Subject: git: de698a13ccca - stable/15 - Hyper-V: hn: just call vf's ioctl when changing mtu 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: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org List-Id: 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: whu X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: de698a13cccaf831b1812c577594429421b028c5 Auto-Submitted: auto-generated Date: Tue, 12 May 2026 17:02:53 +0000 Message-Id: <6a035d3d.3efc8.1da886a2@gitrepo.freebsd.org> The branch stable/15 has been updated by whu: URL: https://cgit.FreeBSD.org/src/commit/?id=de698a13cccaf831b1812c577594429421b028c5 commit de698a13cccaf831b1812c577594429421b028c5 Author: Wei Hu AuthorDate: 2025-12-23 04:23:39 +0000 Commit: Wei Hu CommitDate: 2026-05-12 17:02:00 +0000 Hyper-V: hn: just call vf's ioctl when changing mtu When changing mtu, if a vf is attached to the netvsc interface, just calling its ioctl to change vf's mtu is good enough. Tested by: whu MFC after: 3 days Sponsored by: Microsoft (cherry picked from commit 44f656641c238cb3db31026f3e3bef36cd5231a8) --- sys/dev/hyperv/netvsc/if_hn.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/sys/dev/hyperv/netvsc/if_hn.c b/sys/dev/hyperv/netvsc/if_hn.c index b23c0d76115d..8c79ae7b003b 100644 --- a/sys/dev/hyperv/netvsc/if_hn.c +++ b/sys/dev/hyperv/netvsc/if_hn.c @@ -3763,14 +3763,16 @@ hn_ioctl(if_t ifp, u_long cmd, caddr_t data) ifr_vf = *ifr; strlcpy(ifr_vf.ifr_name, if_name(vf_ifp), sizeof(ifr_vf.ifr_name)); - error = ifhwioctl(SIOCSIFMTU,vf_ifp, + error = ifhwioctl(SIOCSIFMTU, vf_ifp, (caddr_t)&ifr_vf, curthread); + HN_UNLOCK(sc); if (error) { - HN_UNLOCK(sc); if_printf(ifp, "%s SIOCSIFMTU %d failed: %d\n", if_name(vf_ifp), ifr->ifr_mtu, error); - break; + } else { + if_setmtu(ifp, ifr->ifr_mtu); } + break; } /* From nobody Tue May 12 17:02:54 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 4gFNFW29rcz6clJk for ; Tue, 12 May 2026 17:02:55 +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 "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gFNFV6HMnz40cs for ; Tue, 12 May 2026 17:02:54 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778605374; 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=ilKxDnzrr39GYaa9CdzEt8a2IkPINiw4QkBBsE2qJGE=; b=yXgfxUKAJd9oSmx9Bc5J1/EDfd/eIn4df+BHEFTqXvgBi1FUCMsfF2NkTtaVef+Ba9cv5I hqwSX7Y8nmBBZaHPruUbKDnnJBCJpUD2yQs+JFzXZHzftj18668QdKFpn/FAujPGyS3Uqi h75n1EI1RBoEJU3wfi88B5ld7YaRL7vYAFa6kKhnPDd2VLotczV1iagxLJZk+GFTfhpLuI fXpzVlTBxlVNj5od0gpK6I4nMnz/4f+k4NFvRyJfE0nyDanCxXrjt3/DDTlyDEzwqG6zwn 4aQqUxrAVU2/2qFZOd+bWzlOXvyB8EokShvNUDMWeI3o6ddWbe5RsIiqEdsOZw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778605374; a=rsa-sha256; cv=none; b=uliIIAtSYhiN1os90EednoB1cwGFHzoROsjUz10dUimnJp3Bc+xs7QRWf2CBdKgIbpzKpJ eiUHXM/KlmByLkRk0kN+i4+K4U26/wqGpi0FquCtUbFBxE+yJjUQ7FfBatYe8d45grw4P8 rHyfU3MD3UD95rMe6HUqqPz/Xdj8uxBzalUfz7Iw19l8n7azVCqCxihnnrus8Ef3/79Iff f4V9rrCM2oqCrvh+jkT+vI2T2FJMnYKzJwApM5MmrSZ3zFyjQJ0pY3k7zwTWPK2NMGjUSA gh+cC1C4THcLDVaIWIctETBRActkO+hMjX+YZhCx5ardTQe9YR9LCocMW3333g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778605374; 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=ilKxDnzrr39GYaa9CdzEt8a2IkPINiw4QkBBsE2qJGE=; b=jrsHNN9LAFpscevrBM9ZDxEqIVGpkg96hT1gcxRvPMSBJFK1AM7bc6UR3J7nzUiIHuCxjV 5fg2OuXfXLpnzUnW/RgK6klyuaB3DcAAJ1PNyjY2MdoEoOuU7SfBHTUD8n1NjK6XO1x6Og PcWUmaI7/Vvrh5aFUQDGWXq7RbVgnQrcM/6XheYvEjghG8pl3B12mtnKHRl7Y6Wi4dUzaE BmaSGRHhPPKp3/mZB8JvcbfZo9Oi9ygnO/qZ+bKJIh9KvXiYwm3a+55KQZ4W9QrGJbSgDh +UNLVV/GeDlk5z0atdU4N3OMPIJsGa7yqa60XFnkrSmiCfyAhXjH8TXETeYusQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gFNFV5pklz1BT0 for ; Tue, 12 May 2026 17:02:54 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3ddc4 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 12 May 2026 17:02:54 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Wei Hu Subject: git: ab5161397066 - stable/15 - mana: support jumbo packet size 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: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org List-Id: 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: whu X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: ab51613970667988a67be69410e87ec2f4bba407 Auto-Submitted: auto-generated Date: Tue, 12 May 2026 17:02:54 +0000 Message-Id: <6a035d3e.3ddc4.79288c7d@gitrepo.freebsd.org> The branch stable/15 has been updated by whu: URL: https://cgit.FreeBSD.org/src/commit/?id=ab51613970667988a67be69410e87ec2f4bba407 commit ab51613970667988a67be69410e87ec2f4bba407 Author: Wei Hu AuthorDate: 2025-12-23 07:00:38 +0000 Commit: Wei Hu CommitDate: 2026-05-12 17:02:00 +0000 mana: support jumbo packet size Remove the restriction of up to 4k packet size. Now the driver supports up to MJUM16BYTES size packets as long as hardware supporting it. Tested on VMs in Azure. Tested by: whu MFC after: 1 week Sponsored by: Microsoft (cherry picked from commit d0a2bd2765b365c4be9b17c29306f848953e55a5) --- sys/dev/mana/gdma.h | 6 ++++ sys/dev/mana/mana.h | 11 +++++-- sys/dev/mana/mana_en.c | 79 ++++++++++++++++++++++++++++++++------------------ 3 files changed, 65 insertions(+), 31 deletions(-) diff --git a/sys/dev/mana/gdma.h b/sys/dev/mana/gdma.h index 9e32d58dbfdc..90cd908055af 100644 --- a/sys/dev/mana/gdma.h +++ b/sys/dev/mana/gdma.h @@ -193,6 +193,9 @@ struct gdma_general_req { }; /* HW DATA */ #define GDMA_MESSAGE_V1 1 +#define GDMA_MESSAGE_V2 2 +#define GDMA_MESSAGE_V3 3 +#define GDMA_MESSAGE_V4 4 struct gdma_general_resp { struct gdma_resp_hdr hdr; @@ -409,6 +412,9 @@ struct gdma_context { struct gdma_resource msix_resource; struct gdma_irq_context *irq_contexts; + /* L2 MTU */ + uint16_t adapter_mtu; + /* This maps a CQ index to the queue structure. */ unsigned int max_num_cqs; struct gdma_queue **cq_table; diff --git a/sys/dev/mana/mana.h b/sys/dev/mana/mana.h index a037eb3f05c7..de34f8a82c6a 100644 --- a/sys/dev/mana/mana.h +++ b/sys/dev/mana/mana.h @@ -102,9 +102,6 @@ enum TRI_STATE { #define COMP_ENTRY_SIZE 64 #define MIN_FRAME_SIZE 146 -#define ADAPTER_MTU_SIZE 1500 -#define DEFAULT_FRAME_SIZE (ADAPTER_MTU_SIZE + 14) -#define MAX_FRAME_SIZE 4096 /* Unit number of RX buffers. Must be power of two * Higher number could fail at allocation. @@ -534,6 +531,9 @@ struct mana_port_context { uint16_t port_idx; uint16_t frame_size; + uint16_t max_mtu; + uint16_t min_mtu; + uint16_t mtu; bool port_is_up; bool port_st_save; /* Saved port state */ @@ -613,6 +613,11 @@ struct mana_query_device_cfg_resp { uint16_t max_num_vports; uint16_t reserved; uint32_t max_num_eqs; + + /* response v2: */ + uint16_t adapter_mtu; + uint16_t reserved2; + uint32_t reserved3; }; /* HW DATA */ /* Query vPort Configuration */ diff --git a/sys/dev/mana/mana_en.c b/sys/dev/mana/mana_en.c index 949b498ceadc..bc8c172bab69 100644 --- a/sys/dev/mana/mana_en.c +++ b/sys/dev/mana/mana_en.c @@ -181,18 +181,19 @@ mana_ioctl(if_t ifp, u_long command, caddr_t data) new_mtu = ifr->ifr_mtu; if (if_getmtu(ifp) == new_mtu) break; - if ((new_mtu + 18 > MAX_FRAME_SIZE) || - (new_mtu + 18 < MIN_FRAME_SIZE)) { + if ((new_mtu > apc->max_mtu) || + (new_mtu < apc->min_mtu)) { if_printf(ifp, "Invalid MTU. new_mtu: %d, " "max allowed: %d, min allowed: %d\n", - new_mtu, MAX_FRAME_SIZE - 18, MIN_FRAME_SIZE - 18); + new_mtu, apc->max_mtu, apc->min_mtu); return EINVAL; } MANA_APC_LOCK_LOCK(apc); if (apc->port_is_up) mana_down(apc); - apc->frame_size = new_mtu + 18; + apc->frame_size = new_mtu + ETHER_HDR_LEN; + apc->mtu = new_mtu; if_setmtu(ifp, new_mtu); mana_dbg(NULL, "Set MTU to %d\n", new_mtu); @@ -421,17 +422,11 @@ mana_load_rx_mbuf(struct mana_port_context *apc, struct mana_rxq *rxq, if (alloc_mbuf) { mbuf = m_getjcl(M_NOWAIT, MT_DATA, M_PKTHDR, rxq->datasize); - if (unlikely(mbuf == NULL)) { - mbuf = m_getcl(M_NOWAIT, MT_DATA, M_PKTHDR); - if (unlikely(mbuf == NULL)) { - return ENOMEM; - } - mlen = MCLBYTES; - } else { - mlen = rxq->datasize; - } + if (unlikely(mbuf == NULL)) + return ENOMEM; - mbuf->m_pkthdr.len = mbuf->m_len = mlen; + mbuf->m_pkthdr.len = mbuf->m_len = rxq->datasize; + mlen = rxq->datasize; } else { if (rx_oob->mbuf) { mbuf = rx_oob->mbuf; @@ -911,9 +906,9 @@ mana_init_port_context(struct mana_port_context *apc) BUS_SPACE_MAXADDR, /* lowaddr */ BUS_SPACE_MAXADDR, /* highaddr */ NULL, NULL, /* filter, filterarg */ - MJUMPAGESIZE, /* maxsize */ + MJUM16BYTES, /* maxsize */ 1, /* nsegments */ - MJUMPAGESIZE, /* maxsegsize */ + MJUM16BYTES, /* maxsegsize */ 0, /* flags */ NULL, NULL, /* lockfunc, lockfuncarg*/ &apc->rx_buf_tag); @@ -994,6 +989,9 @@ mana_query_device_cfg(struct mana_context *ac, uint32_t proto_major_ver, mana_gd_init_req_hdr(&req.hdr, MANA_QUERY_DEV_CONFIG, sizeof(req), sizeof(resp)); + + req.hdr.resp.msg_version = GDMA_MESSAGE_V2; + req.proto_major_ver = proto_major_ver; req.proto_minor_ver = proto_minor_ver; req.proto_micro_ver = proto_micro_ver; @@ -1016,8 +1014,14 @@ mana_query_device_cfg(struct mana_context *ac, uint32_t proto_major_ver, *max_num_vports = resp.max_num_vports; - mana_dbg(NULL, "mana max_num_vports from device = %d\n", - *max_num_vports); + if (resp.hdr.response.msg_version >= GDMA_MESSAGE_V2) + gc->adapter_mtu = resp.adapter_mtu; + else + gc->adapter_mtu = ETHERMTU + ETHER_HDR_LEN; + + mana_dbg(NULL, "mana max_num_vports from device = %d, " + "adapter_mtu = %u\n", + *max_num_vports, gc->adapter_mtu); return 0; } @@ -2295,7 +2299,7 @@ mana_alloc_rx_wqe(struct mana_port_context *apc, uint32_t buf_idx; int err; - if (rxq->datasize == 0 || rxq->datasize > PAGE_SIZE) { + if (rxq->datasize == 0) { mana_err(NULL, "WARNING: Invalid rxq datasize %u\n", rxq->datasize); } @@ -2359,6 +2363,28 @@ mana_push_wqe(struct mana_rxq *rxq) return 0; } +static uint32_t +mana_calc_rx_datasize(struct mana_port_context *apc) +{ + uint32_t effective_mtu = 0; + + if (apc->frame_size > MJUM16BYTES) { + mana_err(NULL, "mana frame_size %u is too big\n", + apc->frame_size); + effective_mtu = MJUM16BYTES; + } else if (apc->frame_size > MJUM9BYTES) { + effective_mtu = MJUM16BYTES; + } else if (apc->frame_size > MJUMPAGESIZE) { + effective_mtu = MJUM9BYTES; + } else if (apc->frame_size > MCLBYTES) { + effective_mtu = MJUMPAGESIZE; + } else { + effective_mtu = MCLBYTES; + } + + return effective_mtu; +} + static struct mana_rxq * mana_create_rxq(struct mana_port_context *apc, uint32_t rxq_idx, struct mana_eq *eq, if_t ndev) @@ -2381,14 +2407,8 @@ mana_create_rxq(struct mana_port_context *apc, uint32_t rxq_idx, rxq->ndev = ndev; rxq->num_rx_buf = apc->rx_queue_size; rxq->rxq_idx = rxq_idx; - /* - * Minimum size is MCLBYTES(2048) bytes for a mbuf cluster. - * Now we just allow maximum size of 4096. - */ - rxq->datasize = ALIGN(apc->frame_size, MCLBYTES); - if (rxq->datasize > MAX_FRAME_SIZE) - rxq->datasize = MAX_FRAME_SIZE; + rxq->datasize = mana_calc_rx_datasize(apc); mana_dbg(NULL, "Setting rxq %d datasize %d\n", rxq_idx, rxq->datasize); @@ -2914,10 +2934,13 @@ mana_probe_port(struct mana_context *ac, int port_idx, mana_rx_req_size); apc->port_handle = INVALID_MANA_HANDLE; apc->port_idx = port_idx; - apc->frame_size = DEFAULT_FRAME_SIZE; apc->last_tx_cq_bind_cpu = -1; apc->last_rx_cq_bind_cpu = -1; apc->vport_use_count = 0; + apc->max_mtu = gc->adapter_mtu - ETHER_HDR_LEN; + apc->min_mtu = MIN_FRAME_SIZE; + apc->mtu = ETHERMTU; + apc->frame_size = apc->mtu + ETHER_HDR_LEN; MANA_APC_LOCK_INIT(apc); @@ -2932,7 +2955,7 @@ mana_probe_port(struct mana_context *ac, int port_idx, if_setioctlfn(ndev, mana_ioctl); if_setgetcounterfn(ndev, mana_get_counter); - if_setmtu(ndev, ETHERMTU); + if_setmtu(ndev, apc->mtu); if_setbaudrate(ndev, IF_Gbps(100)); mana_rss_key_fill(apc->hashkey, MANA_HASH_KEY_SIZE); From nobody Tue May 12 18:07:44 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 4gFPhJ3ZRwz6cqhj for ; Tue, 12 May 2026 18:07:44 +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 "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gFPhJ2yd2z3DG4 for ; Tue, 12 May 2026 18:07:44 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778609264; 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=MvdzMs4fd1RG5R/9nrhf3721u6+GrymnT4/Uj/jj06I=; b=y0U5tGbg+jAQ2cgk96VCOePxnmEjq1rig/zUDu0QHZ3WqWI+RQE3G1N1QSrzUPbD5abVMp q3PxXlrAlcvH9jVoAJteT06yBYozOYMH313QTmRGDqt/usnxPy12vqzdPjYm6jBxkoJQRt iK1kgA3Mw92gb//1Nhk1+5b9svTEjTBZ6b9Th8alViIOHEy6cYg3+U6llQb+P/i1QxCoMw VmZcMrHWHD+GkEUPJGrppBrbBVQWPMeRE8bR/oWevRhJTnqmy25iOwlbsgYasAGBr/t+YD PEozep9NFTn45xx39MmuqI6O7eyJDk05ppIUnRSdzL1/qhinCELSjXe7GkRfpg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778609264; a=rsa-sha256; cv=none; b=F5kl1XSlxgG1/bXNXwF3s/wE200tqUoLwoeASnvTnTIuyMdRqNlg5K4NLS2xvLZqlsrGk0 TlU8vZwro+G59Lij3B4upxvxMAQ1o1AsoqBD6Ae4ZjyLGlOS2kfY5lWlzvV2pMMWwJP6kg e+IvH7WrRryeqcP3Do4eCXsMkmeuqVNRCv6+wwUziCUenyokCPmTa+BtzwtNtyKJYFohiC WywGUuVE8nwZBJramEFOlpL43n9nVpwsP/E/80uy8xe3HPhZtgtpnxwAqh8uRJzWjtJl5C 1VxeGcPGp5Gk+DruhONxiTqgl52l5q5f7039v+sW7BMJtg2dCfFXawQpMumHEw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778609264; 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=MvdzMs4fd1RG5R/9nrhf3721u6+GrymnT4/Uj/jj06I=; b=gDVAa/CCdbhXK3vsM+YE4w9wNp1cVyxUUF0lOzum9phRt6dqFVuHNTAsANRhg3gpBRq6hP ieIsw/9pVfI0XwYlv6Xk70/EPopZvtPpzpwfnsj5wE5WUjpmyAOZhQp2hPf2hwlBqGzu1o wQHHGK0C3EZJzENhyIVoEFo3rhG7ImnBRAYmQEMpe6GcjlVU6gKILUEe7h34/AF+2ZMh7S k/D/1qtkyohEDSNiqi3hW9ojxMlV8hVRwR9VhOal6tBQI8V86XOiRsJ3N4BD5an4wFJZAs NHhf+t3aoDZrUN4EA5EyOCwC9X8a9GnIC1wzS/cvQuklaOb3wS3V+RiyPIcg6g== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gFPhJ2T5SzCX for ; Tue, 12 May 2026 18:07:44 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 432e5 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 12 May 2026 18:07:44 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Tuukka Pasanen From: Ed Maste Subject: git: 9d283f97ebd0 - stable/15 - mkimg: Add SPDX-License-Identifier tags 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: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org List-Id: 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: emaste X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 9d283f97ebd038ca081100855592d9695233b226 Auto-Submitted: auto-generated Date: Tue, 12 May 2026 18:07:44 +0000 Message-Id: <6a036c70.432e5.709ae413@gitrepo.freebsd.org> The branch stable/15 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=9d283f97ebd038ca081100855592d9695233b226 commit 9d283f97ebd038ca081100855592d9695233b226 Author: Tuukka Pasanen AuthorDate: 2026-02-09 08:32:54 +0000 Commit: Ed Maste CommitDate: 2026-05-12 18:06:26 +0000 mkimg: Add SPDX-License-Identifier tags Reviewed by: emaste Sponsored by: The FreeBSD Foundation (cherry picked from commit 971696b22f7acc8c45600bb56b972340e9b912e8) --- usr.bin/mkimg/apm.c | 2 ++ usr.bin/mkimg/bsd.c | 2 ++ usr.bin/mkimg/ebr.c | 2 ++ usr.bin/mkimg/endian.h | 2 ++ usr.bin/mkimg/format.c | 2 ++ usr.bin/mkimg/format.h | 2 ++ usr.bin/mkimg/gpt.c | 2 ++ usr.bin/mkimg/image.c | 2 ++ usr.bin/mkimg/image.h | 2 ++ usr.bin/mkimg/mbr.c | 2 ++ usr.bin/mkimg/mkimg.c | 2 ++ usr.bin/mkimg/mkimg.h | 2 ++ usr.bin/mkimg/qcow.c | 2 ++ usr.bin/mkimg/raw.c | 2 ++ usr.bin/mkimg/scheme.c | 2 ++ usr.bin/mkimg/scheme.h | 2 ++ usr.bin/mkimg/uuid.c | 2 ++ usr.bin/mkimg/vhd.c | 2 ++ usr.bin/mkimg/vhdx.c | 2 ++ usr.bin/mkimg/vmdk.c | 2 ++ 20 files changed, 40 insertions(+) diff --git a/usr.bin/mkimg/apm.c b/usr.bin/mkimg/apm.c index 259a7533c27c..59776d18bc47 100644 --- a/usr.bin/mkimg/apm.c +++ b/usr.bin/mkimg/apm.c @@ -1,4 +1,6 @@ /*- + * SPDX-License-Identifier: BSD-2-Clause + * * Copyright (c) 2014 Juniper Networks, Inc. * All rights reserved. * diff --git a/usr.bin/mkimg/bsd.c b/usr.bin/mkimg/bsd.c index 17933c01ac07..647e9ab0608c 100644 --- a/usr.bin/mkimg/bsd.c +++ b/usr.bin/mkimg/bsd.c @@ -1,4 +1,6 @@ /*- + * SPDX-License-Identifier: BSD-2-Clause + * * Copyright (c) 2014 Juniper Networks, Inc. * All rights reserved. * diff --git a/usr.bin/mkimg/ebr.c b/usr.bin/mkimg/ebr.c index 4d6adbb3b8ba..20ade1ed88d1 100644 --- a/usr.bin/mkimg/ebr.c +++ b/usr.bin/mkimg/ebr.c @@ -1,4 +1,6 @@ /*- + * SPDX-License-Identifier: BSD-2-Clause + * * Copyright (c) 2014 Juniper Networks, Inc. * All rights reserved. * diff --git a/usr.bin/mkimg/endian.h b/usr.bin/mkimg/endian.h index e9dc2b44b9b7..98e699bee855 100644 --- a/usr.bin/mkimg/endian.h +++ b/usr.bin/mkimg/endian.h @@ -1,4 +1,6 @@ /*- + * SPDX-License-Identifier: BSD-2-Clause + * * Copyright (c) 2002 Thomas Moestl * All rights reserved. * diff --git a/usr.bin/mkimg/format.c b/usr.bin/mkimg/format.c index 6730c22ca153..97e580cd8ca2 100644 --- a/usr.bin/mkimg/format.c +++ b/usr.bin/mkimg/format.c @@ -1,4 +1,6 @@ /*- + * SPDX-License-Identifier: BSD-2-Clause + * * Copyright (c) 2014 Juniper Networks, Inc. * All rights reserved. * diff --git a/usr.bin/mkimg/format.h b/usr.bin/mkimg/format.h index 304af4586da8..db1ea764ced2 100644 --- a/usr.bin/mkimg/format.h +++ b/usr.bin/mkimg/format.h @@ -1,4 +1,6 @@ /*- + * SPDX-License-Identifier: BSD-2-Clause + * * Copyright (c) 2014 Juniper Networks, Inc. * All rights reserved. * diff --git a/usr.bin/mkimg/gpt.c b/usr.bin/mkimg/gpt.c index ed3f008c394f..ce817ea10ed2 100644 --- a/usr.bin/mkimg/gpt.c +++ b/usr.bin/mkimg/gpt.c @@ -1,4 +1,6 @@ /*- + * SPDX-License-Identifier: BSD-2-Clause + * * Copyright (c) 2014 Juniper Networks, Inc. * All rights reserved. * diff --git a/usr.bin/mkimg/image.c b/usr.bin/mkimg/image.c index 07aaf1a6c0ea..90817206e317 100644 --- a/usr.bin/mkimg/image.c +++ b/usr.bin/mkimg/image.c @@ -1,4 +1,6 @@ /*- + * SPDX-License-Identifier: BSD-2-Clause + * * Copyright (c) 2014 Juniper Networks, Inc. * All rights reserved. * diff --git a/usr.bin/mkimg/image.h b/usr.bin/mkimg/image.h index 53dd3dc2df8a..956fe3f27556 100644 --- a/usr.bin/mkimg/image.h +++ b/usr.bin/mkimg/image.h @@ -1,4 +1,6 @@ /*- + * SPDX-License-Identifier: BSD-2-Clause + * * Copyright (c) 2014 Juniper Networks, Inc. * All rights reserved. * diff --git a/usr.bin/mkimg/mbr.c b/usr.bin/mkimg/mbr.c index 7bda01c72e6a..cc5bd51bd7e5 100644 --- a/usr.bin/mkimg/mbr.c +++ b/usr.bin/mkimg/mbr.c @@ -1,4 +1,6 @@ /*- + * SPDX-License-Identifier: BSD-2-Clause + * * Copyright (c) 2014 Juniper Networks, Inc. * All rights reserved. * diff --git a/usr.bin/mkimg/mkimg.c b/usr.bin/mkimg/mkimg.c index 8f3a5d879bbb..c625b49dc29a 100644 --- a/usr.bin/mkimg/mkimg.c +++ b/usr.bin/mkimg/mkimg.c @@ -1,4 +1,6 @@ /*- + * SPDX-License-Identifier: BSD-2-Clause + * * Copyright (c) 2013,2014 Juniper Networks, Inc. * All rights reserved. * diff --git a/usr.bin/mkimg/mkimg.h b/usr.bin/mkimg/mkimg.h index aa0ec2a8d944..13ca7aab36fb 100644 --- a/usr.bin/mkimg/mkimg.h +++ b/usr.bin/mkimg/mkimg.h @@ -1,4 +1,6 @@ /*- + * SPDX-License-Identifier: BSD-2-Clause + * * Copyright (c) 2014 Juniper Networks, Inc. * All rights reserved. * diff --git a/usr.bin/mkimg/qcow.c b/usr.bin/mkimg/qcow.c index 2dc3e5498420..6e67cbaa0887 100644 --- a/usr.bin/mkimg/qcow.c +++ b/usr.bin/mkimg/qcow.c @@ -1,4 +1,6 @@ /*- + * SPDX-License-Identifier: BSD-2-Clause + * * Copyright (c) 2014 Marcel Moolenaar * All rights reserved. * diff --git a/usr.bin/mkimg/raw.c b/usr.bin/mkimg/raw.c index 2de674b908ac..b68c5f06b3c4 100644 --- a/usr.bin/mkimg/raw.c +++ b/usr.bin/mkimg/raw.c @@ -1,4 +1,6 @@ /*- + * SPDX-License-Identifier: BSD-2-Clause + * * Copyright (c) 2014 Juniper Networks, Inc. * All rights reserved. * diff --git a/usr.bin/mkimg/scheme.c b/usr.bin/mkimg/scheme.c index 85ed94013e8d..80ff456a709f 100644 --- a/usr.bin/mkimg/scheme.c +++ b/usr.bin/mkimg/scheme.c @@ -1,4 +1,6 @@ /*- + * SPDX-License-Identifier: BSD-2-Clause + * * Copyright (c) 2013,2014 Juniper Networks, Inc. * All rights reserved. * diff --git a/usr.bin/mkimg/scheme.h b/usr.bin/mkimg/scheme.h index 52614255595f..1c234b86d66c 100644 --- a/usr.bin/mkimg/scheme.h +++ b/usr.bin/mkimg/scheme.h @@ -1,4 +1,6 @@ /*- + * SPDX-License-Identifier: BSD-2-Clause + * * Copyright (c) 2013,2014 Juniper Networks, Inc. * All rights reserved. * diff --git a/usr.bin/mkimg/uuid.c b/usr.bin/mkimg/uuid.c index 885a6c36b522..da99c33109e3 100644 --- a/usr.bin/mkimg/uuid.c +++ b/usr.bin/mkimg/uuid.c @@ -1,4 +1,6 @@ /*- + * SPDX-License-Identifier: BSD-2-Clause + * * Copyright (c) 2016 Marcel Moolenaar * All rights reserved. * diff --git a/usr.bin/mkimg/vhd.c b/usr.bin/mkimg/vhd.c index c0fe45ab416e..09d3cfab4dcc 100644 --- a/usr.bin/mkimg/vhd.c +++ b/usr.bin/mkimg/vhd.c @@ -1,4 +1,6 @@ /*- + * SPDX-License-Identifier: BSD-2-Clause + * * Copyright (c) 2014, 2015 Marcel Moolenaar * All rights reserved. * diff --git a/usr.bin/mkimg/vhdx.c b/usr.bin/mkimg/vhdx.c index e280250bd964..6ecdfe8e13e9 100644 --- a/usr.bin/mkimg/vhdx.c +++ b/usr.bin/mkimg/vhdx.c @@ -1,4 +1,6 @@ /*- + * SPDX-License-Identifier: BSD-2-Clause + * * Copyright (c) 2020 Oleksandr Tymoshenko * * Redistribution and use in source and binary forms, with or without diff --git a/usr.bin/mkimg/vmdk.c b/usr.bin/mkimg/vmdk.c index 132eb801387a..79ef256df223 100644 --- a/usr.bin/mkimg/vmdk.c +++ b/usr.bin/mkimg/vmdk.c @@ -1,4 +1,6 @@ /*- + * SPDX-License-Identifier: BSD-2-Clause + * * Copyright (c) 2014 Juniper Networks, Inc. * All rights reserved. * From nobody Tue May 12 18:07:45 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 4gFPhK65rSz6cqnq for ; Tue, 12 May 2026 18:07:45 +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 "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gFPhK3z6Tz3D7R for ; Tue, 12 May 2026 18:07:45 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778609265; 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=Lw/hKnBzEb+q6KspVtAdtrYezQcqbfcHarQAGJEq4ZE=; b=YpSIQQGgPVLdDyRkWOyuiBZKNZJ4J4OUItczPfqIylNy2JOm466g3gIEJ5A84dSCCSyHTC ofecZGorT238ayGzzrKCEC6HFOHuqK4ewtm200X0dpGGdu/oR1FxxWB7ZvvloA3+AGBdE3 rCRYJBE2yaDrnpeRvKiVdaeo2nz6r91XUaer8wxzIqLD3fg7Z6ZIHLFQRJdWw36cpO4Up4 Bli9sq459PU7jBHuLP3MiauSxKx26za/OMKhHX0cyTET3ZW31OZmAYGEzBEQnhsEHSMa/V HIZ+rfCIdX57mYSJudcxkAYcHqpzm8pU350B4FkiHatn1FegK44AeV7V5eHPvw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778609265; a=rsa-sha256; cv=none; b=TguO24esIZhORYdelJtVpyfwR/yU0LpW4hada2s2S3g99Gt6uPSTkqk1UKdw3wFmMVRRl3 x4SwlYxIY2FCBwVzA30ceZmnS9TkZvVwIZ0CtfJYnVhLKGLqoGI1o8Bmr/Qzg2GGuJ62De YmzDvEu9R8RyEuLaw4VFEqfHbPcqiYzkV+uUOYFlNlErH2sEwwkBEwQufsG3fnYOah8Nhx Ee8QvMEHaNUiviIMQHq/wov9pzdwCQr8nyMm6U2CnbWH4o4e5Eh0ZJdQUYVaQFXd0g/z36 Y8J2bEuPTuhUOMfzSutQ8nhBexbx9djZ/EzfZQcAeiDW7u1k0BXBnQYTy+m6gA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778609265; 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=Lw/hKnBzEb+q6KspVtAdtrYezQcqbfcHarQAGJEq4ZE=; b=JVl0dHGlBLgBFDpBOk5KqSicdmo0X9KVuzucCRLRKNW6yBPJsrbSIbV2KnLKK4i44RJqSp sWCVA/TcIVvZIu07UUEHt/q7Xk1lCC092UJmkTLZfd5PC+V/ESlApIkM3yggYcFsOS4+K6 bUIX7oa40DtuKuy/CZoMpvTypaGEHuAN+MTnH5kyANfuVMsqKw5PC/m4lrCCcxhMihnf5p iCw3OC0nYd9UZ1/xdQmMGdNgPMdb5JC67fCCY8OgNpA9QSeZXWKqJt9q/frcpO1OlLxhtc Maoj5TQg1ksKC3zJo15tjlHr2iOFS2eFdNgrgNGcXdCvpBRAvkzm8vRp8GOIiQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gFPhK3GNPz1CvJ for ; Tue, 12 May 2026 18:07:45 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 42c69 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 12 May 2026 18:07:45 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Tuukka Pasanen From: Ed Maste Subject: git: f0bb84ffbbe4 - stable/15 - vtfontcvt: Add SPDX-License-Identifier tag 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: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org List-Id: 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: emaste X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: f0bb84ffbbe4f716a07630f2d03c89dab3e2c873 Auto-Submitted: auto-generated Date: Tue, 12 May 2026 18:07:45 +0000 Message-Id: <6a036c71.42c69.7244d7fb@gitrepo.freebsd.org> The branch stable/15 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=f0bb84ffbbe4f716a07630f2d03c89dab3e2c873 commit f0bb84ffbbe4f716a07630f2d03c89dab3e2c873 Author: Tuukka Pasanen AuthorDate: 2026-02-16 09:01:58 +0000 Commit: Ed Maste CommitDate: 2026-05-12 18:06:26 +0000 vtfontcvt: Add SPDX-License-Identifier tag Reviewed by: emaste Sponsored by: The FreeBSD Foundation (cherry picked from commit f12a0dca86b529069a940f09aba796dd4e28c66f) --- usr.bin/vtfontcvt/vtfontcvt.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/usr.bin/vtfontcvt/vtfontcvt.c b/usr.bin/vtfontcvt/vtfontcvt.c index 773072813d8a..1e388ef36276 100644 --- a/usr.bin/vtfontcvt/vtfontcvt.c +++ b/usr.bin/vtfontcvt/vtfontcvt.c @@ -1,4 +1,6 @@ /*- + * SPDX-License-Identifier: BSD-2-Clause + * * Copyright (c) 2009, 2014 The FreeBSD Foundation * * This software was developed by Ed Schouten under sponsorship from the From nobody Tue May 12 18:07:46 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 4gFPhL6srVz6crHx for ; Tue, 12 May 2026 18:07:46 +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 "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gFPhL4jchz3D5K for ; Tue, 12 May 2026 18:07:46 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778609266; 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=JaE7rQu/r6Fv/Aih5zTZ4HantnxWRwTuIpqgju2FXdM=; b=EkpB7jqVJ640mObGu3WkiNOvb0Mj0dRlMXzooucK+MR91B0bhj1JEQZOpp9RjN5x4DBtFi enpM2s0Oi5FqIQwwAMlgUYk0msWjz2KJIU7Pq7Yt3f0oyxOEYMb57Kc5m7YelCQEWYZVXG iilfmMBKhAFLGwNTycWK131Mkd1lrWX6hH4BwHN3hAvG2b3FDao2QMxj5I+3om3tNUIXy0 cuEm5hshoHfjU1WOrpm/pCn+FXtMkVcZJF81MqFImyLuYSHDcrHFch1ch9nE71GBrphphC KreAOGHN5+XYbsytwbBpScjYE1UE2QdRbcU51wCnawlUuM26Me6DaHDt0cTllQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778609266; a=rsa-sha256; cv=none; b=ZGPrmcOiyxYJ2496NsRccA9lAoQVtqSyn2/U43N+rBWrs5NMqp/pejOgOejfLV4fXPfaJp H+EBI97J8eMfYo2vGyfApxrCZjFhpgTS1wU7XBDbUMnsLKp/D3I+E3F/08YkPyMd1IITfW iNiWo5VgPVoR5gfvVb/22W3CI7kmbSi9eyBrEMngkG39HS2LMIMzEf+m7j4zLLZhDTmPsb ACIZg+OCRNmJ1pBL+FMoY28il2IyCwcR5wxlaR5V1rk57Qun6FiuJxecEVlMG3UjzMZ6cD TXZx4D4CUd9J8O4JWcp5Nd65fcn9kJNgQ8ZMAETU7sT+SEV+2h/x7Z2FdJMkaQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778609266; 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=JaE7rQu/r6Fv/Aih5zTZ4HantnxWRwTuIpqgju2FXdM=; b=sBLC/LpobeehkLe/fjxJnwwSRIqePDUaa7k583A5HtuwJCKBNxLVNPKC2iPWEW8jRSdyFe YPEEDY5nr5z69mHJTYRNdEbiANhdfMDi3KMP3K49jjvRYIigqlFcmZ6PjYu1lGM9QoEfJF HMjKSLDD+M9PGomoPP8vk5g5FS2Ke7MeJ9KLFTlqqdKOunE77d40ZCd6xi2O0+fGW56DYe WvSNYe4U0O3yakwmSHeCuDY56ZPIfT7IDrvKlhUqSapDIu+7Q2aXBYWoBl1reTpTcDVMt2 t2gXF+C2SV0Xoxox9z/31MGpW2xiv/ewtUgRcbcAbYiywnY8Fkb0AFibnuHVhg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gFPhL40gJzNP for ; Tue, 12 May 2026 18:07:46 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 44e33 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 12 May 2026 18:07:46 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Tuukka Pasanen From: Ed Maste Subject: git: 16d0c3475cf9 - stable/15 - chio: Add SPDX-License-Identifier tags 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: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org List-Id: 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: emaste X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 16d0c3475cf978037aea066bac2a9397051aa94b Auto-Submitted: auto-generated Date: Tue, 12 May 2026 18:07:46 +0000 Message-Id: <6a036c72.44e33.5789d67f@gitrepo.freebsd.org> The branch stable/15 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=16d0c3475cf978037aea066bac2a9397051aa94b commit 16d0c3475cf978037aea066bac2a9397051aa94b Author: Tuukka Pasanen AuthorDate: 2026-02-09 07:47:08 +0000 Commit: Ed Maste CommitDate: 2026-05-12 18:06:26 +0000 chio: Add SPDX-License-Identifier tags Some BSD-4-Clause files under bin/chio were missing the SPDX-License-Identifier-tag. Reviewed by: emaste Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D55193 (cherry picked from commit b6824fe48e4197877f472268859ffe80d7fd946b) --- bin/chio/chio.c | 2 ++ bin/chio/defs.h | 2 ++ bin/chio/pathnames.h | 2 ++ 3 files changed, 6 insertions(+) diff --git a/bin/chio/chio.c b/bin/chio/chio.c index 07def55ee88f..10468406800e 100644 --- a/bin/chio/chio.c +++ b/bin/chio/chio.c @@ -1,5 +1,7 @@ /* $NetBSD: chio.c,v 1.6 1998/01/04 23:53:58 thorpej Exp $ */ /*- + * SPDX-License-Identifier: BSD-4-Clause + * * Copyright (c) 1996 Jason R. Thorpe * All rights reserved. * diff --git a/bin/chio/defs.h b/bin/chio/defs.h index 6b4381a3d447..4dbe69629a81 100644 --- a/bin/chio/defs.h +++ b/bin/chio/defs.h @@ -1,5 +1,7 @@ /*- + * SPDX-License-Identifier: BSD-4-Clause + * * Copyright (c) 1996 Jason R. Thorpe * All rights reserved. * diff --git a/bin/chio/pathnames.h b/bin/chio/pathnames.h index a8308ed7b0ac..6c5ee3c63cd0 100644 --- a/bin/chio/pathnames.h +++ b/bin/chio/pathnames.h @@ -1,5 +1,7 @@ /*- + * SPDX-License-Identifier: BSD-4-Clause + * * Copyright (c) 1996 Jason R. Thorpe * All rights reserved. * From nobody Tue May 12 18:07:47 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 4gFPhN068Qz6crJ5 for ; Tue, 12 May 2026 18:07:48 +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 "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gFPhM5TM6z3DNg for ; Tue, 12 May 2026 18:07:47 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778609267; 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=9/6CToexIWpggpQHEPhRampjnaG0yiWWr2HZ3yOXyas=; b=lUHDrY/tcZWK4mpcAVZvAcV3qPn57Px/hUD7p3Gq6xt6LLbEO+2zxBPr/0vnkeXrFgXCaG o0xVLR2X4Sh3ApyEip1bfBZQlUxWFcLtalK82L+O2E9les3Gw6uLKsoZD+xNM9YPw5yNbs 5XQESMubH99MNdH9918vos90+OCvudv+Ngnu2t3BJ8kWKWBYHpR5ce4hUzO2KwkWTCjRz2 mENAChK/D1+P2c8JuWVPFqRojocxKxND2BEkgTAekmu9eTcj1/kyn57PeUYThLCTQGXNyY dp8HRizU7/ppT5INROaOlureMnOo/EvHvg9fMMchGZJ5Xz8/LZSq8tmealsSTw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778609267; a=rsa-sha256; cv=none; b=BF+GtkvBpGiVh67exhDJ3/M0BUYu64ZAyiCC0+awEPKjF5orlxkVQO9rKnR9TQDvozQ2eo 1zXy4CMulv077cxy/dOvitnaXo0NrbYnlMac5bspWxI9IUa/XsjwgNKUNgVQlf2eIcUjst hg+ip4Z/RAspuS97AnTY/+1h+SY5jS6EIkbwFeyrlxhacpTE9zFEOneEvfiVso6OjA7rOn wlpgW6j/o75RmiaGyICRtLanoMgSS66ythOe9J8SEmcYG4PxYy7qxx5Vvsuod5HJoy/Oyf 77Yj0NQzdYQVv4vf5zEfWTz2duSJ9Do9/lvTY9uVBIGbHn9vwm6PLGBIWMyqNw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778609267; 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=9/6CToexIWpggpQHEPhRampjnaG0yiWWr2HZ3yOXyas=; b=rsfzHkYJsZzDvRYVuaXikzgs02M3vX/DnIXb4VQ7vkMn8B3btNEM69u5lEJyqvzwljXn+D fyoUnnLaMsxuuiNK6Q3G5i+UyzVs5ROTCxgev3O5SZ7+hreH8OoQjA9hwIuuB3aLDnxB9F WZEQI7te8qV65wi113g0QZ7vbtM9Cjqm0Bod0jNlzC2B8RiNyD2DmtL3w1753muc66p5VE cgOKZU9WDV8HvieU/zha0jPHrx72OsZYZx4rSOrrFS1XV9KJzWLR8tCOBvu3RrEkAeSCyK /qc78X8hMoG+NBWY8P889AGXpoa4TVo/K3W0tmiYgt6fMmKVo/Y0GjTCOYUJVA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gFPhM4nJtzCb for ; Tue, 12 May 2026 18:07:47 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 4489d by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 12 May 2026 18:07:47 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Tuukka Pasanen From: Ed Maste Subject: git: cbf20714f7b5 - stable/15 - ipfw: Add SPDX-License-Identifier tag 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: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org List-Id: 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: emaste X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: cbf20714f7b5227d4faa4f1b5ee35976b6e651c4 Auto-Submitted: auto-generated Date: Tue, 12 May 2026 18:07:47 +0000 Message-Id: <6a036c73.4489d.6de07152@gitrepo.freebsd.org> The branch stable/15 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=cbf20714f7b5227d4faa4f1b5ee35976b6e651c4 commit cbf20714f7b5227d4faa4f1b5ee35976b6e651c4 Author: Tuukka Pasanen AuthorDate: 2026-02-09 08:19:20 +0000 Commit: Ed Maste CommitDate: 2026-05-12 18:06:26 +0000 ipfw: Add SPDX-License-Identifier tag Reviewed by: emaste Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D55273 (cherry picked from commit 904e0dcd2967cfe72899e7285e6cd6e9977ae68c) --- sbin/ipfw/nptv6.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/sbin/ipfw/nptv6.c b/sbin/ipfw/nptv6.c index eee6109a3d9e..b78c5c236e75 100644 --- a/sbin/ipfw/nptv6.c +++ b/sbin/ipfw/nptv6.c @@ -1,4 +1,6 @@ /*- + * SPDX-License-Identifier: BSD-2-Clause + * * Copyright (c) 2016 Yandex LLC * Copyright (c) 2016 Andrey V. Elsukov * All rights reserved. From nobody Tue May 12 18:07:48 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 4gFPhP0SJVz6crD6 for ; Tue, 12 May 2026 18:07: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 "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gFPhN6B6vz3DGH for ; Tue, 12 May 2026 18:07:48 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778609268; 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=a3zN+7IYAVMLzCNb6Rccbil53lIgJ3rL4XqaAwsw2vU=; b=LklJAPGi0d+srhNQmDcdDJPPW9wdKDrZG3fYcLd4kRNZ7CiVdfPf6ouUj8KokSJcE0KihT ycNDYdqLs0FF7eBRrStkmFN/20yQr18+s7ZpOHR2Acw/0/ijdx60LwJYvS4k+Fv4NGadgG giCx9vGE4J1XtoCC0+tw5LBVHe1qYNzK7GoLolrkMO8ZyuJHKq3vvpOhMzlDguG++6bE5V HG+g9g7BBaJW4CDnBK5h6+JO53Ix5acYn1WYxLHAMLyEhAPp3KtO1f84hYy2ttHpDhOt7n yH59GgHUzQvPJYnnKI2H+onj1hy8MRjg9drTHzKOo1vIYYr5hB+DrWncV63HkQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778609268; a=rsa-sha256; cv=none; b=plp0sdJQQDRhrFy5vJ4ESmlaj404PdiRnIpPbd+0kwhHJsmJUzyvyUZs/O/a9DISPGY2ku 2mFleNBbjcewA6wkrBEcP8a0VrYwQQms1gUFKxtAz3fFOj/ZG40Z3i2kFA6AztbljUYj+s kjfr9alUvgK6TPuwx/QdbF9YFx8Cv9J0u09sEN02eVJ4nmqIpe3A5lGvXoYZt/QPawIrpp OqfF1m1ZtfxYliFDtm8gvPv6Bti+sSDhDFfMnAIUs42xAKRx9FSB2d+EwLAUrbZmqfcS75 UO3wVCoWK5i8jllEPPXA7QzToLXvL3L7OmcMpiJXIsQxSI5aqTYUPgSDQGteng== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778609268; 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=a3zN+7IYAVMLzCNb6Rccbil53lIgJ3rL4XqaAwsw2vU=; b=nx02Os+KZpxcquZex9KrnIy3sx5gMvu3JKzSXzLAvKQNrySEZB2EoZIPxiesTCQOstNtNZ WiVkRk8MRMOybrddh7aThFYOY375OtMKgnI9cwJRn8U4UwVCldYVorTUzd/36kv7Lq1v3X 2rPFALZ40buaNEH/X2lBoeegvwedRPM73rgUcXc/3n0nnPWWN6GkMF+tHUzzl8GjZhRWQm Zlma7gn/XDDVWkxyEqZxyNa9tR7ErEWbCzaJewjn9K1TU8elhGkFA4z9mZb+N3M5y/AA8W CXioExpBRWBG6VlOfOvoXiQ4lHk1b+GPRiXbXfcLgw6cX5WcDgvUtL6Yyad4bA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gFPhN5cJ1z1CYl for ; Tue, 12 May 2026 18:07:48 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 44994 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 12 May 2026 18:07:48 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Tuukka Pasanen From: Ed Maste Subject: git: 8fcc509f8907 - stable/15 - fstyp: Add SPDX-License-Identifier tags 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: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org List-Id: 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: emaste X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 8fcc509f89073a0bf70f8f4499eb1244a9f5c41b Auto-Submitted: auto-generated Date: Tue, 12 May 2026 18:07:48 +0000 Message-Id: <6a036c74.44994.38b868d0@gitrepo.freebsd.org> The branch stable/15 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=8fcc509f89073a0bf70f8f4499eb1244a9f5c41b commit 8fcc509f89073a0bf70f8f4499eb1244a9f5c41b Author: Tuukka Pasanen AuthorDate: 2026-02-16 09:22:39 +0000 Commit: Ed Maste CommitDate: 2026-05-12 18:06:26 +0000 fstyp: Add SPDX-License-Identifier tags Reviewed by: emaste Sponsored by: The FreeBSD Foundation (cherry picked from commit 836ac989933bcd5b662979bfdec429a201c123a6) --- usr.sbin/fstyp/apfs.c | 2 ++ usr.sbin/fstyp/cd9660.c | 2 ++ usr.sbin/fstyp/exfat.c | 2 ++ usr.sbin/fstyp/ext2fs.c | 2 ++ usr.sbin/fstyp/fstyp.c | 2 ++ usr.sbin/fstyp/fstyp.h | 2 ++ usr.sbin/fstyp/geli.c | 2 ++ usr.sbin/fstyp/hammer.c | 2 ++ usr.sbin/fstyp/hammer2.c | 2 ++ usr.sbin/fstyp/hammer2_disk.h | 2 ++ usr.sbin/fstyp/hammer_disk.h | 2 ++ usr.sbin/fstyp/hfsplus.c | 2 ++ usr.sbin/fstyp/msdosfs.c | 2 ++ usr.sbin/fstyp/msdosfs.h | 2 ++ usr.sbin/fstyp/ntfs.c | 2 ++ usr.sbin/fstyp/ufs.c | 2 ++ usr.sbin/fstyp/zfs.c | 2 ++ 17 files changed, 34 insertions(+) diff --git a/usr.sbin/fstyp/apfs.c b/usr.sbin/fstyp/apfs.c index aeb459a1c3af..809e6fab6914 100644 --- a/usr.sbin/fstyp/apfs.c +++ b/usr.sbin/fstyp/apfs.c @@ -1,4 +1,6 @@ /* + * SPDX-License-Identifier: BSD-2-Clause + * * Copyright (c) 2019 Conrad Meyer . All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/usr.sbin/fstyp/cd9660.c b/usr.sbin/fstyp/cd9660.c index e981a5978dd4..73a18b16edea 100644 --- a/usr.sbin/fstyp/cd9660.c +++ b/usr.sbin/fstyp/cd9660.c @@ -1,4 +1,6 @@ /*- + * SPDX-License-Identifier: BSD-2-Clause + * * Copyright (c) 2004 Pawel Jakub Dawidek * Copyright (c) 2014 The FreeBSD Foundation * All rights reserved. diff --git a/usr.sbin/fstyp/exfat.c b/usr.sbin/fstyp/exfat.c index 8f8393b861fb..bb3d0eabed75 100644 --- a/usr.sbin/fstyp/exfat.c +++ b/usr.sbin/fstyp/exfat.c @@ -1,4 +1,6 @@ /* + * SPDX-License-Identifier: BSD-2-Clause + * * Copyright (c) 2017 Conrad Meyer * All rights reserved. * diff --git a/usr.sbin/fstyp/ext2fs.c b/usr.sbin/fstyp/ext2fs.c index d7110f6896ce..90af4f986ee4 100644 --- a/usr.sbin/fstyp/ext2fs.c +++ b/usr.sbin/fstyp/ext2fs.c @@ -1,4 +1,6 @@ /*- + * SPDX-License-Identifier: BSD-2-Clause + * * Copyright (c) 2005 Stanislav Sedov * Copyright (c) 2014 The FreeBSD Foundation * All rights reserved. diff --git a/usr.sbin/fstyp/fstyp.c b/usr.sbin/fstyp/fstyp.c index dd06df33bbe2..853fdd839713 100644 --- a/usr.sbin/fstyp/fstyp.c +++ b/usr.sbin/fstyp/fstyp.c @@ -1,4 +1,6 @@ /*- + * SPDX-License-Identifier: BSD-2-Clause + * * Copyright (c) 2014 The FreeBSD Foundation * * This software was developed by Edward Tomasz Napierala under sponsorship diff --git a/usr.sbin/fstyp/fstyp.h b/usr.sbin/fstyp/fstyp.h index d87cac456379..322f117dd29f 100644 --- a/usr.sbin/fstyp/fstyp.h +++ b/usr.sbin/fstyp/fstyp.h @@ -1,4 +1,6 @@ /*- + * SPDX-License-Identifier: BSD-2-Clause + * * Copyright (c) 2014 The FreeBSD Foundation * * This software was developed by Edward Tomasz Napierala under sponsorship diff --git a/usr.sbin/fstyp/geli.c b/usr.sbin/fstyp/geli.c index 17d1faf8407f..aa4c1bc2c955 100644 --- a/usr.sbin/fstyp/geli.c +++ b/usr.sbin/fstyp/geli.c @@ -1,4 +1,6 @@ /*- + * SPDX-License-Identifier: BSD-2-Clause + * * Copyright (c) 2015 Allan Jude * All rights reserved. * diff --git a/usr.sbin/fstyp/hammer.c b/usr.sbin/fstyp/hammer.c index 45aee42fb53a..2785e42c9998 100644 --- a/usr.sbin/fstyp/hammer.c +++ b/usr.sbin/fstyp/hammer.c @@ -1,4 +1,6 @@ /*- + * SPDX-License-Identifier: BSD-2-Clause + * * Copyright (c) 2016-2019 The DragonFly Project * Copyright (c) 2016-2019 Tomohiro Kusumi * All rights reserved. diff --git a/usr.sbin/fstyp/hammer2.c b/usr.sbin/fstyp/hammer2.c index aeb29762fb6b..dfc4ef842cf1 100644 --- a/usr.sbin/fstyp/hammer2.c +++ b/usr.sbin/fstyp/hammer2.c @@ -1,4 +1,6 @@ /*- + * SPDX-License-Identifier: BSD-2-Clause + * * Copyright (c) 2017-2019 The DragonFly Project * Copyright (c) 2017-2019 Tomohiro Kusumi * All rights reserved. diff --git a/usr.sbin/fstyp/hammer2_disk.h b/usr.sbin/fstyp/hammer2_disk.h index 6efefe9a2495..5de82e205ffc 100644 --- a/usr.sbin/fstyp/hammer2_disk.h +++ b/usr.sbin/fstyp/hammer2_disk.h @@ -1,4 +1,6 @@ /*- + * SPDX-License-Identifier: BSD-3-Clause + * * Copyright (c) 2011-2018 The DragonFly Project. All rights reserved. * * This code is derived from software contributed to The DragonFly Project diff --git a/usr.sbin/fstyp/hammer_disk.h b/usr.sbin/fstyp/hammer_disk.h index 4b5182d7e868..87ecfab0cf09 100644 --- a/usr.sbin/fstyp/hammer_disk.h +++ b/usr.sbin/fstyp/hammer_disk.h @@ -1,4 +1,6 @@ /*- + * SPDX-License-Identifier: BSD-3-Clause + * * Copyright (c) 2007 The DragonFly Project. All rights reserved. * * This code is derived from software contributed to The DragonFly Project diff --git a/usr.sbin/fstyp/hfsplus.c b/usr.sbin/fstyp/hfsplus.c index bdeaaa3b397c..580f8974fec1 100644 --- a/usr.sbin/fstyp/hfsplus.c +++ b/usr.sbin/fstyp/hfsplus.c @@ -1,4 +1,6 @@ /* + * SPDX-License-Identifier: BSD-2-Clause + * * Copyright (c) 2019 Conrad Meyer . All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/usr.sbin/fstyp/msdosfs.c b/usr.sbin/fstyp/msdosfs.c index cd0a67243a15..16db364ed430 100644 --- a/usr.sbin/fstyp/msdosfs.c +++ b/usr.sbin/fstyp/msdosfs.c @@ -1,4 +1,6 @@ /*- + * SPDX-License-Identifier: BSD-2-Clause + * * Copyright (c) 2004 Pawel Jakub Dawidek * Copyright (c) 2006 Tobias Reifenberger * Copyright (c) 2014 The FreeBSD Foundation diff --git a/usr.sbin/fstyp/msdosfs.h b/usr.sbin/fstyp/msdosfs.h index 91fe5967cd03..8c83c9862f84 100644 --- a/usr.sbin/fstyp/msdosfs.h +++ b/usr.sbin/fstyp/msdosfs.h @@ -1,4 +1,6 @@ /*- + * SPDX-License-Identifier: BSD-2-Clause + * * Copyright (c) 2006 Tobias Reifenberger * All rights reserved. * diff --git a/usr.sbin/fstyp/ntfs.c b/usr.sbin/fstyp/ntfs.c index be8095d5ee27..28a635097315 100644 --- a/usr.sbin/fstyp/ntfs.c +++ b/usr.sbin/fstyp/ntfs.c @@ -1,4 +1,6 @@ /*- + * SPDX-License-Identifier: BSD-2-Clause + * * Copyright (c) 2005 Takanori Watanabe * Copyright (c) 2014 The FreeBSD Foundation * All rights reserved. diff --git a/usr.sbin/fstyp/ufs.c b/usr.sbin/fstyp/ufs.c index 5133febbf065..4e676faae493 100644 --- a/usr.sbin/fstyp/ufs.c +++ b/usr.sbin/fstyp/ufs.c @@ -1,4 +1,6 @@ /*- + * SPDX-License-Identifier: BSD-2-Clause + * * Copyright (c) 2002, 2003 Gordon Tetlow * Copyright (c) 2006 Pawel Jakub Dawidek * Copyright (c) 2014 The FreeBSD Foundation diff --git a/usr.sbin/fstyp/zfs.c b/usr.sbin/fstyp/zfs.c index 6fde88c79524..0e54c8260c96 100644 --- a/usr.sbin/fstyp/zfs.c +++ b/usr.sbin/fstyp/zfs.c @@ -1,4 +1,6 @@ /*- + * SPDX-License-Identifier: BSD-2-Clause + * * Copyright (c) 2015 Allan Jude * Copyright (c) 2015 Xin LI * From nobody Tue May 12 18:07:49 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 4gFPhQ5Rpbz6crJ9 for ; Tue, 12 May 2026 18:07:50 +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 "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gFPhQ07Dnz3DTY for ; Tue, 12 May 2026 18:07:50 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778609270; 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=60EZorZQ0ovFJoamPDdqycGkJCc0UO8E6Qcxb5jdnRE=; b=xWz+CmgdI5Ye9/2QjwEw4nqEz/0awRO45j+MuH4DgWTP+uWMpMEEhZvYAAwoMECruHk6BG AVepO15UKljuwSw79si0ZpHhR1jaGQ4Lvl0ZHBN6onUu+Hyw7aQr62wnw8kU26MTtbxJUH QzKM6pqgx59CDCiDLKtbifobaJns1MtKBkOrRpboMiwBjDodNT+STsyisGZ5+gSmX8daLz PcOOXsov5qnFIkyhrOCbPb6POKR8t3+Gk+G9rkux7ALiq233ZURkOLdaHDGPndH+M6S9dA 61+O4IxQOBuX3E22kQR+D7YS5WLh8HRvkULkg4WvWr5uufmpxXpOu7Bk72+kpw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778609270; a=rsa-sha256; cv=none; b=kX+AJZJZYMSz1UMptVbUz+absvXe4zynDqQ8q7G6CxaGGmtxcGMWzyg3zXFXOROgXDlMgp dWaEqJSWg/80WsQSjgsEGAxb5jko809FPeo2+IXpy9g5W7cttTZMsYXgerE5iLjJe1+nCx DlBwztDMDTh2rgOJzkb+gdtGl1oLPkPXiTCYI1Hy0POBXDjYSBMHf6LqTtFQEHsDPLGVJz 6lIHry4glUE6arQYJXQqPxRNiSQ5az735BszOXHHXHRXAegnffJ0hVPZzA60lHfJbDONq9 H5tH5X4CTkH0GvP/WEXIsgV9YPpr6KorZxfl/7s7h7H56DbIW86++TZMJMdhHw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778609270; 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=60EZorZQ0ovFJoamPDdqycGkJCc0UO8E6Qcxb5jdnRE=; b=a4D/ycf2OHw+g+igcA/QB/QB7EP9eJv2055gdU4U1nsE7dOMhpQN636cYFDp8sR/Z+Sn1x oN5b12YI1UofgEPj6gWX9H6wYgIFZ69kWvE2yZwlfeMFkyuxwVVFiRLj9BpdCdt1cU9V0/ 8nC5Pm+mttnX08est7ho/oWjXwtUjnyLJBNy0tEWmh2KM34L0RKWjY3xVJxY+GOo3+FugO sPC34ApyLZmbrPUU4ZpxyOs/+nLq6Ww5YF9wjbG/YdpQKmirQ0R6rvNmIM9XpZmlxmkeZ6 gmY90Rve7Z3UTdqKEkkhPKq7ugD15jXTHW63AefJCvpEL4X7WBDI+B+IhMM2Yw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gFPhP6BC1z9F for ; Tue, 12 May 2026 18:07:49 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 4516d by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 12 May 2026 18:07:49 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Tuukka Pasanen From: Ed Maste Subject: git: 025f886b1eb1 - stable/15 - makefs: Add SPDX-License-Identifier tags 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: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org List-Id: 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: emaste X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 025f886b1eb1d966e804abde139a245f9fdff5fd Auto-Submitted: auto-generated Date: Tue, 12 May 2026 18:07:49 +0000 Message-Id: <6a036c75.4516d.4767f7d9@gitrepo.freebsd.org> The branch stable/15 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=025f886b1eb1d966e804abde139a245f9fdff5fd commit 025f886b1eb1d966e804abde139a245f9fdff5fd Author: Tuukka Pasanen AuthorDate: 2026-02-16 09:26:43 +0000 Commit: Ed Maste CommitDate: 2026-05-12 18:06:26 +0000 makefs: Add SPDX-License-Identifier tags Reviewed by: emaste Sponsored by: The FreeBSD Foundation (cherry picked from commit 6010b73fa9574b8e651b08451f30ba9c05f3f894) --- usr.sbin/makefs/msdos.c | 2 ++ usr.sbin/makefs/msdos.h | 2 ++ 2 files changed, 4 insertions(+) diff --git a/usr.sbin/makefs/msdos.c b/usr.sbin/makefs/msdos.c index 3707481a1c47..76c6ec05c71b 100644 --- a/usr.sbin/makefs/msdos.c +++ b/usr.sbin/makefs/msdos.c @@ -1,6 +1,8 @@ /* $NetBSD: msdos.c,v 1.20 2017/04/14 15:40:35 christos Exp $ */ /*- + * SPDX-License-Identifier: BSD-2-Clause + * * Copyright (c) 2013 The NetBSD Foundation, Inc. * All rights reserved. * diff --git a/usr.sbin/makefs/msdos.h b/usr.sbin/makefs/msdos.h index 376713051d52..80c2d4c39593 100644 --- a/usr.sbin/makefs/msdos.h +++ b/usr.sbin/makefs/msdos.h @@ -1,6 +1,8 @@ /* $NetBSD: msdos.h,v 1.3 2015/10/16 16:40:02 christos Exp $ */ /*- + * SPDX-License-Identifier: BSD-2-Clause + * * Copyright (c) 2013 The NetBSD Foundation, Inc. * All rights reserved. * From nobody Tue May 12 19:00:52 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 4gFQsd2cT1z6cw88 for ; Tue, 12 May 2026 19:00:53 +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 "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gFQsc6wVMz3Pnf for ; Tue, 12 May 2026 19:00:52 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778612453; 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=F3sfRDeXUE0GtABXaPL5ora9/tYPz7wecPclWApEWU0=; b=tVwxylvrOL27NHPOCf24m/LXf014NYrQSH7XZgsdeiIoLiyV/A4UkF4vt6FvTVOO1rGfMB IJv4RSemd1RA/UpzNqugYtgH0cI9eRsJScuwadhTO4JivWV66Wsgkz7nERneubjKDjIAiX wGSmvI1ICWSpDvNKi6Zu8gzWOCqdMAdk7xGWG48g0rNV/BXzByRb12aXBg379wmtUIPS6Y RU6uDnBo5+dcVWBJEOcp61j53YXu7qU8Vi2yAxj7Uzsevck1wxPPUESYZAFUJ64JIyOEX6 LVJT4naHE8x9QCRqrq13WfghzuxgfRRldwKz2sVUrrRVOnNerjTPg7KoxujJ6A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778612453; a=rsa-sha256; cv=none; b=Ma4Je6b1gkhxl3EklwYx6bMLTeoWehVAa3aOlSLah6w15xw5A6buCZGid8lrmExDh78Hju YLIYexhosTlx3LFoFh3QNT5bbAJPwTxdhIV9kaH0nlhPuv2hlsXLAJaqm8O0mDPUjMTmbJ gNNr2mK2TO829SYrx2IHvIQu7uU5gHyqSPZJ4PjgFD+85jiqG6u1MRh5Dnl/VXQKi6tFBX ez9YVAr/TW+tTF4cpelu1RZAaMLzoWs0Isq36XJvJ+XVmAuB5/2Hdh5q9Ev/a7hsX6jVwe M4k3Ttac+oMBGPkrwOo8vmOtRCT1kLDNOaC7uNE1CjQ3DMkB4nfiTgIBnCEzqA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778612453; 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=F3sfRDeXUE0GtABXaPL5ora9/tYPz7wecPclWApEWU0=; b=tswKZzcTdf7UCPJglejTRdGAHmghh16HqrpMArmo8rd4vPf69sTvcHUKwgZtlOu1qoI0iS Ph/e/nJ8t+sWypBVRHLATpgZwsfB6Nbxsm/1KeUPjsE7JY2UF2rlwZSQl3hUA+Jvl75EYt 3eaxq3fIRm2gVus9048kni0rQ2G4rHF1c/VkHDJYLRXlwu5G2ms0KMcIQnSekoUL82YjG2 gqgUOgy7PayPtjwU9/MkGv85aJm2rCzmumB9AcbLwrRheQp78+vMC04bvCOkCJYHndxGXo DRDRVn10oGpfAxq1pwcGaa2hEZnHiHjA61zo20fiEhJL4NpIUtnKJVLFkl/MmA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gFQsc6Tf3zv7 for ; Tue, 12 May 2026 19:00:52 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 196c9 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 12 May 2026 19:00:52 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Johan=?utf-8?Q? S=C3=B6llv?=ander From: Colin Percival Subject: git: 379805b29732 - releng/15.1 - ctld: normalize iSCSI TargetName on login 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: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org List-Id: 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: cperciva X-Git-Repository: src X-Git-Refname: refs/heads/releng/15.1 X-Git-Reftype: branch X-Git-Commit: 379805b29732c4160fbbd6d109e9a5a1585d8e6f Auto-Submitted: auto-generated Date: Tue, 12 May 2026 19:00:52 +0000 Message-Id: <6a0378e4.196c9.172920a3@gitrepo.freebsd.org> The branch releng/15.1 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=379805b29732c4160fbbd6d109e9a5a1585d8e6f commit 379805b29732c4160fbbd6d109e9a5a1585d8e6f Author: Johan Söllvander AuthorDate: 2026-04-24 07:44:43 +0000 Commit: Colin Percival CommitDate: 2026-05-12 19:00:43 +0000 ctld: normalize iSCSI TargetName on login Case-insensitive TargetName matching on logins was accidentally removed, let's fix that by normalizing TargetName again according to RFC 3722. Approved by: re (cperciva) PR: 294522 Fixes: 4b1aac931465f39c5c26bfa1d5539a428d340f20 Sponsored by: ConnectWise Reviewed by: asomers, jhb Approved by: asomers (mentor) Differential Revision: https://reviews.freebsd.org/D56469 (cherry picked from commit eb837cb8b2073c09bafaf3318f5bb103827b2bca) (cherry picked from commit 0baae6223a6350215d7b11264e59408362b15a19) --- usr.sbin/ctld/login.cc | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/usr.sbin/ctld/login.cc b/usr.sbin/ctld/login.cc index cda11cc1f21b..fb4b60c37f54 100644 --- a/usr.sbin/ctld/login.cc +++ b/usr.sbin/ctld/login.cc @@ -967,12 +967,18 @@ iscsi_connection::login() login_send_error(request, 0x02, 0x07); log_errx(1, "received Login PDU without TargetName"); } + /* + * Normalize target_name according to RFC 3722 + */ + std::string t_name(target_name); + for (char &c : t_name) + c = tolower(c); - conn_port = pg->find_port(target_name); + conn_port = pg->find_port(t_name); if (conn_port == NULL) { login_send_error(request, 0x02, 0x03); log_errx(1, "requested target \"%s\" not found", - target_name); + t_name.c_str()); } conn_target = conn_port->target(); } From nobody Tue May 12 19:00:51 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 4gFQsj3J54z6cw8D for ; Tue, 12 May 2026 19:00:57 +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 "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gFQsj0ckKz3PrM for ; Tue, 12 May 2026 19:00:57 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778612457; 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=R8upLhb1GW/tXPKiUBgvs3DNgE5nmlLG/Y0lBoExM/s=; b=n9KVLb8GxEjNomRd9HRLkj7Fp3iLxj/fRNb+E1GE1qDPUs8L+TWVTI3eDEP+vma2YJUctu eCox2/9vGdu8LUoGrd7Di7KGhDk0bChW9WTdWxinS66O08MCvvy7SNocD5KW+9FAGz0bqd GLydHiwrZ6oGIe5JACN+rjSVnTUZTLGeJDYDc17JTAhfasZbWFSuQE+k7vQSYnxkRGZRhz sO4PQD8sl6L6ExLdjZBP9VOe9qcxgJqjtPrM0gCJzfF7lBUt2EoKWE9riu3dRwZ0PDMvfF EQuKDniSix+neKa1xbUCFswMcAiTG4lvu8WG+tm7GRi/IZbsMGXGQQY2Qbz8Sg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778612457; a=rsa-sha256; cv=none; b=hBrlsaLzUggIRi1Z4Vd8od5uMRcyPNO/OgsxRyQE+cZzKWIgB/Xw+n4oXM6NcMmI+IbjxP vgPy45AHXTc1Bdk8vAGCMasp/L0XWF5Ssd2QDKMB6j5TAsUVPV8WycoTI4siGidQlCrD+g JLW8HRmIGxOS+pBYf7lnLbtAyV1ASdipH0ST7uMgvmLfVCZwgIf5IrtdHR4yknkccilAzE 1SdRdxWVYIq8GEeSJICpSlndP82uAN4O9Zb2G1P6LQWpMsZX50n1AqV/Grv2W1g+8m0kJg QtJP/gvEN0npvEbzEU8d5NgjM9K2Y/aGXLG+Mz/47ayilseYEhKZvUot0DE3Zg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778612457; 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=R8upLhb1GW/tXPKiUBgvs3DNgE5nmlLG/Y0lBoExM/s=; b=Ov69T/HhFYdbcpwnKOFWU6rr8TPy2i52gL/MISj8YpWD4wzMwuX11lTXHeb5jU1wc/gTcL O5DEKONPEq/8qYvQ/gkmKFEJbxShnFKl7exk/ioIr9nd8Hgc9fTFksmqTlO3YNLejdcw1x iAnSMfrE8YB5ewxqlM6gyEZ+w1TJ6sGJYtew1DNkdcCLRLEY90ra/ywe9nlilXwOy1+hiY ERSXyaB2qi/TnHxwwCDKYKJspI1A+Ae1eCtV5LAC6AUO+Zh1euMjd2HKR0PGejwKZxdbnH PQR/mb+2a9NgzrfzATTznsv716YnEwgWYc3CUq5Z/xXira5lieb0B/dqzyMTxw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gFQsh5q3gz1bl for ; Tue, 12 May 2026 19:00:56 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 19662 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 12 May 2026 19:00:51 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Lianwei Wang From: Colin Percival Subject: git: a7bc1c0c353f - releng/15.1 - fsck_msdosfs: fix FAT header correction not persisting in cache mode 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: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org List-Id: 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: cperciva X-Git-Repository: src X-Git-Refname: refs/heads/releng/15.1 X-Git-Reftype: branch X-Git-Commit: a7bc1c0c353fc426ecfc98d42c807c74250c137d Auto-Submitted: auto-generated Date: Tue, 12 May 2026 19:00:51 +0000 Message-Id: <6a0378e3.19662.b76267f@gitrepo.freebsd.org> The branch releng/15.1 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=a7bc1c0c353fc426ecfc98d42c807c74250c137d commit a7bc1c0c353fc426ecfc98d42c807c74250c137d Author: Lianwei Wang AuthorDate: 2026-05-09 04:56:12 +0000 Commit: Colin Percival CommitDate: 2026-05-12 19:00:33 +0000 fsck_msdosfs: fix FAT header correction not persisting in cache mode When fsck_msdosfs runs with FAT32 cache mode (used for large filesystems that cannot be mmap'd), a detected FAT header correction was written into the in-memory buffer but the corresponding cache entry (fat32_cache_allentries[0]) was never marked dirty. As a result, fat_flush_fat32_cache_entry() skipped it, the corrected bytes were never written to disk, and copyfat() propagated the uncorrected on-disk data to all backup FAT copies. Every subsequent fsck run would repeat the same "FAT starts with odd byte sequence / FIXED" cycle indefinitely. Fix by marking fat32_cache_allentries[0].dirty = true after applying the in-memory correction, ensuring the chunk is flushed before copyfat() runs. Approved by: re (cperciva) Obtained from: https://android-review.googlesource.com/c/platform/external/fsck_msdos/+/4047981 (cherry picked from commit 10e342c1ec78af5a0b97739c806b16a632118fa5) (cherry picked from commit ae32d61a2e3e47bed54d861893d8e2da90fb7c76) --- sbin/fsck_msdosfs/fat.c | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/sbin/fsck_msdosfs/fat.c b/sbin/fsck_msdosfs/fat.c index 567bfcd428cb..5ead0b1bf783 100644 --- a/sbin/fsck_msdosfs/fat.c +++ b/sbin/fsck_msdosfs/fat.c @@ -927,6 +927,17 @@ readfat(int fs, struct bootblock *boot, struct fat_descriptor **fp) default: break; } + /* + * In cache mode the header lives in + * fat32_cache_allentries[0]. Mark it + * dirty so it is flushed to disk (either + * on eviction or in writefat()) before + * copyfat() copies the primary FAT to + * backup copies. + */ + if (fat->use_cache) + fat->fat32_cache_allentries[0].dirty = + true; } } } From nobody Tue May 12 19:10:25 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 4gFR4d2VMQz6cwbT for ; Tue, 12 May 2026 19:10:25 +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 "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gFR4d1zwQz3Ryf for ; Tue, 12 May 2026 19:10:25 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778613025; 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=dmE+1OubpdTI+5I5r5Vb5wVon7JpubmjWRsmoTF6pwg=; b=j+yW+WLbGte07ELIgy4FX5nXoGxf1lnjlqLTzNXzlfaIU01VwdFeD2ZbmvZUjaqxVVZbli dbVFjh1DQx65g64YViLsMQxb6zsigQzQf69Pz4aoF//GORDbrWpwj0MGIi/bw4UC0sFVXH BRwo8hblLniAKaBQEXzkiJVVNWomW0xGfcBNk/BjX7ImToYSXSk4Lw55M6Uinnnv35kCU4 aFXhrN2I6xT+N1ne8BWSLTPIoLSLU4Amd8uVnBYWas8JbvKmus9iCXB3u3+JKxSH3fxhw3 UyMNPTtJGyXnY82cjttHEl4JWuXcB5e9X9nZHXXI/X6U3BHQTe9IBZOqv1FXKg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778613025; a=rsa-sha256; cv=none; b=P6QKhF2bBaffmaxBVIdH4r/0wxtLjCxE6kBXjcCzg/S0Qrfc1kJKGmvmg1ZjKiwbK2rNgo QnD+uYOPEuKNf/HrmWGT8k1scqDj6oopv73Tr5dBXRJHAIrajunVg4WiKIzMb1y8tgzfBh dyiKmEoUDBrHHUKhDQX1FlfB2RfOqxWrzD5L3JjlFcN/E7zlf6vQIDiz4fOmUoNy+mz9yP fZl7o2g7sZLhUZjS43iMeZUZybY0zXfnC7JFq+vflEwCdBnP+i/OGnMRdpU0Uo3iU9UKOM 2HxIcrSh043IDC/GKdmyuIASeJ92csWuZqXjCtzqpepTVCKsnKJ2vyjp1g03fA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778613025; 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=dmE+1OubpdTI+5I5r5Vb5wVon7JpubmjWRsmoTF6pwg=; b=wZ3bcH5uUd4c2UsBh+Ve8Mb/ZJZrwRGihe0W83K5G0Nlb1pAEeSnliiVYZpiJJqKel3vB9 sIbbLe4pS0oSvPq3V/xh0lW9QSrXaMDUfvUAn9Xvf06qY0in2s5Df6zA4wUs5/LP+QEfZq s+rXUGO3wCaInvBoZ7Ab0ivP52xHdmI0oXLm8KsX/ntOuFuah8AimLPYOHuuI6u0bbSeOE AOi88yIxcoUzxdVTV4RIR78Tmt8w60TcrF5gY3WHDsrjBS6ARHme8WDPg1sG5aKBuOn8db FyV3TtoMZLluvsdlSuSan1kBT9JuKdrIjt0ToW9hYA3D7UfyStBTXh+JuKKjEQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gFR4d1XLtz1l0 for ; Tue, 12 May 2026 19:10:25 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1c7a9 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 12 May 2026 19:10:25 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dag-Erling=?utf-8?Q? Sm=C3=B8rg?=rav Subject: git: 714f6ac00034 - stable/15 - BSD.root.dist: Correct tag for /etc/sysctl.kld.d 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: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org List-Id: 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: des X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 714f6ac0003482d3270a9d0026e59909cff73c3f Auto-Submitted: auto-generated Date: Tue, 12 May 2026 19:10:25 +0000 Message-Id: <6a037b21.1c7a9.6c790c92@gitrepo.freebsd.org> The branch stable/15 has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=714f6ac0003482d3270a9d0026e59909cff73c3f commit 714f6ac0003482d3270a9d0026e59909cff73c3f Author: Dag-Erling Smørgrav AuthorDate: 2026-05-09 09:04:08 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2026-05-12 19:10:12 +0000 BSD.root.dist: Correct tag for /etc/sysctl.kld.d This is only used by rc.subr and belongs in rc, not runtime. Fixes: fa6d67cd16b5 ("BSD.root.dist: Add package tag for all directories") MFC after: 3 days Reviewed by: ivy Differential Revision: https://reviews.freebsd.org/D56900 (cherry picked from commit 44338ccd12685621c4b1c57e692a4f27f5a655d3) --- etc/mtree/BSD.root.dist | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/etc/mtree/BSD.root.dist b/etc/mtree/BSD.root.dist index d5ef29c51a92..274397769cac 100644 --- a/etc/mtree/BSD.root.dist +++ b/etc/mtree/BSD.root.dist @@ -105,7 +105,7 @@ untrusted tags=package=caroot .. .. - sysctl.kld.d tags=package=runtime + sysctl.kld.d tags=package=rc .. syslog.d tags=package=syslogd .. From nobody Tue May 12 22:28:14 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 4gFWSt47Y1z6dCRf for ; Tue, 12 May 2026 22:28:14 +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 "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gFWSt2Lqfz45lX for ; Tue, 12 May 2026 22:28:14 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778624894; 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=OlXNCZLHjLtVgEdN1PJ/TCiOt81MpFu9u2vl2PXEnTs=; b=iBV7gP9RNfFfb60NxV8p8thE+kR6qCNI1Zg2eDowIKDc+aRQIbdUNzk0TGUZQ2i+Ow2N2/ BB1ep3VJSQsMyL4rSCwcUJ04uo21gHN7XnEpPp0xHyfB2Oiz+2xhgfnqipT20IPG5A9SCj sbGutnY4jUUECqp5giPXUhKtqbLfOJO2M+NWjZmnK+UQjbZs0SHVjCWK0tgMvJXoMuNO/w FplOAw7/2CVvLzsC8s6XMyH7VaqFWJ8VMYNv8DD6GWy4Ua7wSXiCt0SsiNldApKy4YxR3u gyExTq0TfwHgO4DQy+ybOOOWsGiqFQUbLBZJFm6Fx/OSFltOjsxT4siVplrJTw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778624894; a=rsa-sha256; cv=none; b=Dmy8m4f91EDfPQRgVv1EvVIsL3dRDabPA98oNZgLBq4Xo7OYkHjrWd+dx8HZ+7BOZk2ncV JWBDS4U0sRK5whIt+alVugRPNoBDhv4fdPmOaT0VOmTIXrjasELV0UOk6fYbpbgZGeMk95 85xanseIjrn02FSW2ZPPTa98gDb1VxtyKp5/+BA3yN1z0+b2ERjdaH5qy4X9tzChFu2HTW zsHuUfYeRahel5oATOxlsfglIiVWaha3XM+eJY9JswWmj385EMOR72M7UMvXqaHIvLmT0s dcPLPireMRkokPkSM5R6KTFLbr+gTQL88B0muOVbNJ1q5XznqR0U2i4XyRgDmA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778624894; 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=OlXNCZLHjLtVgEdN1PJ/TCiOt81MpFu9u2vl2PXEnTs=; b=Sb9uCeCKFzAp8131oM+F0I5p0L3NrKzbQhW1GXe44ArGovGz8hhkVxaUbz7/vWrn5nH8+u sJSXWzWc8ak73FewPs2qXvDIcrTIxRlG+2H0MRnTfKFPQcAaFdJeOssvF89k0BD43RA8u2 PKKE/nEaidYUxYeIkYjF/05R7d0VUdyUs2Kufg2WdeeGJYOlBSizFYObIy4m7zZMxtGztI bZVQ/B1tflwLZL4Tg7PO+yhN3FFm0Hy4WG8Hw0WvQT9qaLwY8mE5ztmuG62/Swdy69+mVY 92Ki0zPFYvccMey/YJ5klPnCIsDUJF692sydz5qDo9bakW2J4t18UO94vg2rug== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gFWSt1vbFz6tT for ; Tue, 12 May 2026 22:28:14 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 399ec by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 12 May 2026 22:28:14 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dave Cottlehuber Subject: git: d889f6c466d4 - stable/15 - release/tools: use same pkg settings in containers as in /etc/pkg/FreeBSD.conf 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: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org List-Id: 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: dch X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: d889f6c466d4cec73c34bc71093d08b25e321071 Auto-Submitted: auto-generated Date: Tue, 12 May 2026 22:28:14 +0000 Message-Id: <6a03a97e.399ec.7290eca8@gitrepo.freebsd.org> The branch stable/15 has been updated by dch: URL: https://cgit.FreeBSD.org/src/commit/?id=d889f6c466d4cec73c34bc71093d08b25e321071 commit d889f6c466d4cec73c34bc71093d08b25e321071 Author: Dave Cottlehuber AuthorDate: 2026-01-27 22:51:22 +0000 Commit: Dave Cottlehuber CommitDate: 2026-05-12 22:22:57 +0000 release/tools: use same pkg settings in containers as in /etc/pkg/FreeBSD.conf Instructions in /etc/pkg/FreeBSD.conf and elsewhere recommend putting changes in /usr/local/etc/pkg/repos/FreeBSD.conf so bring OCI containers into line as well. Reviewed by: dfr, ivy Differential Revision: https://reviews.freebsd.org/D54090 MFC after: 5 days Sponsored by: SkunkWerks, GmbH (cherry picked from commit c73ae67348998a0056145e88debbea9ff6860c4f) --- release/tools/oci-image-static.conf | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/release/tools/oci-image-static.conf b/release/tools/oci-image-static.conf index 8e642d9defce..e2231d951268 100644 --- a/release/tools/oci-image-static.conf +++ b/release/tools/oci-image-static.conf @@ -36,12 +36,8 @@ oci_image_build() { ;; esac mkdir -p $m/usr/local/etc/pkg/repos - cat > $m/usr/local/etc/pkg/repos/base.conf < $m/usr/local/etc/pkg/repos/FreeBSD.conf <; Wed, 13 May 2026 00:24:25 +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 "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gFZ2x15S8z3Rpr for ; Wed, 13 May 2026 00:24:25 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778631865; 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=qFuaqnI2u5Mo1xgqAD5Llr0LTC1bWYidpYvmzHdzX14=; b=o8qy0WyhLso6wAnIPDzELiyT+sDjHFVWTKcUKpixENjOTx8+/6Zfi8QkB2uTh09ilKTXyk +T3TSLWE8mlsgyFXdBpSWUpyEzl393KjIB+Ag+OuDuxEmTMcyzIGU2ZicpnPdqjkW5uyxL 1e/S3PgJoelb7FD3t02AEOLeVzfrTZQaGHpJRKQHIxoHGk74NkTXoRvE5a0pRgQh+48/rX gznbMgA3G0fwRQzJWjdfPYos/cjnDzPAJqvwGRLpZvBWQa025lu8J1asVgAECHgnouRw/Y xfx2tKs9qasQqipuCFlWz+HGBHgOeYmCMav9jtmgY+pkM8xIl06JAbmUfSZqaQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778631865; a=rsa-sha256; cv=none; b=ETxKhwbKCk2V70T7OJPeybDCCZnblu/8hFq2KvPBBK6yMq/qeJ9HCccmf3HTq3+4v62xEY HCKLaYfvG7ye5Y1CDI3CyMvzku90vMWEDWOXm+Mu29tI2T6UbMLQRRDteLUZJXFiouirjt 6HPYF5mf48qWtlhH59Ky+AdBtKfsFTaaggBuzRtou6kejVQPLeJO9md3tmcE+/PiPI6Zpy MrW8TZGeZIT5IUMYlesUtvXTpE7C84fQ73tzgluOL6oZA6arJT6/Xf+IRvuA9FixETrCa3 X5+I3V15x9nqhrBgYn1d/DskUd3PDxPIelboduexwzoYt+fBUiatpDp5cyvpxA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778631865; 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=qFuaqnI2u5Mo1xgqAD5Llr0LTC1bWYidpYvmzHdzX14=; b=OvUhkTOdh2QQjBpQCmkFHI8RaUHhmm2YASs+nx4pbTnmTm+zj6vXWrJAfxVdGnXXA5Wjl/ zU0T9NCT+G+38t9FRyLK95uXSk9tkCn8FtwiVQXizvj55JfqUu+Mo6FjPeBhLiZl6YDnTl QqTRyKi4SDbWFJXHpD/n9j7Lo1FoABfo9rYKpCgt8aT4bf/sc2mBihOlXXBBMpWLdv1rp3 b0m57vNSlsw/OOmHYoQr4J7p8WoRzonPEO9f7IrwNxvlHph25EawREGrCLVbTySPvraB2D DI9lh6r8Bi9OpNYAHZQK5ezMV5IMN60+nO6cS6Tzhk8fnVMoQc0DM8dEIcIrIg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gFZ2x0d28zBNN for ; Wed, 13 May 2026 00:24:25 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1eac1 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 13 May 2026 00:24:25 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Ariel Ehrenberg From: Konstantin Belousov Subject: git: 8c5cc4498499 - stable/15 - mlx5en: destroy TIR before DEK during TLS RX teardown 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: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org List-Id: 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: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 8c5cc4498499f9e3bb64cb6e8244ccd212ee514a Auto-Submitted: auto-generated Date: Wed, 13 May 2026 00:24:25 +0000 Message-Id: <6a03c4b9.1eac1.7be30e3@gitrepo.freebsd.org> The branch stable/15 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=8c5cc4498499f9e3bb64cb6e8244ccd212ee514a commit 8c5cc4498499f9e3bb64cb6e8244ccd212ee514a Author: Ariel Ehrenberg AuthorDate: 2026-04-15 21:45:07 +0000 Commit: Konstantin Belousov CommitDate: 2026-05-13 00:23:53 +0000 mlx5en: destroy TIR before DEK during TLS RX teardown (cherry picked from commit bf636accdde4bb9af2c6c07af5420dffffd82332) --- sys/dev/mlx5/mlx5_en/mlx5_en_hw_tls_rx.c | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/sys/dev/mlx5/mlx5_en/mlx5_en_hw_tls_rx.c b/sys/dev/mlx5/mlx5_en/mlx5_en_hw_tls_rx.c index 89d2010656c5..b6a9a0c01d09 100644 --- a/sys/dev/mlx5/mlx5_en/mlx5_en_hw_tls_rx.c +++ b/sys/dev/mlx5/mlx5_en/mlx5_en_hw_tls_rx.c @@ -596,14 +596,21 @@ mlx5e_tls_rx_work(struct work_struct *work) if (ptag->flow_rule != NULL) mlx5e_accel_fs_del_inpcb(ptag->flow_rule); + /* + * Destroy TIR before DEK. DESTROY_TIR for a TLS- + * enabled TIR issues a TRA RX fence that drains all + * in-flight packets from the crypto pipeline. If the + * DEK were destroyed first, packets still in flight + * would hit a TPT encryption error (vendor syndrome + * 0x55) because the key they reference is already gone. + */ + if (ptag->tirn != 0) + mlx5_tls_close_tir(priv->mdev, ptag->tirn); + /* try to destroy DEK context by ID */ if (ptag->dek_index_ok) mlx5_encryption_key_destroy(priv->mdev, ptag->dek_index); - /* try to destroy TIR context by ID */ - if (ptag->tirn != 0) - mlx5_tls_close_tir(priv->mdev, ptag->tirn); - /* free tag */ mlx5e_tls_rx_tag_zfree(ptag); break; From nobody Wed May 13 01:12:14 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 4gFb672y5Vz6YDFH for ; Wed, 13 May 2026 01:12:15 +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 "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gFb665Zbmz3ZQV for ; Wed, 13 May 2026 01:12:14 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778634734; 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=+RBWj7BnqvSk4KNBXjBs8ey7fxy1IkGjzW90RehN39I=; b=SaEWKmmF8Yfds9c7sRy2Hgu9T5AocGbhVAZKSCxB+A4xW2vqbRgVYNCDuzeqsF5uLPNeJL 3zHlis806xbKLWNu8KVjx6a7mQkgo/TO2XGtGlKzP9doA37cGytJPAZTrFFDrrkK6RV933 r4Tutoh1OyMAI2oIQByllkAw8Fmi85H3jw1LNndomGBTcAFMX+ZFQMFoGiRVIRb2KLubPg F2Qk74kI7bEskhiZhTKGbczAdHEixL3jIe1fCW8W50Phm8J1Uq9j6uWICWTWIPIE61mxb2 U0rvZyq9DnLNP3WTJXNJcSk7Ql16MVf4duJQxduDRCf5CmurIWfd9AmiCcnxFA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778634734; a=rsa-sha256; cv=none; b=DRQ0m+F/geFP28lwrm1F1I7e5dXOIzIhCUfcMn5mcZ+xUADs8WbXnMEQWnjwIRvi8AndxE 3olt/dfemC6anWrMehjMwqmcLOtov6Gy2U8cNOXl/QtXZhiNTkCKHRMHHDXYmedhM4Bt6D 3nQjMl0VLR57tk3a/jaLG+EIu1PpH7MaBcC6yV3AWxpbCmhrlWnbTXQ1ZJKhTxOBYKwvGT ZSwPimcWXP1jLRYW1zTqNCcLXoz1k31EcPJQh0aDQjq6Zuh6DY596XP9frU8t7Ff6ra740 ByTjzsiupv7WqyihNyhn2X3v0TM1oOaAK/mTiBxBfF7PM+rBEM+5IJkEKRB3Bw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778634734; 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=+RBWj7BnqvSk4KNBXjBs8ey7fxy1IkGjzW90RehN39I=; b=avFJixa66ewog0qbM/BTtH5b/PmlXy9858HBebtx/83pNbcczbgzlPk6LfsZcVFD1j7Ijh Fl3yczTgnOuQoxOAuBItPQu/+V78ao3SyzFoGZsJkEMxmzwXC+0VIMr7C+pf0iAS9kgec3 6YGs/obvA1kS2Vu4Hm/TfsKKvDXVisq07jBc4utiKgYy/cWvXZKl2SMOGfN9u2UVdxoHRG PCQiOwvxj2uoudY5CJoYdj7a1gfo8NKuIWUsME5gJpwuekPybZ2vIKD4i0h8QcezIu7uMc RTxNml940jNN79iED6oJCRYqCwkpZKEwj3AY9IgdXVGCkW1agx2ctBCWDznX/g== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gFb665386zCTb for ; Wed, 13 May 2026 01:12:14 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 228b0 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 13 May 2026 01:12:14 +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: Colin Percival Subject: git: b66538ca983c - releng/15.1 - BSD.root.dist: Correct tag for /etc/sysctl.kld.d 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: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org List-Id: 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: cperciva X-Git-Repository: src X-Git-Refname: refs/heads/releng/15.1 X-Git-Reftype: branch X-Git-Commit: b66538ca983ce71043797e3b717c963ac1d308c5 Auto-Submitted: auto-generated Date: Wed, 13 May 2026 01:12:14 +0000 Message-Id: <6a03cfee.228b0.24110382@gitrepo.freebsd.org> The branch releng/15.1 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=b66538ca983ce71043797e3b717c963ac1d308c5 commit b66538ca983ce71043797e3b717c963ac1d308c5 Author: Dag-Erling Smørgrav AuthorDate: 2026-05-09 09:04:08 +0000 Commit: Colin Percival CommitDate: 2026-05-13 01:12:01 +0000 BSD.root.dist: Correct tag for /etc/sysctl.kld.d This is only used by rc.subr and belongs in rc, not runtime. Approved by: re (cperciva) Fixes: fa6d67cd16b5 ("BSD.root.dist: Add package tag for all directories") MFC after: 3 days Reviewed by: ivy Differential Revision: https://reviews.freebsd.org/D56900 (cherry picked from commit 44338ccd12685621c4b1c57e692a4f27f5a655d3) (cherry picked from commit 714f6ac0003482d3270a9d0026e59909cff73c3f) --- etc/mtree/BSD.root.dist | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/etc/mtree/BSD.root.dist b/etc/mtree/BSD.root.dist index d5ef29c51a92..274397769cac 100644 --- a/etc/mtree/BSD.root.dist +++ b/etc/mtree/BSD.root.dist @@ -105,7 +105,7 @@ untrusted tags=package=caroot .. .. - sysctl.kld.d tags=package=runtime + sysctl.kld.d tags=package=rc .. syslog.d tags=package=syslogd .. From nobody Wed May 13 09:10:26 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 4gFnjv1SVHz6d44M for ; Wed, 13 May 2026 09:10:27 +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 "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gFnjt6MpMz3HMf for ; Wed, 13 May 2026 09:10:26 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778663426; 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=G9nq/yIC5btdPgakF9lIniOWqwnjS+loaWw8/6XOWWk=; b=ScoGrArKB+Orz0IP9994YcM2WqtQX5EyCHGxHldBYKQCVDAK2uC2rCDN39BGpBLQgTa7OM JivufNp2WRNDSCdqwhA/bPnAHwWllxPuLACCKIf0mGzoF7gZGoHROLSMoP4v8RTmq9lpuG /ukpbrVzFFhZ2wBBj3loMDuac/5iHuRUIF6acIHJHeT3nNuG2olbYH9jv0TadGqnVPb2r9 01djRivfoc87LIaJFmMZqqXqO4c7dUxxOrQDFGkrVbjm4Xoyr9ntA3hP1qpiemVhsbkNYz NGYMpE79yWB+XOsxfywE9Gy21tXri5N9LvR/R4mxFmq2vTsA7m/NfjRp8CHcOw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778663426; a=rsa-sha256; cv=none; b=os9VSW6x0IbYFggs6lopa/Plp3wP9NgqRjIcW5rQbL30KV43w9xstUABF/KfB+YRKMsnML 9g8UO6cICMzz7ifirYZYSdfwEQD4lVHz/ypJ5X2nKBmuEMpwitNgHE/2Zv7BVKz8U0A6Bj 6YZTTVb623ljvRSz9ciVqTTubOp0CwfL8desEXsBfowKWZXlruqjBRgsHxDsaq8yAlk/yR ieonPFh5MWepIAiKByCK7z2kC6s6dTiQoeNu28dJ9OOnrDDkh4rsowBmaJql2uj+4Wv7Yj MbW8Jo2lgPCx+ev0rybwEe9iR31S1rmqMLKHd/EORtS0siArqa1JejJRWw6P0Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778663426; 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=G9nq/yIC5btdPgakF9lIniOWqwnjS+loaWw8/6XOWWk=; b=epe57LeVyLEopi0M2bNNXTTi5yllMPOadfNI56D17Gm7TKmUv4/rY8em60/I3zLnECRLAa zDZqgktQySzATmlT/le5PrwOhBKzxZen/EWsCcKkzt0+9gLs8V57yEOLeMFkNfnBmYthMe pE757mUU4BwQ/g9K5utZnUiIUNXstYdJG8DJLc4pGop3zFLeMbMCCnZReF8eFPrwBvArAN sKVf6Zk8DTvWYcOnOvqSCoIDjz67CI9u12Kxzbfmgeu5nbLs9Nk7jXp7XvdoqeR302o0Sx k6avF8I7Q3ka4ZekM7q3IR/RCYCM0OOBYvvr5MP0P+VmoEGpfknVrFvhlZ7Kuw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gFnjt5vn8zkxq for ; Wed, 13 May 2026 09:10:26 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3337e by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 13 May 2026 09:10:26 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Baptiste Daroussin Subject: git: 87b18b611ec9 - stable/15 - nuageinit: fix command injection and related issues 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: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org List-Id: 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: bapt X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 87b18b611ec9a70347fdd239345fa23977bcb2d0 Auto-Submitted: auto-generated Date: Wed, 13 May 2026 09:10:26 +0000 Message-Id: <6a044002.3337e.39e48fa3@gitrepo.freebsd.org> The branch stable/15 has been updated by bapt: URL: https://cgit.FreeBSD.org/src/commit/?id=87b18b611ec9a70347fdd239345fa23977bcb2d0 commit 87b18b611ec9a70347fdd239345fa23977bcb2d0 Author: Baptiste Daroussin AuthorDate: 2026-05-07 18:22:14 +0000 Commit: Baptiste Daroussin CommitDate: 2026-05-13 09:10:20 +0000 nuageinit: fix command injection and related issues - Add shell_escape() helper to safely escape shell arguments - Apply shell_escape to all user-controlled values in shell commands: adduser (usershow, useradd, lock, primary_group, groups) addgroup (groupshow, groupadd, members) exec_change_password (usermod) settimezone (tzsetup root and timezone) install_package (pkg package names) - Escape double quotes in hostname when writing rc.conf.d/hostname - Add missing 'local' declaration for resolvconf_command in nameservers() - Escape interface name in resolvconf -a command - Change open_resolvconf_conf() from 'w' to 'a' mode to prevent data loss when nameservers() is called multiple times - Clean up stale resolvconf.conf at the start of each boot (skip on postnet to preserve config written by first call) MFC After: 1 day (cherry picked from commit 8b70a203be10411c560ed303ab25713d70b316e9) --- libexec/nuageinit/nuage.lua | 43 +++++++++++++++++++++++------------- libexec/nuageinit/nuageinit | 17 ++++++++++++-- libexec/nuageinit/tests/nuageinit.sh | 6 ++--- 3 files changed, 46 insertions(+), 20 deletions(-) diff --git a/libexec/nuageinit/nuage.lua b/libexec/nuageinit/nuage.lua index 2d962b540b23..f3c23a7c3eb8 100644 --- a/libexec/nuageinit/nuage.lua +++ b/libexec/nuageinit/nuage.lua @@ -52,6 +52,10 @@ local function decode_base64(input) return table.concat(result) end +local function shell_escape(s) + return "'" .. string.gsub(s, "'", "'\\''") .. "'" +end + local function warnmsg(str, prepend) if not str then return @@ -121,7 +125,7 @@ local function sethostname(hostname) warnmsg("Impossible to open " .. hostnamepath .. ":" .. err) return end - f:write('hostname="' .. hostname .. '"\n') + f:write('hostname="' .. hostname:gsub('"', '\\"') .. '"\n') f:close() end @@ -199,7 +203,7 @@ local function adduser(pwd) if root then cmd = cmd .. "-R " .. root .. " " end - local f = io.popen(cmd .. " usershow " .. pwd.name .. " -7 2> /dev/null") + local f = io.popen(cmd .. " usershow " .. shell_escape(pwd.name) .. " -7 2> /dev/null") local pwdstr = f:read("*a") f:close() if pwdstr:len() ~= 0 then @@ -220,13 +224,17 @@ local function adduser(pwd) -- a warning but creates the user anyway. list = purge_group(list) if #list > 0 then - extraargs = " -G " .. table.concat(list, ",") + local escaped_list = {} + for _, g in ipairs(list) do + table.insert(escaped_list, shell_escape(g)) + end + extraargs = " -G " .. table.concat(escaped_list, ",") end end -- pw will automatically create a group named after the username -- do not add a -g option in this case if pwd.primary_group and pwd.primary_group ~= pwd.name then - extraargs = extraargs .. " -g " .. pwd.primary_group + extraargs = extraargs .. " -g " .. shell_escape(pwd.primary_group) end if not pwd.no_create_home then extraargs = extraargs .. " -m " @@ -248,9 +256,9 @@ local function adduser(pwd) if root then cmd = cmd .. "-R " .. root .. " " end - cmd = cmd .. "useradd -n " .. pwd.name .. " -M 0755 -w none " - cmd = cmd .. extraargs .. " -c '" .. pwd.gecos - cmd = cmd .. "' -d '" .. pwd.homedir .. "' -s " .. pwd.shell .. postcmd + cmd = cmd .. "useradd -n " .. shell_escape(pwd.name) .. " -M 0755 -w none " + cmd = cmd .. extraargs .. " -c " .. shell_escape(pwd.gecos) + cmd = cmd .. " -d " .. shell_escape(pwd.homedir) .. " -s " .. shell_escape(pwd.shell) .. postcmd f = io.popen(cmd, "w") if input then @@ -267,7 +275,7 @@ local function adduser(pwd) if root then cmd = cmd .. "-R " .. root .. " " end - cmd = cmd .. "lock " .. pwd.name + cmd = cmd .. "lock " .. shell_escape(pwd.name) os.execute(cmd) end return pwd.homedir @@ -283,7 +291,7 @@ local function addgroup(grp) if root then cmd = cmd .. "-R " .. root .. " " end - local f = io.popen(cmd .. " groupshow " .. grp.name .. " 2> /dev/null") + local f = io.popen(cmd .. " groupshow " .. shell_escape(grp.name) .. " 2> /dev/null") local grpstr = f:read("*a") f:close() if grpstr:len() ~= 0 then @@ -292,13 +300,17 @@ local function addgroup(grp) local extraargs = "" if grp.members then local list = splitlist(grp.members) - extraargs = " -M " .. table.concat(list, ",") + local escaped_list = {} + for _, m in ipairs(list) do + table.insert(escaped_list, shell_escape(m)) + end + extraargs = " -M " .. table.concat(escaped_list, ",") end cmd = "pw " if root then cmd = cmd .. "-R " .. root .. " " end - cmd = cmd .. "groupadd -n " .. grp.name .. extraargs + cmd = cmd .. "groupadd -n " .. shell_escape(grp.name) .. extraargs local r = os.execute(cmd) if not r then warnmsg("fail to add group " .. grp.name) @@ -484,7 +496,7 @@ local function exec_change_password(user, password, type, expire) postcmd = " -w random" end end - cmd = cmd .. "usermod " .. user .. postcmd + cmd = cmd .. "usermod " .. shell_escape(user) .. postcmd if expire then cmd = cmd .. " -p 1" else @@ -577,7 +589,7 @@ local function settimezone(timezone) root = "/" end - local f, _, rc = os.execute("tzsetup -s -C " .. root .. " " .. timezone) + local f, _, rc = os.execute("tzsetup -s -C " .. shell_escape(root) .. " " .. shell_escape(timezone)) if not f then warnmsg("Impossible to configure time zone ( rc = " .. rc .. " )") @@ -600,8 +612,8 @@ local function install_package(package) if package == nil then return true end - local install_cmd = "pkg install -y " .. package - local test_cmd = "pkg info -q " .. package + local install_cmd = "pkg install -y " .. shell_escape(package) + local test_cmd = "pkg info -q " .. shell_escape(package) if os.getenv("NUAGE_RUN_TESTS") then print(install_cmd) print(test_cmd) @@ -683,6 +695,7 @@ local function addfile(file, defer) end local n = { + shell_escape = shell_escape, warn = warnmsg, err = errmsg, chmod = chmod, diff --git a/libexec/nuageinit/nuageinit b/libexec/nuageinit/nuageinit index a1ebd3f52b25..fc8d9582b9c6 100755 --- a/libexec/nuageinit/nuageinit +++ b/libexec/nuageinit/nuageinit @@ -67,7 +67,14 @@ local function open_resolv_conf() end local function open_resolvconf_conf() - return openat("/etc", "resolvconf.conf") + local path_dir = root .. "/etc" + local path_name = path_dir .. "/resolvconf.conf" + nuage.mkdir_p(path_dir) + local f, err = io.open(path_name, "a") + if not f then + nuage.err("unable to open " .. path_name .. ": " .. err) + end + return f, path_name end local function get_ifaces_by_mac() @@ -271,8 +278,9 @@ local function nameservers(interface, obj) end -- Only call resolvconf with interface if interface is provided + local resolvconf_command if interface then - resolvconf_command = "resolvconf -a " .. interface .. " < " .. resolv_conf + resolvconf_command = "resolvconf -a " .. nuage.shell_escape(interface) .. " < " .. resolv_conf else resolvconf_command = "resolvconf -u" end @@ -738,6 +746,11 @@ local function load_userdata() return line, obj end +-- Clean up stale resolvconf.conf from previous boot +if citype ~= "postnet" then + os.remove(root .. "/etc/resolvconf.conf") +end + if citype == "config-2" then -- network config2_network(ni_path) diff --git a/libexec/nuageinit/tests/nuageinit.sh b/libexec/nuageinit/tests/nuageinit.sh index 1fd68d5a178e..89207fdf0aca 100644 --- a/libexec/nuageinit/tests/nuageinit.sh +++ b/libexec/nuageinit/tests/nuageinit.sh @@ -801,7 +801,7 @@ packages: - yeah/plop EOF chmod 755 "${PWD}"/media/nuageinit/user_data - atf_check -s exit:0 -o inline:"pkg install -y yeah/plop\npkg info -q yeah/plop\n" /usr/libexec/nuageinit "${PWD}"/media/nuageinit postnet + atf_check -s exit:0 -o inline:"pkg install -y 'yeah/plop'\npkg info -q 'yeah/plop'\n" /usr/libexec/nuageinit "${PWD}"/media/nuageinit postnet cat > media/nuageinit/user_data << 'EOF' #cloud-config @@ -809,7 +809,7 @@ packages: - curl EOF chmod 755 "${PWD}"/media/nuageinit/user_data - atf_check -o inline:"pkg install -y curl\npkg info -q curl\n" /usr/libexec/nuageinit "${PWD}"/media/nuageinit postnet + atf_check -o inline:"pkg install -y 'curl'\npkg info -q 'curl'\n" /usr/libexec/nuageinit "${PWD}"/media/nuageinit postnet cat > media/nuageinit/user_data << 'EOF' #cloud-config @@ -818,7 +818,7 @@ packages: - meh: bla EOF chmod 755 "${PWD}"/media/nuageinit/user_data - atf_check -o inline:"pkg install -y curl\npkg info -q curl\n" -e inline:"nuageinit: Invalid type: table for packages entry number 2\n" /usr/libexec/nuageinit "${PWD}"/media/nuageinit postnet + atf_check -o inline:"pkg install -y 'curl'\npkg info -q 'curl'\n" -e inline:"nuageinit: Invalid type: table for packages entry number 2\n" /usr/libexec/nuageinit "${PWD}"/media/nuageinit postnet } config2_userdata_update_packages_body() From nobody Wed May 13 14:04:50 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 4gFwFZ5wR0z6dRdm for ; Wed, 13 May 2026 14:04:50 +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 "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gFwFZ4zzVz3Mxd for ; Wed, 13 May 2026 14:04:50 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778681090; 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=RKR5F62MMUGjaP5g5vavRqs+9xRHYuSC17XieKPUY5M=; b=fYZ+eopdvoc+T/WIhMPV5cbhk1OVwiCWc5FfxKS4mrlVSgKZx/n48iLQUDBGAJeGGyUqKj 8W6XMc4EKait/+CP50weI4wfCiBzkhIfzfJvWkjnBSyhcRn4d1zmbKGFkLYUNO5mlOSu/k wu+Vkya4IagyONL5gMqGyLp5vc8xvK6IdgQIWR2s5wz/o/larc1TwFQHow6pnbI+3lZEAZ db8AIEZQplItybWax7wgVcLTS1nM+zAZdAvyHX4vRCUDcsIN+LI7zzaLE04yex14jX6F4j 9ktu9Mq643DNBZZ7fYBtsTSdrqty+nxIECNt0ovmKbA77aiveC3tYHwymmhrzA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778681090; a=rsa-sha256; cv=none; b=IqBriUx3WzMOSmVvNSe5fXcqKNdYhSf+MolbVTEJ1c5PHCavgrHo0HN5wt0SBA7KGjt5oY 8qta9wFAh1ujNMEJKROjaqFQmqujuEBSABxVtFdW5D8Noi0zawo/XPoJM54votHx00vK/m lVc42ZmWpKbL3m5de9V0qNeyFPhG650Fz5t9XX/a/hUVpqeorzq4f6LQ0JZbPkFFKygYOu Nm47E4505nnEFAu//z+jnxKyFUJGQGfgEFGgguqxThGKNwIVRQ45umw01K977uQyN1pgiR u///keKTPFdoLrUMCLV0F1qa8dUVGbMjDAD0RVo9dTNfdOS1E/dpt6ni8AJMDw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778681090; 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=RKR5F62MMUGjaP5g5vavRqs+9xRHYuSC17XieKPUY5M=; b=ZcIOqpD5YAcjeGsynrXm224O8Aj3bZgMwF/rwACNMfI1wvVY5wULD+sMiIQXXHFLKuoN4u CW2inA6n0RzLNtNmlydTu+Kn1vHzRM6H0BWslW837tmmSDtTioKFZMWXqtm78N+h4HKu+h U8geX2G8sus65broziJ/RW2rLaSp2MPM+cBF6S6hxt73/Erjaki2rU23MnTfOhUFgB395F ScRy/1wGZLXw2P6cLBZpYHrrJgc4GDj5bSNsz3v9AgrNfpINnkd35HgUYGbFPkyrQyPN1E 7KoKCOjhXrc4Vpp3q3Bb8dQ+xqmFMfpgbpRxNazzvVQwji2H6fueEf77lgsIcg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gFwFZ4VB0ztbD for ; Wed, 13 May 2026 14:04:50 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 23e72 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 13 May 2026 14:04:50 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Ed Maste Subject: git: 0cef1a9ae5ec - stable/15 - sys: Fix heap disclosure in compat7 kern.proc.filedesc sysctl 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: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org List-Id: 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: emaste X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 0cef1a9ae5ec90b2c4717de9bc33fc7c3b1fd705 Auto-Submitted: auto-generated Date: Wed, 13 May 2026 14:04:50 +0000 Message-Id: <6a048502.23e72.4f47b8e5@gitrepo.freebsd.org> The branch stable/15 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=0cef1a9ae5ec90b2c4717de9bc33fc7c3b1fd705 commit 0cef1a9ae5ec90b2c4717de9bc33fc7c3b1fd705 Author: Ed Maste AuthorDate: 2026-05-12 16:25:01 +0000 Commit: Ed Maste CommitDate: 2026-05-13 14:04:27 +0000 sys: Fix heap disclosure in compat7 kern.proc.filedesc sysctl Reported by: Yuxiang Yang, Yizhou Zhao, Ao Wang, Xuewei Feng, Qi Li, and Ke Xu from Tsinghua University using GLM-5.1 from Z.ai Reviewed by: markj Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D56976 (cherry picked from commit e68433e1990d5f1bcc1bdd270d65f1e4792a8e1b) --- sys/kern/kern_descrip.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/kern/kern_descrip.c b/sys/kern/kern_descrip.c index 2fa0621bdfca..ec9fbdae2fa7 100644 --- a/sys/kern/kern_descrip.c +++ b/sys/kern/kern_descrip.c @@ -5107,7 +5107,7 @@ sysctl_kern_proc_ofiledesc(SYSCTL_HANDLER_ARGS) return (ENOENT); } kif = malloc(sizeof(*kif), M_TEMP, M_WAITOK); - okif = malloc(sizeof(*okif), M_TEMP, M_WAITOK); + okif = malloc(sizeof(*okif), M_TEMP, M_WAITOK | M_ZERO); PWDDESC_XLOCK(pdp); pwd = pwd_hold_pwddesc(pdp); if (pwd != NULL) { From nobody Wed May 13 14:05:40 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 4gFwGY0mycz6dS2J for ; Wed, 13 May 2026 14:05:41 +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 "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gFwGY04Qlz3NT9 for ; Wed, 13 May 2026 14:05:41 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778681141; 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=xd/JOfT7065sShucdnRzFWONc1umgYe2CixI7Cn2r4I=; b=mu7DI9myQ7q7e2ozbQIkeYEzvfwlkqU9/l+fC0Y98v4xjNnPeyWnBdUrEn7HCEMDECeDAI L20fYRwLehRiO1HMGLhsSuuiB+IHgC5++kwhBahozCUJLd5Am7tafTscxSE6nReKW2ojNK rHtxt0UJJ+ZhK9dObiu+p1zt8477ut5mwhB5tqnqDezBiEncQxxiD1HNFTXcgVB+apkdNq sd3igyIze1BX0V5jwNQMyt66DZQOM8JcviAKhEsO/sAnk4PPY293drRID99/lpTYVGYQ3m 8ayUU34ozLLCmdlcP+hlImXSvvGkU7T8dZqGJWtLMNHUKS8nPt9/9El3VorGHg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778681141; a=rsa-sha256; cv=none; b=afI2kjPxGsv6ENT90Pd3uwyzKlZIKYsp13gXFmyjOmzbh3E9yVCrmbgI3UAC1lfJ+u9C1+ 1Jq0RidXjHLQbPuJUGxLG/5L5YwdFfIElk+scqttUYikPZiny2qArRKNW9vp92IrEqfb5t Nu+UJsLuIZ+KtFZGHm2pwS7t5Gc94IKKhcWzvFh6ahfAuheAh9wL794Dig4x+nZBZtRQqP b9LOeGrJhe1sC8/3/ny+ktKDPsrVW9vi4srn5uy/Nj5olIZzNTPPAUlT6p7aUOraKjOaHA K4xYDIcLqaYuhjS8oH8fEH1gTy25XV0QpXU7RgBh/EQV9lPgAX6WZ/uK+qDwGQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778681141; 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=xd/JOfT7065sShucdnRzFWONc1umgYe2CixI7Cn2r4I=; b=YS6sQKT693uht1FveUFOZyhRslFcLa4I0JpRWJ27orqE9SPGfpPPjHNajxedgNCuO3CvVZ tStCaMNX6txkTKLPVpPQeX2I9vgAun+ZxPHVMqs/PY3CN+PxK32jOvYaZPDu35x1Fu2RaY /tVICF/sCFdPQ7Khtq9vLvWvuPlwYvIjkxL5qxeQHQ/Ij1nJP/QOiH7+Qhu9WzVC0hzWAH MsTzxHyawIVdO8ozVP9FnkNroI4UMp8VzZeso766TQamSMwZjTbhV47Pavm6lzW4xSLt+X DPoP3g1npONyk7MV55ulSD2vwP8H0n5NF2cMDS2QYSe5gvjHBQAl1lfWEN/QVg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gFwGX6VsvztHb for ; Wed, 13 May 2026 14:05:40 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 259dc by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 13 May 2026 14:05:40 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Ed Maste Subject: git: 5e6b16f4555c - stable/14 - sys: Fix heap disclosure in compat7 kern.proc.filedesc sysctl 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: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org List-Id: 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: emaste X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 5e6b16f4555cba4422dde7c63344359019a23722 Auto-Submitted: auto-generated Date: Wed, 13 May 2026 14:05:40 +0000 Message-Id: <6a048534.259dc.63389add@gitrepo.freebsd.org> The branch stable/14 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=5e6b16f4555cba4422dde7c63344359019a23722 commit 5e6b16f4555cba4422dde7c63344359019a23722 Author: Ed Maste AuthorDate: 2026-05-12 16:25:01 +0000 Commit: Ed Maste CommitDate: 2026-05-13 14:05:26 +0000 sys: Fix heap disclosure in compat7 kern.proc.filedesc sysctl Reported by: Yuxiang Yang, Yizhou Zhao, Ao Wang, Xuewei Feng, Qi Li, and Ke Xu from Tsinghua University using GLM-5.1 from Z.ai Reviewed by: markj Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D56976 (cherry picked from commit e68433e1990d5f1bcc1bdd270d65f1e4792a8e1b) (cherry picked from commit 0cef1a9ae5ec90b2c4717de9bc33fc7c3b1fd705) --- sys/kern/kern_descrip.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/kern/kern_descrip.c b/sys/kern/kern_descrip.c index 51752aa8ab33..9980c4c9a99d 100644 --- a/sys/kern/kern_descrip.c +++ b/sys/kern/kern_descrip.c @@ -4963,7 +4963,7 @@ sysctl_kern_proc_ofiledesc(SYSCTL_HANDLER_ARGS) return (ENOENT); } kif = malloc(sizeof(*kif), M_TEMP, M_WAITOK); - okif = malloc(sizeof(*okif), M_TEMP, M_WAITOK); + okif = malloc(sizeof(*okif), M_TEMP, M_WAITOK | M_ZERO); PWDDESC_XLOCK(pdp); pwd = pwd_hold_pwddesc(pdp); if (pwd != NULL) { From nobody Wed May 13 14:06:19 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 4gFwHH51zwz6dS6W for ; Wed, 13 May 2026 14:06:19 +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 "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gFwHH4DX3z3NvF for ; Wed, 13 May 2026 14:06:19 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778681179; 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=/0kSFQDUD1jygMxBkkhXLtAt7oFEe4edJ8k97v4hDJc=; b=ASJ9pgi0U0+Jbf7u5KleIA6lQ+NtP0E+0rXSG1oScG0szXY+TVXOAK59yZ40hmdWHGKwSx pf0FZK+NbQ+q03ORbCxpCe8dF3DNEImT5DLJSH9hRM5npVZAVfSblklTbprUAxb+nnNdWB JIHY/AXvIeA/fivOwGnIaJTeclQd210EsguWsHW+fmEbLtbMeIwOmwMSIgfelQv5B4tUjV C1IzOwRZ2ndGmq21znBZrCj10L2rTZz4BomUCYEy+yJJenkqddwZ/qpegjREzAxY+Yujec d6JNCUtoolU2zCR/g670RHPUbmm7vrst16YLpznw/DFwAWlrWHvntaw+nCglgQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778681179; a=rsa-sha256; cv=none; b=NHrRKed0lXvWr5ow2+vTDBRb5iWbOMv0zEHHGCPX9d82YEqc2FKtVoMOEPsBnd7XhEFtZn V77f6I6uqQbSpZULRMfSLtqieXLkZKB5rZEpqFrWsl3bvKw86vb+SuEVZysv0vFUR9cwGs r/9QbdKneuxok9OYwoP1Hc2S9BEY+ILkhXTsvtBR593sivZGHC9cyFXrZfITX+MRpl1Z/A 7FsxQv+n2LjBQaibQwhKN+YDPvyUpxa66UccvHp/Cde2Dj1rEi+CZZ6QMa7BXhSSgd5geK kdryoucr4bhSlLHbHuyE/sRSOozNiCsXtCKPKr55ilGla4UHFgtc7hWAi2nf1w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778681179; 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=/0kSFQDUD1jygMxBkkhXLtAt7oFEe4edJ8k97v4hDJc=; b=OajAi0Wx9IpOJ+K2UeSYlS0eKDXMZrlN3uZZNAJH4XT9VaaJP+iFIyn1oe0xga6Qs5Lfbk 9FGQ8omSSAVwbKcjFwZaMqLkNPSWAtT7v3IvZN9wnKiWQ8uBUOoK2I58JHLLnQGUmSAZcV pWPNQ4Y6Js46AKAE/bWCFKm60+QYNNMg1UJJdwNLSeCVmMiGP33n5sTqpe/sScAIt70eFU 8UmocpSLYE+LCzQ3tqlUqhBuf4DYsa9lDE9pKq4qvZb5JtGuOy9Uo8zBEppFdZwuIeNLoy k+n58J79gi1JnnvOdxRzLEvFIWf1Chsdd6ADJtd0Qh8z7vs0i7+58kHjrli+VA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gFwHH3m7wztbF for ; Wed, 13 May 2026 14:06:19 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 25093 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 13 May 2026 14:06:19 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Ed Maste Subject: git: c5c5705e6496 - stable/13 - sys: Fix heap disclosure in compat7 kern.proc.filedesc sysctl 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: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org List-Id: 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: emaste X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: c5c5705e649642810552559a3b849d9ff5d573b6 Auto-Submitted: auto-generated Date: Wed, 13 May 2026 14:06:19 +0000 Message-Id: <6a04855b.25093.3d2661ff@gitrepo.freebsd.org> The branch stable/13 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=c5c5705e649642810552559a3b849d9ff5d573b6 commit c5c5705e649642810552559a3b849d9ff5d573b6 Author: Ed Maste AuthorDate: 2026-05-12 16:25:01 +0000 Commit: Ed Maste CommitDate: 2026-05-13 14:06:04 +0000 sys: Fix heap disclosure in compat7 kern.proc.filedesc sysctl Reported by: Yuxiang Yang, Yizhou Zhao, Ao Wang, Xuewei Feng, Qi Li, and Ke Xu from Tsinghua University using GLM-5.1 from Z.ai Reviewed by: markj Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D56976 (cherry picked from commit e68433e1990d5f1bcc1bdd270d65f1e4792a8e1b) (cherry picked from commit 0cef1a9ae5ec90b2c4717de9bc33fc7c3b1fd705) (cherry picked from commit 5e6b16f4555cba4422dde7c63344359019a23722) --- sys/kern/kern_descrip.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/kern/kern_descrip.c b/sys/kern/kern_descrip.c index 2412c5e4e332..40046ef9110f 100644 --- a/sys/kern/kern_descrip.c +++ b/sys/kern/kern_descrip.c @@ -4902,7 +4902,7 @@ sysctl_kern_proc_ofiledesc(SYSCTL_HANDLER_ARGS) return (ENOENT); } kif = malloc(sizeof(*kif), M_TEMP, M_WAITOK); - okif = malloc(sizeof(*okif), M_TEMP, M_WAITOK); + okif = malloc(sizeof(*okif), M_TEMP, M_WAITOK | M_ZERO); PWDDESC_XLOCK(pdp); pwd = pwd_hold_pwddesc(pdp); if (pwd != NULL) { From nobody Wed May 13 14:19: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 4gFwZY19tYz6dSP3 for ; Wed, 13 May 2026 14:19: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 "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gFwZY0Svtz3QFT for ; Wed, 13 May 2026 14:19:33 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778681973; 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=F7z4sYc+KF+OUrcT/tUi+v9UqTdIFpOX3lhaQkJ9BEM=; b=SPYemfmoUtAWP8YJQ4772zUNDE1o6Kjc/VBVsQWoi7T+tNA09uCARr3Eb1H3+7Q7qSS1IG Nx/GXge2gXjg4kGISAtagey57IhzlEfS5+SRAd7b+AoUdZmv64ctd2lvsZSXWH1LQadRB5 h0cBMeAdZgFZNeIEAvWEiquE0/RY2mViPqYiN+IQHQD9k8CeAywVLm8uImIgRaebnjB0G1 CozQxmQ+6I5Zcwtu65mGnECwzardTP9NXcirVqyBjcgDN5HO90ECzfYAL7N8ovqRKiQlH9 XDQC7P/D9grSNb1am9Zo22FYIxcIvh86Wfghlunpkgylpb/uevTd90rCT5x32A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778681973; a=rsa-sha256; cv=none; b=rhfylO9S0H6pIxiwNZ3r2gr7YZsNHkDhWd7Zok1DCRv2Pd9WP6A+IuTBul/bwTA8nYs9ti nlsvieRsyhX8FnXx4JcetUbVtJtqEeYKeTQHp2WhRK68Ajj7IKx3jx0uJOK17Fc8jPJ4Ou VkdegtvHbfP2J2gM3Q8fqhbQp5qdfFIW+lmncB2Y6bejCDDSt9GHQku4tsz3f3gGr8jof+ 4HL4UVM89medbNruj38BHIQqcJr5CxnQ3iqZBph7j3VhJxKrKR2gJQOiqou98qNbaRByMD HHXyqVuY/Qog9zOyPPGLfWPnz0kAHZImWa/IFiPzuhIMx31I8Ja5MM1S2H/hAA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778681973; 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=F7z4sYc+KF+OUrcT/tUi+v9UqTdIFpOX3lhaQkJ9BEM=; b=OOn3XGPV9gvLSNf3aZ7zONbGJJ9Hditv3R+pm9TMIPA+BBw6NDcLECdK9t77Y4/9UiVAU3 gB2rJuk8aiGs60GGMXXi76Rb9hcRTcXVtviaoKRHrjGrtbZORAQrDkT020J/7dbyNTBQse Jf3l6R1+mT8WweEQN0xvJGjAS9fk5kove9zDm4ZuQgEsnBTeG9pcLiBlZLRXW71lGx+4cI PWrQyRPoI3BceYnV2cTpSX97Bt5oyLts4gk6SJSFLNBWRsaIqAewT4Q5na5vCDRsx0KQvJ +peacAx2dTsii9pMPziWVXijNYwnWTbcCTPQ73c3tXU/Nhsvl5c686u6c5uviQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gFwZX75D6ztx2 for ; Wed, 13 May 2026 14:19:32 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 26658 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 13 May 2026 14:19:32 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Ed Maste Subject: git: c3aa964109a8 - stable/13 - shm: Zero struct kinfo_file in sysctl handler 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: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org List-Id: 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: emaste X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: c3aa964109a8fdf0ee0f84bae5ccb1f0c386b485 Auto-Submitted: auto-generated Date: Wed, 13 May 2026 14:19:32 +0000 Message-Id: <6a048874.26658.6e9b46b7@gitrepo.freebsd.org> The branch stable/13 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=c3aa964109a8fdf0ee0f84bae5ccb1f0c386b485 commit c3aa964109a8fdf0ee0f84bae5ccb1f0c386b485 Author: Ed Maste AuthorDate: 2026-03-11 01:59:07 +0000 Commit: Ed Maste CommitDate: 2026-05-13 14:06:05 +0000 shm: Zero struct kinfo_file in sysctl handler Reported by: Calif.io in collaboration with Claude and Anthropic Research Reviewed by: jhb Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D55806 (cherry picked from commit 25cc459286a02b646751541ccde5a33319471c73) (cherry picked from commit 6348a5fd0d4792e752cb714f2a536c3287b8d580) (cherry picked from commit e61804ae6380c8d1db4b8c43bf7821e5d31ca04e) --- sys/kern/uipc_shm.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/kern/uipc_shm.c b/sys/kern/uipc_shm.c index 1df3a0967b09..150d82c89b69 100644 --- a/sys/kern/uipc_shm.c +++ b/sys/kern/uipc_shm.c @@ -2012,7 +2012,7 @@ sysctl_posix_shm_list(SYSCTL_HANDLER_ARGS) { struct shm_mapping *shmm; struct sbuf sb; - struct kinfo_file kif; + struct kinfo_file kif = {}; u_long i; ssize_t curlen; int error, error2; From nobody Wed May 13 14:19:34 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 4gFwZZ3kc2z6dSZx for ; Wed, 13 May 2026 14:19:34 +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 "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gFwZZ19mxz3QN9 for ; Wed, 13 May 2026 14:19:34 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778681974; 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=KG7pM/YfZQMJWW0XRZz599BzbsW8NRf2pjewOFH/dGU=; b=FZhtyc6L8P7N6J4CYTeh6Jz6WWSJL1zT5CX9ZARfQwWJUs+g4Q485WiwUx6FLvUT4hvpgD eUEFhMvF+6ijN8/w1jBOkgXE6cGOD+jsi8h99AXH0AJN/g22hmgmRfvw114fhe0g27Nn2v 0IpERooTeYFZYG4rI+3CCOj7fjvID7BrTweNZ2FPm2HGFcJerLFZyWaHz+LJnk4Mv9miHZ x5u+2sGtiCrwLeuSVHcrFgN7vnyjEbnMz60pyZFvKirpLh1IKeC93OEpORucFQz1SnQTs4 qrGOEs+uqgHIFzxz0VpjQ8U1gAmIZBD5IiOBU4/lbGONUBZ9n4tYAwlrno37uQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778681974; a=rsa-sha256; cv=none; b=Fu4EBmJv7LGPi3aVg8IJopnNw93chn78rpI8XZnIsr7tt3AAHwG3EQtobrlVjAMfy6vCGI yCuKeTCzQgAUecan41WXX+m5TQfE9Bj3aGWn91GbyYVGNQkaTZcLg7PSj6M5RZQAle05Zf x2O/8HChlB0AN/N4VsZr4xQhQl3FG0t59vzKK++FA4UtDkpGivGmJ5BQ3BUga2UF0Vi8Zv idYb8ydgeV4fEqfGWugC9sB+BPF5jnfs4YLSLEZkhhOfgfDyKcszObtDwAJqW+6Wgv7e6c mX3GhJf5nEoVKOPAaSXGU3JJEQiVFmIYOkLxnCVCkCGGS06urp7L7eXeBJOlHw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778681974; 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=KG7pM/YfZQMJWW0XRZz599BzbsW8NRf2pjewOFH/dGU=; b=IjYqieChWEWnC/oYOjTarsJugKYYpsA+KCydWgAdMn/yrLrtJq7oCd9pr2Lwrkpo8INv7D ZyLNTHnZE4ielaU8Ck7FojWNujxKNeF2/FY0slVfLyc5BIfNXCUi22O0OaK+WqiQ43nnPh dcHC49Zb4g1Az2QIGKWAfU4y+LGZlSRuEtc5HPt0R8kDypcw2FE6ZiqFDA5ASAhZ75jZXP n43XbQsIvxuY8lK3EamwcDlkwWWf4riBdKeNv7M4YdGbkT8e6JIneDlXWo49x43u4S153m fROeowpeswLmhpydVVZvGTb/CmZcq0Xnl/E9yqM16jCYkR+tOc/ZxDEdJ8SHfA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gFwZZ0mm8zv9h for ; Wed, 13 May 2026 14:19:34 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 262b3 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 13 May 2026 14:19:34 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Ed Maste Subject: git: 7f4bc4555a53 - stable/13 - compat32: Zero struct to avoid stack disclosure 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: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org List-Id: 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: emaste X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 7f4bc4555a53f32c5990d16afe4cfab7aaf6f053 Auto-Submitted: auto-generated Date: Wed, 13 May 2026 14:19:34 +0000 Message-Id: <6a048876.262b3.2d386f29@gitrepo.freebsd.org> The branch stable/13 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=7f4bc4555a53f32c5990d16afe4cfab7aaf6f053 commit 7f4bc4555a53f32c5990d16afe4cfab7aaf6f053 Author: Ed Maste AuthorDate: 2026-03-11 15:02:18 +0000 Commit: Ed Maste CommitDate: 2026-05-13 14:06:05 +0000 compat32: Zero struct to avoid stack disclosure Reported by: Adam Crosser, Praetorian Reviewed by: philip Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D55811 (cherry picked from commit 097cb4e9f0432c543c704cec712ce1cd3302335c) (cherry picked from commit 4551ea3b3f04650cd5300a9eae8994bdb080db91) (cherry picked from commit 6a808cd7534802d30010fb0a7f46381ff9f6ef3f) --- sys/compat/freebsd32/freebsd32_misc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/compat/freebsd32/freebsd32_misc.c b/sys/compat/freebsd32/freebsd32_misc.c index ee0119dba5af..316578f9bb97 100644 --- a/sys/compat/freebsd32/freebsd32_misc.c +++ b/sys/compat/freebsd32/freebsd32_misc.c @@ -619,7 +619,7 @@ static int freebsd32_kevent_copyout(void *arg, struct kevent *kevp, int count) { struct freebsd32_kevent_args *uap; - struct kevent32 ks32[KQ_NEVENTS]; + struct kevent32 ks32[KQ_NEVENTS] = {}; uint64_t e; int i, j, error; From nobody Wed May 13 14:19:35 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 4gFwZb3dWjz6dStG for ; Wed, 13 May 2026 14:19:35 +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 "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gFwZb1rc3z3QNB for ; Wed, 13 May 2026 14:19:35 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778681975; 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=Ls3GftVxjATmkaZy0Arwsus0DyrUd5fwCNhTWgfhzKs=; b=m/IjbaNAb4b1Rnal7NOnJHGIsBESHZVmQWcXFst4f+c5/5slKKK3yD+oqp5tmsf6Rw2mWp W4iA1p+82L5lZR+70igpQUdyU5Lp1qtyFlm2HYyGP3i5dr7x/gKesTOqX3NF5EhssIRBna fsNqwOeyU08EaJY660M7YHtMqtrynyWaFt81Ka5MfZk/NemZ0nwT9IAw27xBdMsMeeSknE wXSvCOZdBxId84o3BIUji/8fkC2OQYMMofNz6eNJRAzdG3BvZoQs3WikDM/Bu3U/XJvLS4 mfTiZNIJpIcH0azhOd0spTs4I6mtIblVF+z2r9uQ6jvexNabzYdXhYM0cO2MMA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778681975; a=rsa-sha256; cv=none; b=javTftu2Ds+VlgwouP5ZL58Ka4H7+JHGLSSGJ+hiI4jC8Eebe3tVMwp8PQpZjy9P8evbay IEoT6F4ncpnXOC4+ttoFvFvPR2QTarxFfkZQKGaxc5PkX/6BTIQlISZ0rOgAJhNBudDvQB EdF318PHzoRZJlkFiT4ylKXYDG6l6kR+vVBJUqC7gziSPpgyOmc2iJQYE9g3zA6W9QuPW7 rTmJjOhNonxjy0LCNmymgraycSFAIfpOBwb8ryhBtTG2DgVlcsNBMD33k2yzzFaht23ndP byU2tAws9CGnkETiHZcDBJO3GsziGXiqPwwT5VBrcgXiwsGSYWGcKXkSSSuNyg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778681975; 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=Ls3GftVxjATmkaZy0Arwsus0DyrUd5fwCNhTWgfhzKs=; b=okiOVxOWsB/JyC115zf4EGtgLftl1FwqmglJC76bETycvWyalGz6dzRGHLrG1vgY4jioY5 ykwOTDtuLWiS4oKGbTDsBpS4Ficn+NAZsdXzrA8IZ1bogjULliwJxQ/oFp3rKAgLBuAZrw E8k00BCRn1wj/0UypzLxNJ6zWRBBn0adT9W2Du3f1jSLUyeD31GwVpnXCjJFgp3KBWAtx6 Ts7/SXliT40vU5nQkIhZkDa4IuTm806ii7OVxrfJwK9UQgQDL5GJyk7EvGBGsoto0ivJ9k hUWrO6Ciu7j7shKGtWCtf8qx2ebF/TMWsZBxns3dQDa/QhZAg03iirNETzDrCg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gFwZb1JKPztYh for ; Wed, 13 May 2026 14:19:35 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 24fd1 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 13 May 2026 14:19:35 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Ed Maste Subject: git: 815eb5a26eb4 - stable/13 - compat/linux: Avoid waitid() kernel stack disclosure 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: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org List-Id: 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: emaste X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 815eb5a26eb45418bfd1ae564c532cbd37599b02 Auto-Submitted: auto-generated Date: Wed, 13 May 2026 14:19:35 +0000 Message-Id: <6a048877.24fd1.706d7a7b@gitrepo.freebsd.org> The branch stable/13 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=815eb5a26eb45418bfd1ae564c532cbd37599b02 commit 815eb5a26eb45418bfd1ae564c532cbd37599b02 Author: Ed Maste AuthorDate: 2026-03-10 13:53:46 +0000 Commit: Ed Maste CommitDate: 2026-05-13 14:06:05 +0000 compat/linux: Avoid waitid() kernel stack disclosure Reported by: Adam Crosser, Praetorian Reviewed by: philip Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D55812 (cherry picked from commit 9a9f93bcf1aa0059d759b2f3ea6faeb2760a11bd) (cherry picked from commit 9f8db9cc67fb86eeb2b645ce7f8aa748e99241a9) (cherry picked from commit a347e6e20e75ad6224afefcf650ef738c3de094d) --- sys/compat/linux/linux_misc.c | 1 + 1 file changed, 1 insertion(+) diff --git a/sys/compat/linux/linux_misc.c b/sys/compat/linux/linux_misc.c index fa6b7eff601a..3895c6da057c 100644 --- a/sys/compat/linux/linux_misc.c +++ b/sys/compat/linux/linux_misc.c @@ -756,6 +756,7 @@ linux_common_wait(struct thread *td, idtype_t idtype, int id, int *statusp, error = linux_copyout_rusage(&wru.wru_self, rup); if (error == 0 && infop != NULL && td->td_retval[0] != 0) { sig = bsd_to_linux_signal(siginfo.si_signo); + memset(&lsi, 0, sizeof(lsi)); siginfo_to_lsiginfo(&siginfo, &lsi, sig); error = copyout(&lsi, infop, sizeof(lsi)); } From nobody Wed May 13 14:20:01 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 4gFwb574sXz6dSm0 for ; Wed, 13 May 2026 14:20:01 +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 "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gFwb55QkYz3R1P for ; Wed, 13 May 2026 14:20:01 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778682001; 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=1uCsAsgxrR+NEw2ck9KOkpGF2oDy8WnZ0ATi4VizL6c=; b=t7rPuBaxj1UvmUlj68CZiiHyLdTt1+H0+oFcwiQSbs966YzG8HhL9X6I2rzU4SZbj2wZ6Z 8+jGEbczoWL2gH019rQcEiyCwe7UKghlM6CqgdvDTfAGLzR1hn05tr8HRwp/Cpjf8khW4w Lx9tiyGx/CZzVXWfSL/hQYhyaMlU61/vbGO8zw3R29ZJKeNl1ZdpKDXae/BMLMh3u0kdPh En18z75is5FlpVz/ZyLLCw8AOnrcwbAEF9hEmehdR0CNWiIhKkTkIymwSG+4O0/YF8PO0i ec3LfFKOQZj1Pc0Xq7soReopBAMUx7Mwnnxgg+oK/XWbl/GJgkafGbTJiFZcTg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778682001; a=rsa-sha256; cv=none; b=SsKesBBmlIwJpymQ7N8KLxh81z0RYn/sG5BvM/TYvVvC24Lb0pSXGf3UaJEi/29wvWZqIz 3K7aWeBSY8bVFShJxn2DhzcPl/8YcLGwYaN/mWJhvkAn5rTXUcWY8z79WiUzJG3VLbbnz2 ytWHS6EC79Hq4weuDs4wlq/jN51PGlx/orWDlfFKef8MfGtYRy9wHTfS+gSm1qzvnqB4kp 7zJs2hvRbZ/oHc4IM/ksfg6WgI7g+Lxdv06nFHVpsVOtn4vFQi3tUMdW3Lfi2nXB7rdoPc BfQVQ9PT5P93HkvhqkMGcKPPUQY61WJIuCvj9Z4X5QP7Uug7NkDhivEWJcosuQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778682001; 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=1uCsAsgxrR+NEw2ck9KOkpGF2oDy8WnZ0ATi4VizL6c=; b=OMyP5H+cG/Yyw3usM3nzDdURzFt25SJSMe7OQxhXiPQK1f/dpMSLlZeCkMxOMUFDNKCwkm WSKGYB3n7lp+oBGwNB1JPKJSrWX8vhuLRX4Cjd1yOA2qG3r1xSKb1FAfif2iya7Gr3ZBd4 mNaA4jZ2Gd1lazJU0hda3+14r0vFXH4aUJv/UfHdOTRAfdFDlTi5sWaY/0BO1VaM0bjkF1 Va5aK5gmDSG4b4HQb7d6pcRYUUDTVU4+TqXRVgG2q6vXVBeCNNHfA+1jr/TbVi4OhVp/MZ FI7dhJ8rEh88VdaPECbw1MwlN1evi2HJNDOb/8NaDSkRrJRWNBuvIwBQm4Ku5g== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gFwb552LPzvB2 for ; Wed, 13 May 2026 14:20:01 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 2709d by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 13 May 2026 14:20:01 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Ed Maste Subject: git: efba864f11d5 - stable/14 - elf_common.h: Add some AArch32 relocations 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: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org List-Id: 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: emaste X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: efba864f11d508a55c159330d8d3b2174288d3d1 Auto-Submitted: auto-generated Date: Wed, 13 May 2026 14:20:01 +0000 Message-Id: <6a048891.2709d.322b76d@gitrepo.freebsd.org> The branch stable/14 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=efba864f11d508a55c159330d8d3b2174288d3d1 commit efba864f11d508a55c159330d8d3b2174288d3d1 Author: Ed Maste AuthorDate: 2026-02-12 21:18:32 +0000 Commit: Ed Maste CommitDate: 2026-05-13 14:05:26 +0000 elf_common.h: Add some AArch32 relocations Reviewed by: mmel Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D55268 (cherry picked from commit 10ac7413c060b1496ef54e2338f487ea84f66206) (cherry picked from commit 50a7a38ea79f05b2da38352629802c346aeb55d6) --- sys/sys/elf_common.h | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/sys/sys/elf_common.h b/sys/sys/elf_common.h index b0b940b4cae3..2152efdee8b6 100644 --- a/sys/sys/elf_common.h +++ b/sys/sys/elf_common.h @@ -1117,6 +1117,19 @@ typedef struct { #define R_ARM_GOTPC 25 /* Add PC-relative GOT table address. */ #define R_ARM_GOT32 26 /* Add PC-relative GOT offset. */ #define R_ARM_PLT32 27 /* Add PC-relative PLT offset. */ +#define R_ARM_CALL 28 +#define R_ARM_JUMP24 29 +#define R_ARM_THM_JUMP24 30 +#define R_ARM_BASE_ABS 31 +#define R_ARM_MOVW_ABS_NC 43 +#define R_ARM_MOVT_ABS 44 +#define R_ARM_MOVW_PREL_NC 45 +#define R_ARM_MOVT_PREL 46 +#define R_ARM_THM_MOVW_ABS_NC 47 +#define R_ARM_THM_MOVT_ABS 48 +#define R_ARM_THM_MOVW_PREL_NC 49 +#define R_ARM_THM_MOVT_PREL 50 +#define R_ARM_THM_JUMP19 51 #define R_ARM_GNU_VTENTRY 100 #define R_ARM_GNU_VTINHERIT 101 #define R_ARM_RSBREL32 250 From nobody Wed May 13 14:20:02 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 4gFwb710GFz6dSjN for ; Wed, 13 May 2026 14:20:03 +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 "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gFwb663yyz3Qxp for ; Wed, 13 May 2026 14:20:02 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778682002; 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=2EWQ5eQofLe6DbZjRSfVKbZ6HMY6g2qlVqG3X6yfnlo=; b=vHnN8xNQgJaLDY351TTVURI7Gkpu2A78LuFk9VHdfoJsha/XXC6IKMV8FYd4fbBTByjaYl s36jlWiSuqbO6FAowrhKDTl/qU12n53mR7e63on0M2OLr5jkeY/hyAVKT6ZH1c8Vm8xluY 4GzYgV44KJTafgn0BnOTrX82ypIhhrESmMttfLs/f0rs40Fg0QnPwZJAgYEMrjY5bO67Rk sG4MvnLg2rfITjD3ObDGtlZA7d//5AFRUPWEgcTUZQOICiLPa+GckcVowFhMETJlVtWrJT MTqslR5h+5+tJpR2hvNr0gFrc2xtNJLNXS5Zn2Vr96pIrIP+8axVnJW5Q6MP/w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778682002; a=rsa-sha256; cv=none; b=qHSBXofRV19Ahhtk5Kf2yGB+eZd148+NgOQ5cmoCVSIWMDmAyPfLKgFyOD10gPMYRK7Fkf WonRsZEApW/tESAukOIchMiVD8edk+cE3+TSka1+HsOCLyR7mhPYVXQklF5eg8Ak5yfLJ1 O0bfx1tG9UXLonrDVILoEQWLB/ECAPc77X/BurEtKJ86X9JeD5/h5abso3hqNq+kzrhSQy u256clhvvAZYwCOeeIIWgOqdtaYCi3dKqz38t/8CdEuft/PA2PO9st57SuxKfHVFFqA5W+ 5n49XsGMZf2WkyBhAag946a05HwBG75iIlDo+Cfp+K7oUEFMMr5bBRJBSN+a6Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778682002; 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=2EWQ5eQofLe6DbZjRSfVKbZ6HMY6g2qlVqG3X6yfnlo=; b=ZgAuIUG5p8OTGjyrqCteQxJ/5mez1Lf1Tcwd6qvyAggM342E/akXpLIZecPe1FSTnryOXy vZzn/Gym9Xz/+tj/bKE1mmp+jgM4/BdCJ3UKJAgAifRC1+BYgwa9IjV5I6YFVb0GIYx3F8 GG1fjq0UycWbsvfIJRkj1QK96JvFONvR16B30d4Q5+wW2Kpk2toSjmON02127mpA6vQhyj HoF4hZu8IC8oV7bYRJv5iAqvz0IClsfZAuQH+AiOv4MocBNzCi9QPzF5FEZRRm81pgHLpn JkfHrX1Zx15l9si97UM/b9ExRW6uGYhd+vyZNPbu0XQZ6aF0rbV86DM0x4oSjQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gFwb65NBqztx4 for ; Wed, 13 May 2026 14:20:02 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 27281 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 13 May 2026 14:20:02 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Ed Maste Subject: git: f62ab5c293f6 - stable/14 - elf_common.h: Add AArch64 Memtag ABI constants 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: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org List-Id: 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: emaste X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: f62ab5c293f64cf492c2a20ee99ded008e9a1457 Auto-Submitted: auto-generated Date: Wed, 13 May 2026 14:20:02 +0000 Message-Id: <6a048892.27281.7eadf65a@gitrepo.freebsd.org> The branch stable/14 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=f62ab5c293f64cf492c2a20ee99ded008e9a1457 commit f62ab5c293f64cf492c2a20ee99ded008e9a1457 Author: Ed Maste AuthorDate: 2026-02-23 21:23:49 +0000 Commit: Ed Maste CommitDate: 2026-05-13 14:05:26 +0000 elf_common.h: Add AArch64 Memtag ABI constants Obtained from the Memtag ABI Extension to ELF for the Arm® 64-bit Architecture (AArch64) [1] [1] https://github.com/ARM-software/abi-aa/blob/main/memtagabielf64/memtagabielf64.rst#dynamic-section Reviewed by: andrew Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D55486 (cherry picked from commit d971bc5220f7adb8a2bdfadc8e3ca7ffcf9ca843) (cherry picked from commit 9712b5e4b58bc3ff9402413ce7a149c956774263) --- sys/sys/elf_common.h | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/sys/sys/elf_common.h b/sys/sys/elf_common.h index 2152efdee8b6..8419dfddfe41 100644 --- a/sys/sys/elf_common.h +++ b/sys/sys/elf_common.h @@ -469,6 +469,9 @@ typedef struct { #define SHT_HIOS 0x6fffffff /* Last of OS specific semantics */ #define SHT_LOPROC 0x70000000 /* reserved range for processor */ +#define SHT_AARCH64_MEMTAG_GLOBALS_STATIC 0x70000007 +#define SHT_AARCH64_MEMTAG_GLOBALS_DYNAMIC 0x70000008 + #define SHT_ARM_EXIDX 0x70000001 /* Exception index table. */ #define SHT_ARM_PREEMPTMAP 0x70000002 /* BPABI DLL dynamic linking pre-emption map. */ @@ -703,6 +706,11 @@ typedef struct { #define DT_AARCH64_BTI_PLT 0x70000001 #define DT_AARCH64_PAC_PLT 0x70000003 #define DT_AARCH64_VARIANT_PCS 0x70000005 +#define DT_AARCH64_MEMTAG_MODE 0x70000009 +#define DT_AARCH64_MEMTAG_HEAP 0x7000000b +#define DT_AARCH64_MEMTAG_STACK 0x7000000c +#define DT_AARCH64_MEMTAG_GLOBALS 0x7000000d +#define DT_AARCH64_MEMTAG_GLOBALSSZ 0x7000000f #define DT_ARM_SYMTABSZ 0x70000001 #define DT_ARM_PREEMPTMAP 0x70000002 From nobody Wed May 13 14:20:44 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 4gFwbx1r3Bz6dT0d for ; Wed, 13 May 2026 14:20:45 +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 "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gFwbx00vrz3RmX for ; Wed, 13 May 2026 14:20:45 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778682045; 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=2WEQCZE9xKVet05xT/V2FP9v5nxjg7TH2bH3aNVEZns=; b=AToHs3N6FcgglYW/wY7YkuCHJUS1UGlDgZSoPO/5VyV2owa3uJBG14pDUL/Uzrb5Aa6MXh sE1ezffEgE2s2WelGbwVqzQ9E4+23ydosk3Wj4meKGm0gD29A1ZLdCv2yX25PaE2yrH5JN fRFv77ZsdiyBqtCaZS5vIupEly5NFneq767X+nXKXa7Gs4mNTWqoYqvSYolDn3oEamRIgK HGT2701K9Hi3AGMaAM3w3Unq9dfdBA2dnGgC+cBSrflgYMKT9249VcFDOg3ATa5ZqyV+x7 0OKAKKKohVS/f4s944vCYvOWKkWRYAdHn1ftU5KCz4wTnGGh0y5ZJa/pG3juRw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778682045; a=rsa-sha256; cv=none; b=xwCopLEb/lzCm8XxqSCqKCe91Uo5heEdH04byp9BuhKwRixZbglhpHg7J4uWEgEYtMGQp0 eyuyB2KXV9l27hVYoQbKa4HULq17HQg7EhGutlGTTQSz5Qyzb+rer1YVmH6aMg90gr9xP+ KJGY0GhIH6sxeTvuhbckBzi5CjMwPWyQDW2TY7OBudZ30tsMHqCtvM8TXrDYl0zpEKyNFi NvJL2jhi3p8F984m55tPlJSnIyR0jvE9kgsNxgYAzIew8+pvevS6QtxxtWeZjaG7laG6yJ soMLBNp7ltaKklYFjNnDKoqBTizQruENat4/Eysff2FqBlm/pzA7qYBZX8mK5g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778682045; 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=2WEQCZE9xKVet05xT/V2FP9v5nxjg7TH2bH3aNVEZns=; b=ppeuGgoSyyXOsSRcXGB/gGxj5YJ7XZIqndmTSiPhfyqvwC/AB0UItrDzADSYHnTRJvD08q tjN0urMTS3wM6Qy6iOY22XnGKgNF6a7sssn27J9rtyquYh3PSd/ZlR4Z6K/GZBZax8bYz4 /bdAr+RfaAR65YkzMnDrkiaZ9oHt2f6QZkHiPvAx48wUgqKjuYqhu43wKW6FUa5Pe1RiJf WETPY7JMeIGX8tBB9tyUf1LhIb7P09Og5EZMsX7BWbEE+rtCMUwmeP8Ci+RxuGTM8Qyt17 LiteIx+LpJ6ueNzacoSS2P5EOcGMrmQXf+zvzAvcKFNeaQQ4K6la5kyKCdQncA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gFwbw6bf5zv0Z for ; Wed, 13 May 2026 14:20:44 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 26969 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 13 May 2026 14:20:44 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Ed Maste Subject: git: cc921088d9ee - stable/14 - release: Use make's `:H` rather than `/..` 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: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org List-Id: 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: emaste X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: cc921088d9ee9ec0ba79893fdeaf271f2955a1bb Auto-Submitted: auto-generated Date: Wed, 13 May 2026 14:20:44 +0000 Message-Id: <6a0488bc.26969.6504c2dd@gitrepo.freebsd.org> The branch stable/14 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=cc921088d9ee9ec0ba79893fdeaf271f2955a1bb commit cc921088d9ee9ec0ba79893fdeaf271f2955a1bb Author: Ed Maste AuthorDate: 2025-12-26 16:36:43 +0000 Commit: Ed Maste CommitDate: 2026-05-13 14:20:27 +0000 release: Use make's `:H` rather than `/..` In general we want to strip subdir components, rather than appending `..`s. Reviewed by: lwhsu Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D54373 (cherry picked from commit 3949c2b8c4691a6dff8be7b38805d56faab91187) (cherry picked from commit 61f0453b3aa71e640a42085f67ce556ca3283c6c) --- release/Makefile | 4 ++-- release/Makefile.vm | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/release/Makefile b/release/Makefile index d71449fa78bc..7dbded45e2e6 100644 --- a/release/Makefile +++ b/release/Makefile @@ -36,7 +36,7 @@ # TARGET/TARGET_ARCH: architecture of built release # -WORLDDIR?= ${.CURDIR}/.. +WORLDDIR?= ${.CURDIR:H} PORTSDIR?= /usr/ports .include "${WORLDDIR}/share/mk/bsd.compat.pre.mk" @@ -57,7 +57,7 @@ DISTDIR= dist # Define OSRELEASE by using newvers.sh .if !defined(OSRELEASE) || empty(OSRELEASE) .for _V in TYPE BRANCH REVISION -${_V}!= eval $$(awk '/^${_V}=/{print}' ${.CURDIR}/../sys/conf/newvers.sh); echo $$${_V} +${_V}!= eval $$(awk '/^${_V}=/{print}' ${.CURDIR:H}/sys/conf/newvers.sh); echo $$${_V} .endfor .for _V in ${TARGET_ARCH} .if !empty(TARGET:M${_V}) diff --git a/release/Makefile.vm b/release/Makefile.vm index e0e69deaaf28..3533fe4b797f 100644 --- a/release/Makefile.vm +++ b/release/Makefile.vm @@ -71,7 +71,7 @@ CLOUDWARE?= ${CLOUDWARE_GEN} .for _V in TYPE BRANCH REVISION . if !defined(${_V}) || empty(${_V}) -${_V}!= eval $$(awk '/^${_V}=/{print}' ${.CURDIR}/../sys/conf/newvers.sh); echo $$${_V} +${_V}!= eval $$(awk '/^${_V}=/{print}' ${.CURDIR:H}/sys/conf/newvers.sh); echo $$${_V} . endif .endfor From nobody Wed May 13 17:22:50 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 4gG0f30Gg0z6cjdb for ; Wed, 13 May 2026 17:22:51 +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 "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gG0f21wDNz4253 for ; Wed, 13 May 2026 17:22:50 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778692970; 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=G0SDCrdDGQavxBks7jqetSeBcdVploVk6p3D/C2XxI8=; b=huJSPH4u9XTafJxlmckSUmFwwHby8IZL9fk3l29duj585i6HXcZk0ZCE+f4dlktI4kKbUs zTVT/QCAglIcOImPMH9dhTEA7v/IojkTkm5zYMfvLueKgzDDXgJYlfoy2jY8kjDxEgzOOs pMoD7K/Zk5iE6mBWaM0GxfW+eBh48/SNoGVyg9/f6qT3CXtVmheGYelVMFQ8HVqAS8xTUr aoK4qgInhmHCvyh5UPWiIh8tjgAzNuFWVv/F0v5WqktOoQPNe7zvFwqrSxYBllr08dBqS8 Z8FwP0sUCbaqrZ/J16/O0zMFSr7F8Y9TcSJPHFNrTYKX/pb7mzoN5UHHRwev1Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778692970; a=rsa-sha256; cv=none; b=m5rMT59dHOVztbz5Qsc8vpIaBgKOCvTf0H3kYGXOIP6Z+j7VRAW2mhLxXcTmc5wWRn5XSu 7JXJjg5t9j39cEuKzQm47ES5jEeltAOdTtcpDbo5Ym7izTFHPiaROyg921TJmwHpi0pDzp IYjxZJd99QffVhcDfM/ImadnOU/KyZS1qxbsVqzFim17CA5x9Zg8P9pO+L+ug/1iaRH1AS C6+pGSrPJ8E13dcfWSBnYyENe/mFy8sjOF4gIMODsNkPy6YUEvho2ZHsr1rFrJi57FtJRA y0RqzBzYIiWmoHyEtERxcp3qROvhi1G4aO8Bu/QES19XOay30mNgg16pRMEh0Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778692970; 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=G0SDCrdDGQavxBks7jqetSeBcdVploVk6p3D/C2XxI8=; b=i861U8IYMdtx+gYmhoqdifqYrywF+Hqw+bxPrMC/g0GWu/+LczjuX020+oQzV1uiHNfHMK GWieAd8ryVh6+qLt9nfFQqYr4U7lvL7GbVOfvCVkyJ2UgZrsriV/07tseJ9EXh543muri7 LPxeyA8CqnrYwaeUA5kgtM//OhYg0tnYOKs68RFaYNCg8ds795k36BQ0KBa3A1b9UMeT7b 44dWBdvz8PDhUS1gULRi+W0z+OR5Ud5AtwUHzF1jF3R5NRvMa2/VMkX7FZkvgh3IxqWAFc PIY0QfDTszQSiiIB3zRAVDucl0DLl45UzdlM2NDH7DxIpy8M9RbR2AvgAuxkVg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gG0f20vYpz103d for ; Wed, 13 May 2026 17:22:50 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 19d83 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 13 May 2026 17:22:50 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Alan Somers Subject: git: 3298d82ea340 - stable/15 - Fix LOCAL_PEERCRED in 32-bit compat mode 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: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org List-Id: 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: asomers X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 3298d82ea34059354dc1ff1a60d8b7d3e495c2cd Auto-Submitted: auto-generated Date: Wed, 13 May 2026 17:22:50 +0000 Message-Id: <6a04b36a.19d83.51259bdf@gitrepo.freebsd.org> The branch stable/15 has been updated by asomers: URL: https://cgit.FreeBSD.org/src/commit/?id=3298d82ea34059354dc1ff1a60d8b7d3e495c2cd commit 3298d82ea34059354dc1ff1a60d8b7d3e495c2cd Author: Alan Somers AuthorDate: 2026-04-27 23:46:53 +0000 Commit: Alan Somers CommitDate: 2026-05-13 16:54:53 +0000 Fix LOCAL_PEERCRED in 32-bit compat mode Previously the cr_pid field would be incorrectly copied to userland, due to a size mismatch between the structure as defined in 32-bit vs 64-bit builds. Fix it by converting the structure before copying it to userland. PR: 294833 Sponsored by: ConnectWise Reviewed by: emaste Differential Revision: https://reviews.freebsd.org/D56675 (cherry picked from commit 1d24638d3e8875e4b99a4b5e39f4241e37221b3d) --- sys/kern/uipc_usrreq.c | 21 +++++++++++++++++++-- sys/sys/ucred.h | 11 +++++++++++ 2 files changed, 30 insertions(+), 2 deletions(-) diff --git a/sys/kern/uipc_usrreq.c b/sys/kern/uipc_usrreq.c index 44d0185e9d1c..8e8261c9644e 100644 --- a/sys/kern/uipc_usrreq.c +++ b/sys/kern/uipc_usrreq.c @@ -83,6 +83,7 @@ #include #include #include +#include #include #include #include @@ -2755,8 +2756,24 @@ uipc_ctloutput(struct socket *so, struct sockopt *sopt) error = EINVAL; } UNP_PCB_UNLOCK(unp); - if (error == 0) - error = sooptcopyout(sopt, &xu, sizeof(xu)); + if (error != 0) + break; +#ifdef COMPAT_FREEBSD32 + if (SV_PROC_FLAG(sopt->sopt_td->td_proc, SV_ILP32)) { + struct xucred32 xu32 = {}; + int i; + + xu32.cr_version = xu.cr_version; + xu32.cr_uid = xu.cr_uid; + xu32.cr_ngroups = xu.cr_ngroups; + for (i = 0; i < XU_NGROUPS; i++) + xu32.cr_groups[i] = xu.cr_groups[i]; + xu32.cr_pid = xu.cr_pid; + error = sooptcopyout(sopt, &xu32, sizeof(xu32)); + break; + } +#endif + error = sooptcopyout(sopt, &xu, sizeof(xu)); break; case LOCAL_CREDS: diff --git a/sys/sys/ucred.h b/sys/sys/ucred.h index ba241cf9ff3a..4bf48a5e4b87 100644 --- a/sys/sys/ucred.h +++ b/sys/sys/ucred.h @@ -193,6 +193,17 @@ struct setcred32 { uint32_t sc_label; /* struct mac32 [*] */ }; +#ifdef COMPAT_FREEBSD32 +/* 32-bit compatible version of xucred */ +struct xucred32 { + u_int cr_version; /* structure layout version */ + uid_t cr_uid; /* effective user id */ + short cr_ngroups; /* number of groups (incl. cr_gid). */ + gid_t cr_groups[XU_NGROUPS]; /* groups */ + pid_t cr_pid; +}; +#endif + struct thread; /* Common native and 32-bit compatibility entry point. */ From nobody Wed May 13 19:24:20 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 4gG3LF0hvgz6ctB8 for ; Wed, 13 May 2026 19:24:21 +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 "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gG3LD6v48z3QbC for ; Wed, 13 May 2026 19:24:20 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778700261; 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=h6r5iO42P5Sw+TGZT+bVahHEsfIkbTx+DHtMi5G4Zqg=; b=SeBQJoY7UstB5W9yAeRbvoJWvbsWFI97wGzefgAu3Q4Q5eVtIAApVch9L2RP2g0gDSt5N1 ONEFe7igMH6cOUK34lXYa7nmkMT2zLTz6JELNaTzWbnZQN6UnnVtqs4pSVmESoZuj5AKUC 8fo3XcZ4UYnZUnc2cgIWugTlJEMNULlJNQYd8EI+J7ePmiOS1OCancqQ93iiQarSsMnd3a aBNhu4qU1hQxJ/q/X6l/PVl6erpyOIMmbFg/6QUtko185PhKUzkU+u5RzGdLf7qch6Tqh6 kA4gu9h+shSBFpH2z7MNaeJWKNtj86ywhZU6aiCG6g50pUR9+16nRezxcub04w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778700261; a=rsa-sha256; cv=none; b=yPJtimwV9gAuvk1NXho1UcYrD7TJG+WziXwc2HVpYIaIeDa8rjGXxmEnUYDEAfHCrBEtFs Fj/VNOoGhwMc4JDeQc4flC3gjpSFZrfKBzFKkowfbb5qJASCdD925q5ojroh8Uz6jBI0V4 dyg+UQKtmfRyb1wlQYU9+kk0viNBpII7LNL+Evg5CC75MtoS9N80NWZsTHNkT+m5QrXwOt TpOXLBnHcVeJ2E58tB7mX7jU1A/NOSv9kaky83egVLlyftmYF/gOnseNodEDQsxJiEpl7k kNv9+z4XGoe2aDYyzVcqvz+ctiZEI+Ruhn05jN0agIgxT94CIXRzTO5HiGK3nQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778700261; 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=h6r5iO42P5Sw+TGZT+bVahHEsfIkbTx+DHtMi5G4Zqg=; b=Ha/KwaAbPMXH9RUHyt4mN5wfpA7hWssTDm1u5mhuMGV5fYt8JIRYnilScyAsuu/7Mt3TLG Bsh+L4+oLRr46ZhrDl6E4ipzvM8zlC9kN0TtM9OWX15Cs5YeJdFCAkwAAZZaFapdWRk6j0 a2XUZc+YOPjckC5UvogKfVUNYO+N9q9Y0ePPr4SVMWrT3w7UvQdRjZAymLWwzENq0NMVBn gsQ09xqpboNPJdjZuxRWRPFkEnIX+ikls9RqgJD1nLrUesO3VXreYglJTestqFPqdEk0FX 2+Escs4k4cMzojQ6dcsXbG0VUURx0PYpH8OgQQMPItzvBtXitqbEfxjflSbxdQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gG3LD6DQbz13d9 for ; Wed, 13 May 2026 19:24:20 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 276ab by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 13 May 2026 19:24:20 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Alan Somers Subject: git: 89a0148521ae - stable/15 - Make "make update-packages" idempotent 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: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org List-Id: 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: asomers X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 89a0148521aefe0a190d4b62749186c705962d32 Auto-Submitted: auto-generated Date: Wed, 13 May 2026 19:24:20 +0000 Message-Id: <6a04cfe4.276ab.2e6106ed@gitrepo.freebsd.org> The branch stable/15 has been updated by asomers: URL: https://cgit.FreeBSD.org/src/commit/?id=89a0148521aefe0a190d4b62749186c705962d32 commit 89a0148521aefe0a190d4b62749186c705962d32 Author: Alan Somers AuthorDate: 2026-05-07 18:18:29 +0000 Commit: Alan Somers CommitDate: 2026-05-13 17:23:07 +0000 Make "make update-packages" idempotent If the user runs "make update-packages" without bumping BRANCH, then it isn't possible to copy packages from the old location to the new one (because the two locations are the same). So just skip that step. Sponsored by: ConnectWise PR: 295085 Reviewed by: ivy, emaste Differential Revision: https://reviews.freebsd.org/D56872 (cherry picked from commit bd1e789b8452a8c2f166a3b4defb95330c71dadd) --- Makefile.inc1 | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Makefile.inc1 b/Makefile.inc1 index 2255b61a30ff..2c79a8c7920a 100644 --- a/Makefile.inc1 +++ b/Makefile.inc1 @@ -2116,7 +2116,7 @@ real-packages: stage-packages create-packages sign-packages .PHONY real-update-packages: stage-packages .PHONY ${_+_}${MAKE} -C ${.CURDIR} PKG_VERSION=${PKG_VERSION} create-packages -.if defined(PKG_VERSION_FROM_DIR) +.if defined(PKG_VERSION_FROM_DIR) && ${PKG_VERSION} != ${PKG_VERSION_FROM} @echo "==> Checking for new packages (comparing ${PKG_VERSION} to ${PKG_VERSION_FROM})" @for pkg in ${PKG_VERSION_FROM_DIR}/${PKG_NAME_PREFIX}-*; do \ pkgname=$$(pkg query -F $${pkg} '%n' | sed 's/${PKG_NAME_PREFIX}-\(.*\)/\1/') ; \ @@ -2134,6 +2134,8 @@ real-update-packages: stage-packages .PHONY echo "==> New package $${newpkgname}" ; \ fi ; \ done +.elif defined(PKG_VERSION_FROM_DIR) + @echo "==> Package version ${PKG_VERSION} unchanged, keeping old package set" .else @echo "==> Bootstrapping repository, not checking for new packages" .endif From nobody Wed May 13 19:31: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 4gG3VX45Fvz6ctmM for ; Wed, 13 May 2026 19:31:32 +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 "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gG3VX3Pvjz3SFV for ; Wed, 13 May 2026 19:31:32 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778700692; 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=rPChTGNA8D/vsCxJxy0DBKzOMSqCmOQHQ/g+S+lrM9M=; b=fJQPuS6gVt6CCIJQQjluC/SLbs4CLdN8vSwFaMGZwh3jBY9Fik6DW3IpKPMK40hZ4e2/Jt ExB7xMNnowGSvDICtgfC6Sl8l/IXnw9CwXj+37Fn+hl7T0XtlRNkcezi9pUVnBuA+J563B gv0VT2EbBYAetux7ArpzuT6qgeh9hxFoTyQ/HpxY4W7pxN64jnDaeIr45/q0C3KzyhJL3d oJWmANONscRHlkzaE2IukR/lk85yGbB+Ww6L+svgDodMuKV+PpKivmnwUXMlRY2+/Qn4v3 w7FPNVeavTMPQ3s5+xbwcBVjyG6hIcRFhlAWkzTfrHrlKigYtglgnJafR7cSnw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778700692; a=rsa-sha256; cv=none; b=rmt7iFut7J4XMRCn3bq3JdqMmLeuLqUZhOQdBhh55ifVeXB6sIQEWFnCmZIrLhsKSvekO/ LF/XG3TtEyDGr7eFfbzvm0uQz7saZGSt1+Z6bnWms7OKg4iGHwVU398f6wcxNVzI465xW1 5n3inB8aKeVj0IAtd8GH6WePIp25tEGr3ldXblqK9UXtv7Z/REqMraTKz/d17CI9JxU+h1 YaloltTb2iT94iE7jRk+THaf163+xCndCgIPRqU9L8Vy9oVZMeRS2p3a4HEzBNSVg2QuWK kc4owOQqHjGfKFSGzIQCdb4D9DsdyeCgyFDR956KEseAJWoMNqydHMLBmX2g8w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778700692; 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=rPChTGNA8D/vsCxJxy0DBKzOMSqCmOQHQ/g+S+lrM9M=; b=xD1BmV4orCrhdTjsfG5paJ00Wgv8EiG+kQgHlerkHG8CE8l1Czle5b/DFGoHLc7BAMSb0u yF+zj77qhQKB03sYWA/FUn7EG3TCwjh+CN0zzPivVH1nMUhW3Kq2Jutri1tbZwK4dVdIvw dYHis/NKbfKaAg8USkFobDIX0UrKm6JpGJU6FbhWOHN5Z+LUAft9Mgy4xbXDwAtOHVUb2P UicZeG/gL4dUma/0fagqXhAbsazsbfqdQtc/ib+joFIngoMYxDV3WBL1sbGinTZpRivmdO pUFuOSOeDR+UHda98anTUSnvh18JPY41Qy2qi7W+ghP88O8dDe9WGbgMHTIkgg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gG3VX30xjz13yr for ; Wed, 13 May 2026 19:31:32 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 26ce0 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 13 May 2026 19:31:32 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Alan Somers Subject: git: 1f5869130f6e - stable/15 - bsdinstall: do pkgbase installations with the "script" command 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: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org List-Id: 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: asomers X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 1f5869130f6ebd299e65a627eff23a8c3d360afb Auto-Submitted: auto-generated Date: Wed, 13 May 2026 19:31:32 +0000 Message-Id: <6a04d194.26ce0.d7af0b5@gitrepo.freebsd.org> The branch stable/15 has been updated by asomers: URL: https://cgit.FreeBSD.org/src/commit/?id=1f5869130f6ebd299e65a627eff23a8c3d360afb commit 1f5869130f6ebd299e65a627eff23a8c3d360afb Author: Alan Somers AuthorDate: 2026-04-28 17:27:17 +0000 Commit: Alan Somers CommitDate: 2026-05-13 19:27:34 +0000 bsdinstall: do pkgbase installations with the "script" command "bsdinstall script" will now do a pkgbase installation by default. The system components to install can be specified in the COMPONENTS variable, and have the same names as those used in the interactive installer. bsdinstall will still do a legacy distset installation if DISTRIBUTIONS is defined in the installerconfig file. PR: 290375 Sponsored by: ConnectWise Reviewed by: ziaee, ivy, jduran Differential Revision: https://reviews.freebsd.org/D56717 (cherry picked from commit dc14ae4217a0babb1240f813b642edc2d7b955a6) --- UPDATING | 5 +++ usr.sbin/bsdinstall/bsdinstall.8 | 45 ++++++++++++++++----- usr.sbin/bsdinstall/scripts/pkgbase.in | 15 ++++++- usr.sbin/bsdinstall/scripts/script | 71 ++++++++++++++++++++-------------- 4 files changed, 95 insertions(+), 41 deletions(-) diff --git a/UPDATING b/UPDATING index 034dabc4da81..137d2aa78e6c 100644 --- a/UPDATING +++ b/UPDATING @@ -12,6 +12,11 @@ Items affecting the ports and packages system can be found in /usr/ports/UPDATING. Please read that file before updating system packages and/or ports. +20260512: + "bsdinstall script" will now do a pkgbase installation by default. To + revert to the legacy distset installation, set "DISTRIBUTIONS" in + your installerconfig. + 20260422: Bump __FreeBSD_version to 1500508 for LinuxKPI after merges of changes to eventfd and changes for DRM 6.11, as well as diff --git a/usr.sbin/bsdinstall/bsdinstall.8 b/usr.sbin/bsdinstall/bsdinstall.8 index 282b88328e99..a35c8f56ada7 100644 --- a/usr.sbin/bsdinstall/bsdinstall.8 +++ b/usr.sbin/bsdinstall/bsdinstall.8 @@ -29,7 +29,7 @@ .\" ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE .\" POSSIBILITY OF SUCH DAMAGE. .\" -.Dd April 20, 2026 +.Dd May 12, 2026 .Dt BSDINSTALL 8 .Os .Sh NAME @@ -109,9 +109,12 @@ for more information on this target. .Pp The .Ev DISTRIBUTIONS -environment variable is set to -.Dq base.txz kernel.txz -by default for this target. +environment variable is unset by default for this target. +Instead, the +.Ev COMPONENTS +environment variable is effectively set to +.Dq base kernel kernel-dbg +for this target. .It Cm keymap If the current controlling TTY is a .Xr syscons 4 @@ -321,8 +324,17 @@ overridden when making scripted or customized installers. The directory to use for temporary files. Default: .Dq Pa /tmp +.It Ev COMPONENTS +The set of components to install for scripted installations using +base system packages, e.g., +.Dq base lib32 kernel-dbg tests . +Default: "base kernel-dbg" .It Ev DISTRIBUTIONS -The set of distributions to install, e.g., "base.txz kernel.txz ports.txz". +The set of distributions to install for traditional installations, e.g., +.Dq base.txz kernel.txz ports.txz . +If unset, then +.Nm +will install using base system packages. Default: unset unless noted otherwise in the .Sx TARGETS section. @@ -609,18 +621,18 @@ A typical bsdinstall script, using the default filesystem layout and the UFS filesystem, looks like this: .Bd -literal -offset indent PARTITIONS=DEFAULT -DISTRIBUTIONS="kernel.txz base.txz" +COMPONENTS="base debug" #!/bin/sh sysrc ifconfig_DEFAULT=DHCP sysrc sshd_enable=YES -pkg install puppet +pkg install -y puppet .Ed .Pp For a scripted installation involving a ZFS pool spanning multiple disks, the script instead looks like this: .Bd -literal -offset indent -DISTRIBUTIONS="kernel.txz base.txz" +COMPONENTS="base debug" export ZFSBOOT_VDEV_TYPE=stripe export ZFSBOOT_DISKS="ada0 ada1" export nonInteractive="YES" @@ -628,7 +640,20 @@ export nonInteractive="YES" #!/bin/sh echo "ifconfig_DEFAULT=DHCP" >> /etc/rc.conf echo "sshd_enable=YES" >> /etc/rc.conf -pkg install puppet +pkg install -y puppet +.Ed +.Pp +To install using traditional distributions sets instead of packages, set +.Ev DISTRIBUTIONS +to the list of distribution sets to install, like this: +.Bd -literal -offset indent +PARTITIONS=DEFAULT +DISTRIBUTIONS="kernel.txz base.txz" + +#!/bin/sh +sysrc ifconfig_DEFAULT=DHCP +sysrc sshd_enable=YES +pkg install -y puppet .Ed .Pp On @@ -653,7 +678,7 @@ arbitrary commands can be run here to extend the installer. In addition to the variables in .Sx ENVIRONMENT VARIABLES , in particular -.Ev DISTRIBUTIONS , +.Ev COMPONENTS , the preamble can contain a variable .Ev PARTITIONS which is passed to the diff --git a/usr.sbin/bsdinstall/scripts/pkgbase.in b/usr.sbin/bsdinstall/scripts/pkgbase.in index 89ddc244171e..2c7d6bcae904 100755 --- a/usr.sbin/bsdinstall/scripts/pkgbase.in +++ b/usr.sbin/bsdinstall/scripts/pkgbase.in @@ -180,7 +180,18 @@ local function select_components(components, options) } append_list(bsddialog_args, checklist_items) - local exit_code, output = bsddialog(bsddialog_args) + local exit_code = 0 + local output = "" + if options.non_interactive then + local env_components = os.getenv("COMPONENTS") + if env_components then + output = env_components:gsub(" ", "\n") + else + output = "base\nkernel-dbg" + end + else + exit_code, output = bsddialog(bsddialog_args) + end -- This should only be possible if bsddialog is killed by a signal -- or buggy, we disable the cancel option and esc key. -- If this does happen, there's not much we can do except exit with a @@ -300,6 +311,8 @@ local function parse_options() for _, a in ipairs(arg) do if a == "--jail" then options.jail = true + elseif a == "--non-interactive" then + options.non_interactive = true else io.stderr:write("Error: unknown option " .. a .. "\n") os.exit(1) diff --git a/usr.sbin/bsdinstall/scripts/script b/usr.sbin/bsdinstall/scripts/script index 21da2ea7c366..93d07c7899c3 100755 --- a/usr.sbin/bsdinstall/scripts/script +++ b/usr.sbin/bsdinstall/scripts/script @@ -40,6 +40,7 @@ f_include $BSDCFG_SHARE/variable.subr # PARTITIONS # DISTRIBUTIONS # BSDINSTALL_DISTDIR +# COMPONENTS # # Default name of the ZFS boot-pool @@ -97,7 +98,6 @@ awk 'BEGIN {pathb=ARGV[2]; ARGV[2]=""} /^#!/{b=1} { >$TMPDIR/bsdinstall-installscript-preamble . $TMPDIR/bsdinstall-installscript-preamble -: ${DISTRIBUTIONS="kernel.txz base.txz"}; export DISTRIBUTIONS export BSDINSTALL_DISTDIR # Re-initialize a new log if preamble changed BSDINSTALL_LOG @@ -118,37 +118,48 @@ else fi bsdinstall mount -# Fetch missing distribution files, if any -exec 5>&1 -export BSDINSTALL_DISTDIR=$(`dirname $0`/fetchmissingdists 2>&1 1>&5) -FETCH_RESULT=$? -exec 5>&- +if [ -n "$COMPONENTS" -a -n "$DISTRIBUTIONS" ]; then + error "Cannot set both COMPONENTS and DISTRIBUTIONS" +elif [ -z "$DISTRIBUTIONS" ]; then + # If COMPONENTS is set, or neither is, install with pkgbase + bsdinstall pkgbase --non-interactive +else + # Otherwise, unpack distsets -[ $FETCH_RESULT -ne 0 ] && error "Could not fetch remote distributions" + # Fetch missing distribution files, if any + exec 5>&1 + export BSDINSTALL_DISTDIR=$(`dirname $0`/fetchmissingdists 2>&1 1>&5) + FETCH_RESULT=$? + exec 5>&- -# Unpack distributions -bsdinstall checksum -if [ -t 0 ]; then - # If install is a tty, use distextract as normal - bsdinstall distextract -else - # Otherwise, we need to use tar (see https://reviews.freebsd.org/D10736) - for set in $DISTRIBUTIONS; do - f_dprintf "Extracting $BSDINSTALL_DISTDIR/$set" - # XXX: The below fails if any mountpoints are FAT, due to - # inability to set ctime/mtime on the root of FAT partitions, - # which is needed to support e.g. EFI system partitions. tar has - # no option to ignore this (distextract ignores them internally - # through a hack), and returns 1 on any warning or error, - # effectively turning all warnings into fatal errors. - # - # Work around this in an extremely lame way for the specific - # case of EFI system partitions only. This *ONLY WORKS* if - # /boot/efi is empty and does not handle analogous problems on - # other systems (ARM, PPC64). - tar -xf "$BSDINSTALL_DISTDIR/$set" -C $BSDINSTALL_CHROOT --exclude boot/efi - mkdir -p $BSDINSTALL_CHROOT/boot/efi - done + [ $FETCH_RESULT -ne 0 ] && error "Could not fetch remote distributions" + + bsdinstall checksum + if [ -t 0 ]; then + # If install is a tty, use distextract as normal + bsdinstall distextract + else + # Otherwise, we need to use tar (see + # https://reviews.freebsd.org/D10736) + for set in $DISTRIBUTIONS; do + f_dprintf "Extracting $BSDINSTALL_DISTDIR/$set" + # XXX: The below fails if any mountpoints are FAT, due + # to inability to set ctime/mtime on the root of FAT + # partitions, which is needed to support e.g. EFI + # system partitions. tar has no option to ignore this + # (distextract ignores them internally through a hack), + # and returns 1 on any warning or error, effectively + # turning all warnings into fatal errors. + # + # Work around this in an extremely lame way for the + # specific case of EFI system partitions only. This + # *ONLY WORKS* if /boot/efi is empty and does not + # handle analogous problems on other systems (ARM, + # PPC64). + tar -xf "$BSDINSTALL_DISTDIR/$set" -C $BSDINSTALL_CHROOT --exclude boot/efi + mkdir -p $BSDINSTALL_CHROOT/boot/efi + done + fi fi # Configure bootloader if needed From nobody Wed May 13 19:56:00 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 4gG42v1NXdz6cwTy for ; Wed, 13 May 2026 19:56:07 +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 "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gG42t71vdz3YJN for ; Wed, 13 May 2026 19:56:06 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778702167; 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=FOalfL25vT8e2Euk6tyEF5v4t+pj4nzykBk2NqUi1zA=; b=uEP3EGp6z55dQ6bD3jti8Vt0VIQLcyCARLwGPtic8XBT5hidrbs+I2qeuw1nZSTDIGUj3D Id82ZPR/Tz/8IkGOxbJR87WBgeCYvyCDIYTDstCEiOE1m5CR0Tvsx76kc+ksBa0kV1wCz2 aCi36ZvziB2OGmh52k9ODTwvtbffGMd9ydmy96Ae+qLD0+gI58SyoobiTX4IYv9eYDEQ1R Iqi4tLW7X9EvJN1whoB9PymAsEizqRfmLAYkwRBT79cVbR7tNMAEI1bojgj8+gNpGFOyKh ELX3QMkBC7fTZNDVfKPKI+W9QaZl6WJ+/7RUIF+x1TflN0Wk+yhA4kAkHZcY4Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778702166; a=rsa-sha256; cv=none; b=msY0BH78Kfb6+j8eNbmhByzqpP9QF3nREiKZAXDLY6JGoP0Cp4opDdJmNVZzFzvbtIUy1S E0UeV2tjVGN6kyJf7GdaBgH0QCAz03NoXdiBAeWlHKrDrGzk0PwHxuU27qxfwYnsz+BYj1 RPvHXcd6h5VAW0AxlDz4RVdkwtlluXViDAULzuGm/irvKNwuJ5UqpyN5z/IoAUu8Qij8hA VDkIT7VHmMyuxPHjLYGPH1HcZKqZC6ZQ8r/EXAnPrU9yWyeIEX/+P/XZvdZPkDjhnEtWnV KExL6HA6unq4vEVtafaT82lu8hRIufd6hKq0wOmMBj4itf0T2v+X4W1vS661vg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778702166; 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=FOalfL25vT8e2Euk6tyEF5v4t+pj4nzykBk2NqUi1zA=; b=cc+WQV9iMR9nrwacWUBxWsxZyfKxgv1fBP4rOymSTQXQQBOAvMQly7w19LpEIgZPQtgZnW CJfxSqlmS+sV+zzHCZ32wsMC56Yu3XUgm9um3WtOzVWEtswvGMjkYQ5SgfoyuflPNuHuop jHDMC+MdC+uBNAz54WSL7KzG7sqaOgb998tzN9EfozzRUoYMSpOBRGrQo4DQaDr8pwccMC qiByBFLO24meUdlVWyU8Voq7ca7/kzTRAxrUIyqRa8FldkGzaYX/sDcz/Ey6g6uguCUDEl gZ2ooMV8jO0fyp2IZKY2/MQro4ROsXW8WLX6a4AgdaNW5gPOxHfWb5hPfg+xrQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gG42t6cSqz14cG for ; Wed, 13 May 2026 19:56:06 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 33383 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 13 May 2026 19:56:00 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Martin Matuska Subject: git: a40f24ec2855 - stable/15 - zfs: merge openzfs/zfs@6330a45b0 (zfs-2.4-release) into stable/15 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: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org List-Id: 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: mm X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: a40f24ec28554c2387e766a47d2d4cb910d95865 Auto-Submitted: auto-generated Date: Wed, 13 May 2026 19:56:00 +0000 Message-Id: <6a04d750.33383.d8fa67b@gitrepo.freebsd.org> The branch stable/15 has been updated by mm: URL: https://cgit.FreeBSD.org/src/commit/?id=a40f24ec28554c2387e766a47d2d4cb910d95865 commit a40f24ec28554c2387e766a47d2d4cb910d95865 Merge: 1f5869130f6e 6330a45b06d2 Author: Martin Matuska AuthorDate: 2026-05-13 19:53:01 +0000 Commit: Martin Matuska CommitDate: 2026-05-13 19:53:41 +0000 zfs: merge openzfs/zfs@6330a45b0 (zfs-2.4-release) into stable/15 OpenZFS 2.4.2 Notable upstream pull request merges: #18208 6f14581e1 Cleanup allocation class selection #18235 7590972f7 Prevent range tree corruption race by updating dnode_sync() #18255 b06caaeec range_tree: use zfs_panic_recover() for partial-overlap remove #18258 33961142a Fix deadlock on dmu_tx_assign() from vdev_rebuild() #18262 02ed09106 Fix check for .cfi_negate_ra_state on aarch64 #18263 9f92266b7 Fix redundant declaration of dsl_pool_t #18276 3862aadf7 Fix vdev_rebuild_range() tx commit #18290 a94b137aa FreeBSD: Improve dmesg kernel message prefix #18294 938c8c98b draid: fix data corruption after disk clear #18310 b40cd9191 Fix s_active leak in zfsvfs_hold() when z_unmounted is true #18380 9b8ccbd2c draid: fix import failure after disks replacements #18399 4bb759274 Add support for POSIX_FADV_DONTNEED #18403 aba3ed30a fix memleak in spa_errlog.c #18405 e9a8c6e08 draid: allow seq resilver reads from degraded vdevs #18414 da44040bb draid: fix cksum errors after rebuild with degraded disks #18421 e7524594a Fix read corruption after block clone after truncate #18440 b8addf922 dmu_direct: avoid UAF in dmu_write_direct_done() #18473 76fd64ac9 Fix rare cksum errors after rebuild #18482 fc87e269e Initialize vr_last_txg for rebuild #18489 38501e182 Fix long POSIX_FADV_DONTNEED for single block files Obtained from: OpenZFS OpenZFS commit: 6330a45b06d20125de679aae5f63ba14082671ef OpenZFS tag: zfs-2.4.2 .../openzfs/.github/workflows/checkstyle.yaml | 7 +- sys/contrib/openzfs/.github/workflows/codeql.yml | 2 +- .../.github/workflows/scripts/generate-ci-type.py | 33 +- .../.github/workflows/scripts/merge_summary.awk | 38 ++ .../.github/workflows/scripts/qemu-1-setup.sh | 43 +- .../.github/workflows/scripts/qemu-2-start.sh | 81 ++- .../.github/workflows/scripts/qemu-3-deps-vm.sh | 22 +- .../.github/workflows/scripts/qemu-4-build-vm.sh | 11 +- .../.github/workflows/scripts/qemu-6-tests.sh | 4 +- .../.github/workflows/scripts/qemu-7-prepare.sh | 47 +- .../.github/workflows/scripts/qemu-8-summary.sh | 8 +- .../workflows/scripts/qemu-9-summary-page.sh | 4 +- sys/contrib/openzfs/.github/workflows/smatch.yml | 4 +- sys/contrib/openzfs/.github/workflows/zfs-arm.yml | 40 ++ .../.github/workflows/zfs-qemu-packages.yml | 25 +- sys/contrib/openzfs/.github/workflows/zfs-qemu.yml | 46 +- sys/contrib/openzfs/.github/workflows/zloop.yml | 7 +- sys/contrib/openzfs/META | 4 +- sys/contrib/openzfs/Makefile.am | 1 + sys/contrib/openzfs/README.md | 42 +- sys/contrib/openzfs/autogen.sh | 1 + sys/contrib/openzfs/cmd/Makefile.am | 1 + sys/contrib/openzfs/cmd/raidz_test/Makefile.am | 1 + sys/contrib/openzfs/cmd/zdb/Makefile.am | 1 + sys/contrib/openzfs/cmd/zed/Makefile.am | 1 + sys/contrib/openzfs/cmd/zed/zed.d/Makefile.am | 1 + sys/contrib/openzfs/cmd/zed/zed_event.c | 2 +- sys/contrib/openzfs/cmd/zfs/Makefile.am | 1 + sys/contrib/openzfs/cmd/zfs/zfs_main.c | 2 +- sys/contrib/openzfs/cmd/zinject/Makefile.am | 1 + sys/contrib/openzfs/cmd/zpool/Makefile.am | 1 + sys/contrib/openzfs/cmd/zpool_influxdb/Makefile.am | 1 + sys/contrib/openzfs/cmd/zstream/Makefile.am | 1 + sys/contrib/openzfs/config/CppCheck.am | 1 + sys/contrib/openzfs/config/Rules.am | 1 + sys/contrib/openzfs/config/Shellcheck.am | 1 + sys/contrib/openzfs/config/Substfiles.am | 1 + sys/contrib/openzfs/config/always-arch.m4 | 1 + .../openzfs/config/always-compiler-options.m4 | 1 + sys/contrib/openzfs/config/always-cppcheck.m4 | 1 + sys/contrib/openzfs/config/always-parallel.m4 | 1 + sys/contrib/openzfs/config/always-python.m4 | 1 + sys/contrib/openzfs/config/always-pyzfs.m4 | 1 + sys/contrib/openzfs/config/always-sed.m4 | 1 + sys/contrib/openzfs/config/always-shellcheck.m4 | 1 + sys/contrib/openzfs/config/always-system.m4 | 1 + sys/contrib/openzfs/config/ax_compare_version.m4 | 1 + sys/contrib/openzfs/config/ax_count_cpus.m4 | 1 + sys/contrib/openzfs/config/ax_python_devel.m4 | 1 + sys/contrib/openzfs/config/ax_restore_flags.m4 | 1 + sys/contrib/openzfs/config/ax_save_flags.m4 | 1 + sys/contrib/openzfs/config/deb.am | 21 +- sys/contrib/openzfs/config/find_system_library.m4 | 1 + sys/contrib/openzfs/config/gettext.m4 | 1 + sys/contrib/openzfs/config/host-cpu-c-abi.m4 | 1 + sys/contrib/openzfs/config/iconv.m4 | 1 + .../openzfs/config/kernel-access-ok-type.m4 | 1 + sys/contrib/openzfs/config/kernel-acl.m4 | 32 + sys/contrib/openzfs/config/kernel-add-disk.m4 | 1 + sys/contrib/openzfs/config/kernel-assign_str.m4 | 1 + sys/contrib/openzfs/config/kernel-automount.m4 | 1 + sys/contrib/openzfs/config/kernel-bio.m4 | 1 + sys/contrib/openzfs/config/kernel-bio_max_segs.m4 | 1 + sys/contrib/openzfs/config/kernel-blk-queue.m4 | 27 + sys/contrib/openzfs/config/kernel-blkdev.m4 | 1 + .../config/kernel-block-device-operations.m4 | 1 + .../openzfs/config/kernel-commit-metadata.m4 | 1 + .../openzfs/config/kernel-config-defined.m4 | 1 + .../config/kernel-copy-from-user-inatomic.m4 | 29 - .../openzfs/config/kernel-cpu_has_feature.m4 | 1 + .../openzfs/config/kernel-declare-event-class.m4 | 1 + sys/contrib/openzfs/config/kernel-dentry-alias.m4 | 32 + .../openzfs/config/kernel-dentry-operations.m4 | 1 + .../openzfs/config/kernel-discard-granularity.m4 | 1 + sys/contrib/openzfs/config/kernel-drop-inode.m4 | 1 + sys/contrib/openzfs/config/kernel-file.m4 | 1 + sys/contrib/openzfs/config/kernel-filelock.m4 | 23 + .../openzfs/config/kernel-filemap-splice-read.m4 | 1 + .../openzfs/config/kernel-flush_dcache_page.m4 | 1 + sys/contrib/openzfs/config/kernel-fmode-t.m4 | 1 + .../openzfs/config/kernel-follow-down-one.m4 | 1 + sys/contrib/openzfs/config/kernel-fpu.m4 | 1 + sys/contrib/openzfs/config/kernel-free-inode.m4 | 1 + sys/contrib/openzfs/config/kernel-fs-context.m4 | 36 ++ sys/contrib/openzfs/config/kernel-fst-mount.m4 | 30 - sys/contrib/openzfs/config/kernel-fsync-bdev.m4 | 1 + .../openzfs/config/kernel-generic_fadvise.m4 | 1 + .../openzfs/config/kernel-generic_fillattr.m4 | 1 + .../openzfs/config/kernel-generic_io_acct.m4 | 1 + sys/contrib/openzfs/config/kernel-genhd-flags.m4 | 1 + sys/contrib/openzfs/config/kernel-get-disk-ro.m4 | 1 + sys/contrib/openzfs/config/kernel-iattr-vfsid.m4 | 1 + sys/contrib/openzfs/config/kernel-idmap_mnt_api.m4 | 1 + sys/contrib/openzfs/config/kernel-inode-create.m4 | 1 + sys/contrib/openzfs/config/kernel-inode-getattr.m4 | 1 + sys/contrib/openzfs/config/kernel-inode-lookup.m4 | 1 + .../openzfs/config/kernel-inode-permission.m4 | 1 + sys/contrib/openzfs/config/kernel-inode-setattr.m4 | 1 + sys/contrib/openzfs/config/kernel-inode-state.m4 | 1 + sys/contrib/openzfs/config/kernel-inode-times.m4 | 1 + .../openzfs/config/kernel-insert-inode-locked.m4 | 1 + .../openzfs/config/kernel-is_owner_or_cap.m4 | 1 + sys/contrib/openzfs/config/kernel-kasan-enabled.m4 | 1 + .../openzfs/config/kernel-kmap-atomic-args.m4 | 1 + .../openzfs/config/kernel-kmap-local-page.m4 | 1 + sys/contrib/openzfs/config/kernel-kmem.m4 | 1 + sys/contrib/openzfs/config/kernel-kthread.m4 | 1 + sys/contrib/openzfs/config/kernel-kuid-helpers.m4 | 1 + sys/contrib/openzfs/config/kernel-kuidgid.m4 | 1 + .../openzfs/config/kernel-make-request-fn.m4 | 1 + sys/contrib/openzfs/config/kernel-misc-minor.m4 | 1 + sys/contrib/openzfs/config/kernel-mkdir.m4 | 1 + sys/contrib/openzfs/config/kernel-mknod.m4 | 1 + sys/contrib/openzfs/config/kernel-mm-page-flags.m4 | 1 + sys/contrib/openzfs/config/kernel-mm-pagemap.m4 | 1 + sys/contrib/openzfs/config/kernel-namespace.m4 | 1 + sys/contrib/openzfs/config/kernel-objtool.m4 | 1 + .../config/kernel-pagemap-folio_wait_bit.m4 | 1 + .../config/kernel-pagemap-readahead-page.m4 | 1 + sys/contrib/openzfs/config/kernel-pde-data.m4 | 1 + sys/contrib/openzfs/config/kernel-percpu.m4 | 1 + .../openzfs/config/kernel-pin-user-pages.m4 | 1 + .../openzfs/config/kernel-proc-operations.m4 | 1 + sys/contrib/openzfs/config/kernel-reclaim_state.m4 | 1 + .../openzfs/config/kernel-register_sysctl_table.m4 | 1 + sys/contrib/openzfs/config/kernel-rename.m4 | 1 + .../openzfs/config/kernel-revalidate-disk-size.m4 | 1 + sys/contrib/openzfs/config/kernel-sb-dying.m4 | 1 + sys/contrib/openzfs/config/kernel-sb-wb-err.m4 | 1 + sys/contrib/openzfs/config/kernel-sched.m4 | 1 + .../openzfs/config/kernel-security-inode-init.m4 | 1 + sys/contrib/openzfs/config/kernel-set-nlink.m4 | 1 + .../openzfs/config/kernel-setattr-prepare.m4 | 1 + sys/contrib/openzfs/config/kernel-sget-args.m4 | 1 + sys/contrib/openzfs/config/kernel-show-options.m4 | 1 + sys/contrib/openzfs/config/kernel-shrink.m4 | 1 + sys/contrib/openzfs/config/kernel-siginfo.m4 | 1 + sys/contrib/openzfs/config/kernel-stdarg.m4 | 1 + sys/contrib/openzfs/config/kernel-strlcpy.m4 | 1 + sys/contrib/openzfs/config/kernel-symlink.m4 | 1 + sys/contrib/openzfs/config/kernel-sysfs.m4 | 1 + sys/contrib/openzfs/config/kernel-timer.m4 | 1 + sys/contrib/openzfs/config/kernel-tmpfile.m4 | 1 + .../openzfs/config/kernel-totalhigh_pages.m4 | 1 + .../openzfs/config/kernel-totalram-pages-func.m4 | 1 + .../openzfs/config/kernel-truncate-setsize.m4 | 1 + sys/contrib/openzfs/config/kernel-types.m4 | 1 + sys/contrib/openzfs/config/kernel-usleep_range.m4 | 1 + .../openzfs/config/kernel-vfs-file_range.m4 | 1 + .../config/kernel-vfs-filemap_dirty_folio.m4 | 1 + sys/contrib/openzfs/config/kernel-vfs-fsync.m4 | 1 + sys/contrib/openzfs/config/kernel-vfs-iov_iter.m4 | 1 + .../openzfs/config/kernel-vfs-migrate_folio.m4 | 1 + .../openzfs/config/kernel-vfs-migratepage.m4 | 1 + .../openzfs/config/kernel-vfs-read_folio.m4 | 1 + sys/contrib/openzfs/config/kernel-vfs-readpages.m4 | 1 + .../openzfs/config/kernel-vfs-set_page_dirty.m4 | 1 + sys/contrib/openzfs/config/kernel-vfs-writepage.m4 | 1 + sys/contrib/openzfs/config/kernel-writeback.m4 | 1 + sys/contrib/openzfs/config/kernel-xattr-handler.m4 | 1 + sys/contrib/openzfs/config/kernel-zero_page.m4 | 1 + sys/contrib/openzfs/config/kernel.m4 | 22 +- sys/contrib/openzfs/config/lib-ld.m4 | 1 + sys/contrib/openzfs/config/lib-link.m4 | 1 + sys/contrib/openzfs/config/lib-prefix.m4 | 1 + sys/contrib/openzfs/config/mount-helper.m4 | 1 + sys/contrib/openzfs/config/nls.m4 | 1 + sys/contrib/openzfs/config/pkg.m4 | 1 + sys/contrib/openzfs/config/po.m4 | 1 + sys/contrib/openzfs/config/progtest.m4 | 1 + sys/contrib/openzfs/config/rpm.am | 1 + sys/contrib/openzfs/config/tgz.am | 1 + sys/contrib/openzfs/config/toolchain-cfi.m4 | 33 + sys/contrib/openzfs/config/toolchain-simd.m4 | 1 + sys/contrib/openzfs/config/user-aio.h.m4 | 1 + sys/contrib/openzfs/config/user-backtrace.m4 | 1 + sys/contrib/openzfs/config/user-clock_gettime.m4 | 1 + sys/contrib/openzfs/config/user-dracut.m4 | 1 + sys/contrib/openzfs/config/user-gettext.m4 | 1 + sys/contrib/openzfs/config/user-libaio.m4 | 1 + sys/contrib/openzfs/config/user-libatomic.m4 | 1 + sys/contrib/openzfs/config/user-libblkid.m4 | 1 + sys/contrib/openzfs/config/user-libcrypto.m4 | 1 + sys/contrib/openzfs/config/user-libexec.m4 | 1 + sys/contrib/openzfs/config/user-libfetch.m4 | 1 + sys/contrib/openzfs/config/user-libtirpc.m4 | 1 + sys/contrib/openzfs/config/user-libudev.m4 | 1 + sys/contrib/openzfs/config/user-libunwind.m4 | 1 + sys/contrib/openzfs/config/user-libuuid.m4 | 1 + sys/contrib/openzfs/config/user-makedev.m4 | 1 + sys/contrib/openzfs/config/user-mount-setattr.m4 | 27 + sys/contrib/openzfs/config/user-pam.m4 | 1 + sys/contrib/openzfs/config/user-runstatedir.m4 | 1 + sys/contrib/openzfs/config/user-statx.m4 | 2 + sys/contrib/openzfs/config/user-systemd.m4 | 1 + sys/contrib/openzfs/config/user-sysvinit.m4 | 1 + sys/contrib/openzfs/config/user-udev.m4 | 1 + sys/contrib/openzfs/config/user-zlib.m4 | 1 + sys/contrib/openzfs/config/user.m4 | 2 + sys/contrib/openzfs/config/zfs-build.m4 | 4 +- sys/contrib/openzfs/config/zfs-meta.m4 | 1 + sys/contrib/openzfs/configure.ac | 2 +- sys/contrib/openzfs/contrib/Makefile.am | 1 + .../openzfs/contrib/bash_completion.d/Makefile.am | 1 + sys/contrib/openzfs/contrib/bpftrace/Makefile.am | 1 + sys/contrib/openzfs/contrib/debian/Makefile.am | 1 + sys/contrib/openzfs/contrib/dracut/Makefile.am | 1 + sys/contrib/openzfs/contrib/initramfs/Makefile.am | 1 + sys/contrib/openzfs/contrib/initramfs/scripts/zfs | 8 +- .../openzfs/contrib/pam_zfs_key/Makefile.am | 1 + sys/contrib/openzfs/contrib/pyzfs/Makefile.am | 1 + sys/contrib/openzfs/contrib/zcp/Makefile.am | 1 + sys/contrib/openzfs/etc/Makefile.am | 1 + .../system-generators/zfs-mount-generator.c | 5 +- sys/contrib/openzfs/include/Makefile.am | 1 + sys/contrib/openzfs/include/os/freebsd/Makefile.am | 1 + sys/contrib/openzfs/include/os/linux/Makefile.am | 1 + .../include/os/linux/kernel/linux/dcache_compat.h | 2 + .../include/os/linux/kernel/linux/xattr_compat.h | 17 + .../include/os/linux/zfs/sys/zfs_vfsops_os.h | 14 +- sys/contrib/openzfs/include/sys/dbuf.h | 2 + sys/contrib/openzfs/include/sys/dmu.h | 2 + sys/contrib/openzfs/include/sys/dnode.h | 13 + sys/contrib/openzfs/include/sys/spa.h | 1 + sys/contrib/openzfs/include/sys/vdev_raidz_impl.h | 1 + sys/contrib/openzfs/include/sys/vdev_rebuild.h | 4 +- sys/contrib/openzfs/lib/Makefile.am | 1 + sys/contrib/openzfs/lib/libavl/Makefile.am | 1 + sys/contrib/openzfs/lib/libefi/Makefile.am | 1 + sys/contrib/openzfs/lib/libicp/Makefile.am | 1 + sys/contrib/openzfs/lib/libnvpair/Makefile.am | 1 + sys/contrib/openzfs/lib/libspl/Makefile.am | 1 + sys/contrib/openzfs/lib/libspl/include/Makefile.am | 1 + .../openzfs/lib/libspl/os/linux/getmntany.c | 9 +- sys/contrib/openzfs/lib/libuutil/uu_ident.c | 2 +- sys/contrib/openzfs/lib/libzdb/Makefile.am | 1 + sys/contrib/openzfs/lib/libzfs/Makefile.am | 1 + sys/contrib/openzfs/lib/libzfs/libzfs_dataset.c | 49 +- sys/contrib/openzfs/lib/libzfs/libzfs_diff.c | 4 +- sys/contrib/openzfs/lib/libzfs/libzfs_impl.h | 17 + sys/contrib/openzfs/lib/libzfs/libzfs_mount.c | 43 +- sys/contrib/openzfs/lib/libzfs/libzfs_pool.c | 2 +- sys/contrib/openzfs/lib/libzfs/libzfs_sendrecv.c | 2 +- .../openzfs/lib/libzfs/os/freebsd/libzfs_zmount.c | 11 + .../openzfs/lib/libzfs/os/linux/libzfs_mount_os.c | 143 +++++ sys/contrib/openzfs/lib/libzfs_core/Makefile.am | 1 + sys/contrib/openzfs/lib/libzfsbootenv/Makefile.am | 1 + sys/contrib/openzfs/lib/libzpool/Makefile.am | 1 + sys/contrib/openzfs/lib/libzstd/Makefile.am | 1 + sys/contrib/openzfs/lib/libzutil/Makefile.am | 1 + .../lib/libzutil/os/linux/zutil_device_path_os.c | 16 +- sys/contrib/openzfs/man/Makefile.am | 1 + .../icp/asm-aarch64/blake3/b3_aarch64_sse2.S | 4 +- .../icp/asm-aarch64/blake3/b3_aarch64_sse41.S | 4 +- sys/contrib/openzfs/module/nvpair/nvpair.c | 5 +- .../openzfs/module/os/freebsd/spl/spl_cmn_err.c | 10 +- .../openzfs/module/os/freebsd/zfs/zfs_vnops_os.c | 4 +- .../openzfs/module/os/linux/zfs/vdev_disk.c | 4 + .../openzfs/module/os/linux/zfs/zfs_ctldir.c | 35 +- sys/contrib/openzfs/module/os/linux/zfs/zfs_uio.c | 13 +- .../openzfs/module/os/linux/zfs/zfs_vfsops.c | 231 +------ sys/contrib/openzfs/module/os/linux/zfs/zpl_file.c | 44 +- .../openzfs/module/os/linux/zfs/zpl_super.c | 681 ++++++++++++++++++--- sys/contrib/openzfs/module/zfs/dbuf.c | 78 ++- sys/contrib/openzfs/module/zfs/dmu.c | 39 +- sys/contrib/openzfs/module/zfs/dmu_direct.c | 8 +- sys/contrib/openzfs/module/zfs/dmu_objset.c | 2 +- sys/contrib/openzfs/module/zfs/dnode.c | 2 + sys/contrib/openzfs/module/zfs/dnode_sync.c | 105 ++-- sys/contrib/openzfs/module/zfs/dsl_bookmark.c | 18 +- sys/contrib/openzfs/module/zfs/dsl_dir.c | 2 +- sys/contrib/openzfs/module/zfs/range_tree.c | 2 +- sys/contrib/openzfs/module/zfs/spa.c | 2 +- sys/contrib/openzfs/module/zfs/spa_errlog.c | 2 +- sys/contrib/openzfs/module/zfs/spa_misc.c | 48 +- sys/contrib/openzfs/module/zfs/vdev.c | 29 +- sys/contrib/openzfs/module/zfs/vdev_draid.c | 76 ++- sys/contrib/openzfs/module/zfs/vdev_mirror.c | 13 +- sys/contrib/openzfs/module/zfs/vdev_raidz.c | 44 +- sys/contrib/openzfs/module/zfs/vdev_rebuild.c | 56 +- sys/contrib/openzfs/module/zfs/zfs_ioctl.c | 1 + sys/contrib/openzfs/module/zfs/zio.c | 6 +- sys/contrib/openzfs/rpm/Makefile.am | 1 + sys/contrib/openzfs/scripts/Makefile.am | 1 + sys/contrib/openzfs/scripts/spdxcheck.pl | 35 +- sys/contrib/openzfs/scripts/zfs-tests.sh | 16 +- sys/contrib/openzfs/tests/Makefile.am | 1 + sys/contrib/openzfs/tests/runfiles/common.run | 15 +- sys/contrib/openzfs/tests/runfiles/linux.run | 4 + .../openzfs/tests/test-runner/bin/zts-report.py.in | 3 +- sys/contrib/openzfs/tests/zfs-tests/Makefile.am | 1 + sys/contrib/openzfs/tests/zfs-tests/cmd/.gitignore | 2 + .../openzfs/tests/zfs-tests/cmd/Makefile.am | 4 + .../tests/zfs-tests/cmd/clone_after_trunc.c | 117 ++++ sys/contrib/openzfs/tests/zfs-tests/cmd/setlease.c | 126 ++++ .../openzfs/tests/zfs-tests/cmd/threadsappend.c | 8 +- .../openzfs/tests/zfs-tests/include/commands.cfg | 6 +- .../openzfs/tests/zfs-tests/include/libtest.shlib | 15 + .../openzfs/tests/zfs-tests/tests/Makefile.am | 11 + .../block_cloning/block_cloning_after_trunc.ksh | 31 + .../tests/functional/cli_root/zfs_list/cleanup.ksh | 30 + .../tests/functional/cli_root/zfs_list/setup.ksh | 32 + .../cli_root/zfs_list/zfs_list_009_pos.ksh | 69 +++ .../tests/functional/fadvise/fadvise_dontneed.ksh | 70 +++ .../zfs-tests/tests/functional/lease/cleanup.ksh | 26 + .../tests/functional/lease/lease_setlease.ksh | 44 ++ .../zfs-tests/tests/functional/lease/setup.ksh | 27 + .../tests/functional/redundancy/redundancy.kshlib | 71 ++- .../functional/redundancy/redundancy_draid.ksh | 12 +- .../redundancy/redundancy_draid_damaged1.ksh | 7 +- .../redundancy/redundancy_draid_damaged2.ksh | 14 +- .../redundancy/redundancy_draid_degraded1.ksh | 136 ++++ .../redundancy/redundancy_draid_degraded2.ksh | 152 +++++ .../redundancy/redundancy_draid_spare1.ksh | 13 +- .../redundancy/redundancy_draid_spare2.ksh | 8 +- .../redundancy/redundancy_draid_spare3.ksh | 28 +- sys/contrib/openzfs/udev/Makefile.am | 1 + sys/modules/zfs/zfs_config.h | 29 +- sys/modules/zfs/zfs_gitrev.h | 2 +- 319 files changed, 3254 insertions(+), 837 deletions(-) diff --cc sys/contrib/openzfs/.github/workflows/zfs-arm.yml index 000000000000,6039e4736c42..6039e4736c42 mode 000000,100644..100644 --- a/sys/contrib/openzfs/.github/workflows/zfs-arm.yml +++ b/sys/contrib/openzfs/.github/workflows/zfs-arm.yml diff --cc sys/contrib/openzfs/README.md index a39b88fedd12,000000000000..1f823b594433 mode 100644,000000..100644 --- a/sys/contrib/openzfs/README.md +++ b/sys/contrib/openzfs/README.md @@@ -1,35 -1,0 +1,71 @@@ +![img](https://openzfs.github.io/openzfs-docs/_static/img/logo/480px-Open-ZFS-Secondary-Logo-Colour-halfsize.png) + +OpenZFS is an advanced file system and volume manager which was originally +developed for Solaris and is now maintained by the OpenZFS community. +This repository contains the code for running OpenZFS on Linux and FreeBSD. + +[![codecov](https://codecov.io/gh/openzfs/zfs/branch/master/graph/badge.svg)](https://codecov.io/gh/openzfs/zfs) +[![coverity](https://scan.coverity.com/projects/1973/badge.svg)](https://scan.coverity.com/projects/openzfs-zfs) + +# Official Resources + + * [Documentation](https://openzfs.github.io/openzfs-docs/) - for using and developing this repo + * [ZoL site](https://zfsonlinux.org) - Linux release info & links + * [Mailing lists](https://openzfs.github.io/openzfs-docs/Project%20and%20Community/Mailing%20Lists.html) + * [OpenZFS site](https://openzfs.org/) - for conference videos and info on other platforms (illumos, OSX, Windows, etc) + +# Installation + +Full documentation for installing OpenZFS on your favorite operating system can +be found at the [Getting Started Page](https://openzfs.github.io/openzfs-docs/Getting%20Started/index.html). + +# Contribute & Develop + +We have a separate document with [contribution guidelines](./.github/CONTRIBUTING.md). + +We have a [Code of Conduct](./CODE_OF_CONDUCT.md). + +# Release + +OpenZFS is released under a CDDL license. +For more details see the NOTICE, LICENSE and COPYRIGHT files; `UCRL-CODE-235197` + - # Supported Kernels - * The `META` file contains the officially recognized supported Linux kernel versions. - * Supported FreeBSD versions are any supported branches and releases starting from 13.0-RELEASE. ++# Supported Kernels and Distributions ++ ++## Linux ++ ++Given the wide variety of Linux environments, we prioritize development and testing on stable, supported kernels and distributions. ++ ++### Kernel ([kernel.org](https://kernel.org)) ++ ++All **longterm** kernels from [kernel.org](https://kernel.org) are supported. **stable** kernels are usually supported in the next OpenZFS release. ++ ++**Supported longterm kernels**: **6.18**, **6.12**, **6.6**, **6.1**, **5.15**, **5.10**. ++ ++### Red Hat Enterprise Linux (RHEL) ++ ++All RHEL (and compatible systems: AlmaLinux OS, Rocky Linux, etc) on the **full** or **maintenance** support tracks are supported. ++ ++**Supported RHEL releases**: **8.10**, **9.7**, **10.1**. ++ ++### Ubuntu ++ ++All Ubuntu **LTS** releases are supported. ++ ++**Supported Ubuntu releases**: **24.04 “Noble”**, **22.04 “Jammy”**. ++ ++### Debian ++ ++All Debian **stable** and **LTS** releases are supported. ++ ++**Supported Debian releases**: **13 “Trixie”**, **12 “Bookworm”**, **11 “Bullseye”**. ++ ++### Other Distributions ++ ++Generally, if a distribution is following an LTS kernel, it should work well with OpenZFS. ++ ++## FreeBSD ++ ++All FreeBSD releases receiving **security support** are supported by OpenZFS. ++ ++**Supported FreeBSD releases**: **15.0**, **14.3**, **13.5**. diff --cc sys/contrib/openzfs/config/kernel-dentry-alias.m4 index 000000000000,0baf1a06d3ce..0baf1a06d3ce mode 000000,100644..100644 --- a/sys/contrib/openzfs/config/kernel-dentry-alias.m4 +++ b/sys/contrib/openzfs/config/kernel-dentry-alias.m4 diff --cc sys/contrib/openzfs/config/kernel-filelock.m4 index 000000000000,5e8d7c784692..5e8d7c784692 mode 000000,100644..100644 --- a/sys/contrib/openzfs/config/kernel-filelock.m4 +++ b/sys/contrib/openzfs/config/kernel-filelock.m4 diff --cc sys/contrib/openzfs/config/kernel-fs-context.m4 index 000000000000,317ddc21273d..317ddc21273d mode 000000,100644..100644 --- a/sys/contrib/openzfs/config/kernel-fs-context.m4 +++ b/sys/contrib/openzfs/config/kernel-fs-context.m4 diff --cc sys/contrib/openzfs/config/toolchain-cfi.m4 index 000000000000,f1ad2b23934d..f1ad2b23934d mode 000000,100644..100644 --- a/sys/contrib/openzfs/config/toolchain-cfi.m4 +++ b/sys/contrib/openzfs/config/toolchain-cfi.m4 diff --cc sys/contrib/openzfs/config/user-mount-setattr.m4 index 000000000000,efcfd66b2e9a..efcfd66b2e9a mode 000000,100644..100644 --- a/sys/contrib/openzfs/config/user-mount-setattr.m4 +++ b/sys/contrib/openzfs/config/user-mount-setattr.m4 diff --cc sys/contrib/openzfs/tests/zfs-tests/cmd/clone_after_trunc.c index 000000000000,631432928984..631432928984 mode 000000,100644..100644 --- a/sys/contrib/openzfs/tests/zfs-tests/cmd/clone_after_trunc.c +++ b/sys/contrib/openzfs/tests/zfs-tests/cmd/clone_after_trunc.c diff --cc sys/contrib/openzfs/tests/zfs-tests/cmd/setlease.c index 000000000000,12bcbd91beb5..12bcbd91beb5 mode 000000,100644..100644 --- a/sys/contrib/openzfs/tests/zfs-tests/cmd/setlease.c +++ b/sys/contrib/openzfs/tests/zfs-tests/cmd/setlease.c diff --cc sys/contrib/openzfs/tests/zfs-tests/tests/functional/block_cloning/block_cloning_after_trunc.ksh index 000000000000,977ec16042b7..977ec16042b7 mode 000000,100755..100755 --- a/sys/contrib/openzfs/tests/zfs-tests/tests/functional/block_cloning/block_cloning_after_trunc.ksh +++ b/sys/contrib/openzfs/tests/zfs-tests/tests/functional/block_cloning/block_cloning_after_trunc.ksh diff --cc sys/contrib/openzfs/tests/zfs-tests/tests/functional/cli_root/zfs_list/cleanup.ksh index 000000000000,138dfe0473cc..138dfe0473cc mode 000000,100755..100755 --- a/sys/contrib/openzfs/tests/zfs-tests/tests/functional/cli_root/zfs_list/cleanup.ksh +++ b/sys/contrib/openzfs/tests/zfs-tests/tests/functional/cli_root/zfs_list/cleanup.ksh diff --cc sys/contrib/openzfs/tests/zfs-tests/tests/functional/cli_root/zfs_list/setup.ksh index 000000000000,912fcfc40f69..912fcfc40f69 mode 000000,100755..100755 --- a/sys/contrib/openzfs/tests/zfs-tests/tests/functional/cli_root/zfs_list/setup.ksh +++ b/sys/contrib/openzfs/tests/zfs-tests/tests/functional/cli_root/zfs_list/setup.ksh diff --cc sys/contrib/openzfs/tests/zfs-tests/tests/functional/cli_root/zfs_list/zfs_list_009_pos.ksh index 000000000000,758aa7608d3e..758aa7608d3e mode 000000,100755..100755 --- a/sys/contrib/openzfs/tests/zfs-tests/tests/functional/cli_root/zfs_list/zfs_list_009_pos.ksh +++ b/sys/contrib/openzfs/tests/zfs-tests/tests/functional/cli_root/zfs_list/zfs_list_009_pos.ksh diff --cc sys/contrib/openzfs/tests/zfs-tests/tests/functional/fadvise/fadvise_dontneed.ksh index 000000000000,53f3ad999d3b..53f3ad999d3b mode 000000,100755..100755 --- a/sys/contrib/openzfs/tests/zfs-tests/tests/functional/fadvise/fadvise_dontneed.ksh +++ b/sys/contrib/openzfs/tests/zfs-tests/tests/functional/fadvise/fadvise_dontneed.ksh diff --cc sys/contrib/openzfs/tests/zfs-tests/tests/functional/lease/cleanup.ksh index 000000000000,5e73dd34936e..5e73dd34936e mode 000000,100755..100755 --- a/sys/contrib/openzfs/tests/zfs-tests/tests/functional/lease/cleanup.ksh +++ b/sys/contrib/openzfs/tests/zfs-tests/tests/functional/lease/cleanup.ksh diff --cc sys/contrib/openzfs/tests/zfs-tests/tests/functional/lease/lease_setlease.ksh index 000000000000,8647d01995c3..8647d01995c3 mode 000000,100755..100755 --- a/sys/contrib/openzfs/tests/zfs-tests/tests/functional/lease/lease_setlease.ksh +++ b/sys/contrib/openzfs/tests/zfs-tests/tests/functional/lease/lease_setlease.ksh diff --cc sys/contrib/openzfs/tests/zfs-tests/tests/functional/lease/setup.ksh index 000000000000,09da91b0f93f..09da91b0f93f mode 000000,100755..100755 --- a/sys/contrib/openzfs/tests/zfs-tests/tests/functional/lease/setup.ksh +++ b/sys/contrib/openzfs/tests/zfs-tests/tests/functional/lease/setup.ksh diff --cc sys/contrib/openzfs/tests/zfs-tests/tests/functional/redundancy/redundancy_draid_degraded1.ksh index 000000000000,31444850f76c..31444850f76c mode 000000,100755..100755 --- a/sys/contrib/openzfs/tests/zfs-tests/tests/functional/redundancy/redundancy_draid_degraded1.ksh +++ b/sys/contrib/openzfs/tests/zfs-tests/tests/functional/redundancy/redundancy_draid_degraded1.ksh diff --cc sys/contrib/openzfs/tests/zfs-tests/tests/functional/redundancy/redundancy_draid_degraded2.ksh index 000000000000,22e1f2dfb310..22e1f2dfb310 mode 000000,100755..100755 --- a/sys/contrib/openzfs/tests/zfs-tests/tests/functional/redundancy/redundancy_draid_degraded2.ksh +++ b/sys/contrib/openzfs/tests/zfs-tests/tests/functional/redundancy/redundancy_draid_degraded2.ksh diff --cc sys/modules/zfs/zfs_config.h index 635fb0a7e91f,000000000000..e3e3437d438a mode 100644,000000..100644 --- a/sys/modules/zfs/zfs_config.h +++ b/sys/modules/zfs/zfs_config.h @@@ -1,904 -1,0 +1,925 @@@ +/* + */ + +/* zfs_config.h. Generated from zfs_config.h.in by configure. */ +/* zfs_config.h.in. Generated from configure.ac by autoheader. */ + +/* Define to 1 if translation of program messages to the user's native + language is requested. */ +/* #undef ENABLE_NLS */ + +/* __assign_str() has one arg */ +/* #undef HAVE_1ARG_ASSIGN_STR */ + +/* lookup_bdev() wants 1 arg */ +/* #undef HAVE_1ARG_LOOKUP_BDEV */ + +/* kernel has access_ok with 'type' parameter */ +/* #undef HAVE_ACCESS_OK_TYPE */ + +/* add_disk() returns int */ +/* #undef HAVE_ADD_DISK_RET */ + +/* Define if host toolchain supports AES */ +#define HAVE_AES 1 + +/* Define if you have [rt] */ +#define HAVE_AIO_H 1 + ++/* Define if your assembler supports .cfi_negate_ra_state. */ ++/* #undef HAVE_AS_CFI_PSEUDO_OP */ ++ +#ifdef __amd64__ +#ifndef RESCUE +/* Define if host toolchain supports AVX */ +#define HAVE_AVX 1 +#endif + +/* Define if host toolchain supports AVX2 */ +#define HAVE_AVX2 1 + +/* Define if host toolchain supports AVX512BW */ +#define HAVE_AVX512BW 1 + +/* Define if host toolchain supports AVX512CD */ +#define HAVE_AVX512CD 1 + +/* Define if host toolchain supports AVX512DQ */ +#define HAVE_AVX512DQ 1 + +/* Define if host toolchain supports AVX512ER */ +#define HAVE_AVX512ER 1 + +/* Define if host toolchain supports AVX512F */ +#define HAVE_AVX512F 1 + +/* Define if host toolchain supports AVX512IFMA */ +#define HAVE_AVX512IFMA 1 + +/* Define if host toolchain supports AVX512PF */ +#define HAVE_AVX512PF 1 + +/* Define if host toolchain supports AVX512VBMI */ +#define HAVE_AVX512VBMI 1 + +/* Define if host toolchain supports AVX512VL */ +#define HAVE_AVX512VL 1 +#endif + +/* backtrace() is available */ +/* #undef HAVE_BACKTRACE */ + +/* bdevname() is available */ +/* #undef HAVE_BDEVNAME */ + +/* bdev_check_media_change() exists */ +/* #undef HAVE_BDEV_CHECK_MEDIA_CHANGE */ + +/* bdev_file_open_by_path() exists */ +/* #undef HAVE_BDEV_FILE_OPEN_BY_PATH */ + +/* bdev_*_io_acct() available */ +/* #undef HAVE_BDEV_IO_ACCT_63 */ + +/* bdev_*_io_acct() available */ +/* #undef HAVE_BDEV_IO_ACCT_OLD */ + +/* bdev_kobj() exists */ +/* #undef HAVE_BDEV_KOBJ */ + +/* bdev_max_discard_sectors() is available */ +/* #undef HAVE_BDEV_MAX_DISCARD_SECTORS */ + +/* bdev_max_secure_erase_sectors() is available */ +/* #undef HAVE_BDEV_MAX_SECURE_ERASE_SECTORS */ + +/* bdev_nr_bytes() is available */ +/* #undef HAVE_BDEV_NR_BYTES */ + +/* bdev_open_by_path() exists */ +/* #undef HAVE_BDEV_OPEN_BY_PATH */ + +/* bdev_release() exists */ +/* #undef HAVE_BDEV_RELEASE */ + +/* block_device_operations->submit_bio() returns void */ +/* #undef HAVE_BDEV_SUBMIT_BIO_RETURNS_VOID */ + +/* bdev_whole() is available */ +/* #undef HAVE_BDEV_WHOLE */ + +/* bio_alloc() takes 4 arguments */ +/* #undef HAVE_BIO_ALLOC_4ARG */ + +/* bio->bi_bdev->bd_disk exists */ +/* #undef HAVE_BIO_BDEV_DISK */ + +/* bio_*_io_acct() available */ +/* #undef HAVE_BIO_IO_ACCT */ + +/* bio_max_segs() is implemented */ +/* #undef HAVE_BIO_MAX_SEGS */ + +/* bio_set_dev() GPL-only */ +/* #undef HAVE_BIO_SET_DEV_GPL_ONLY */ + +/* bio_set_dev() is a macro */ +/* #undef HAVE_BIO_SET_DEV_MACRO */ + +/* bio_set_op_attrs is available */ +/* #undef HAVE_BIO_SET_OP_ATTRS */ + +/* blkdev_get_by_path() exists and takes 4 args */ +/* #undef HAVE_BLKDEV_GET_BY_PATH_4ARG */ + +/* blkdev_get_by_path() handles ERESTARTSYS */ +/* #undef HAVE_BLKDEV_GET_ERESTARTSYS */ + +/* __blkdev_issue_discard(flags) is available */ +/* #undef HAVE_BLKDEV_ISSUE_DISCARD_ASYNC_FLAGS */ + +/* __blkdev_issue_discard() is available */ +/* #undef HAVE_BLKDEV_ISSUE_DISCARD_ASYNC_NOFLAGS */ + +/* blkdev_issue_discard(flags) is available */ +/* #undef HAVE_BLKDEV_ISSUE_DISCARD_FLAGS */ + +/* blkdev_issue_discard() is available */ +/* #undef HAVE_BLKDEV_ISSUE_DISCARD_NOFLAGS */ + +/* blkdev_issue_secure_erase() is available */ +/* #undef HAVE_BLKDEV_ISSUE_SECURE_ERASE */ + +/* blkdev_put() exists */ +/* #undef HAVE_BLKDEV_PUT */ + +/* blkdev_put() accepts void* as arg 2 */ +/* #undef HAVE_BLKDEV_PUT_HOLDER */ + +/* struct queue_limits has a features field */ +/* #undef HAVE_BLKDEV_QUEUE_LIMITS_FEATURES */ + +/* blkdev_reread_part() exists */ +/* #undef HAVE_BLKDEV_REREAD_PART */ + +/* blkg_tryget() is available */ +/* #undef HAVE_BLKG_TRYGET */ + +/* blkg_tryget() GPL-only */ +/* #undef HAVE_BLKG_TRYGET_GPL_ONLY */ + +/* blk_alloc_disk() exists */ +/* #undef HAVE_BLK_ALLOC_DISK */ + +/* blk_alloc_disk() exists and takes 2 args */ +/* #undef HAVE_BLK_ALLOC_DISK_2ARG */ + +/* blk_alloc_queue() expects request function */ +/* #undef HAVE_BLK_ALLOC_QUEUE_REQUEST_FN */ + +/* blk_alloc_queue_rh() expects request function */ +/* #undef HAVE_BLK_ALLOC_QUEUE_REQUEST_FN_RH */ + +/* blk_cleanup_disk() exists */ +/* #undef HAVE_BLK_CLEANUP_DISK */ + +/* blk_mode_t is defined */ +/* #undef HAVE_BLK_MODE_T */ + +/* block multiqueue hardware context is cached in struct request */ +/* #undef HAVE_BLK_MQ_RQ_HCTX */ + +/* blk queue backing_dev_info is dynamic */ +/* #undef HAVE_BLK_QUEUE_BDI_DYNAMIC */ + +/* blk_queue_discard() is available */ +/* #undef HAVE_BLK_QUEUE_DISCARD */ + +/* backing_dev_info is available through queue gendisk */ +/* #undef HAVE_BLK_QUEUE_DISK_BDI */ + ++/* blk_queue_rot() is available */ ++/* #undef HAVE_BLK_QUEUE_ROT */ ++ +/* blk_queue_secure_erase() is available */ +/* #undef HAVE_BLK_QUEUE_SECURE_ERASE */ + +/* blk_queue_update_readahead() exists */ +/* #undef HAVE_BLK_QUEUE_UPDATE_READAHEAD */ + +/* BLK_STS_RESV_CONFLICT is defined */ +/* #undef HAVE_BLK_STS_RESV_CONFLICT */ + +/* Define if getgeo() in block_device_operations takes struct gendisk * as its + first arg */ +/* #undef HAVE_BLOCK_DEVICE_OPERATIONS_GETGEO_GENDISK */ + +/* Define if release() in block_device_operations takes 1 arg */ +/* #undef HAVE_BLOCK_DEVICE_OPERATIONS_RELEASE_1ARG */ + +/* Define if revalidate_disk() in block_device_operations */ +/* #undef HAVE_BLOCK_DEVICE_OPERATIONS_REVALIDATE_DISK */ + +/* Define to 1 if you have the Mac OS X function + CFLocaleCopyPreferredLanguages in the CoreFoundation framework. */ +/* #undef HAVE_CFLOCALECOPYPREFERREDLANGUAGES */ + +/* Define to 1 if you have the Mac OS X function CFPreferencesCopyAppValue in + the CoreFoundation framework. */ +/* #undef HAVE_CFPREFERENCESCOPYAPPVALUE */ + +/* check_disk_change() exists */ +/* #undef HAVE_CHECK_DISK_CHANGE */ + +/* copy_splice_read exists */ +/* #undef HAVE_COPY_SPLICE_READ */ + +/* cpu_has_feature() is GPL-only */ +/* #undef HAVE_CPU_HAS_FEATURE_GPL_ONLY */ + +/* Define if the GNU dcgettext() function is already present or preinstalled. + */ +/* #undef HAVE_DCGETTEXT */ + +/* DECLARE_EVENT_CLASS() is available */ +/* #undef HAVE_DECLARE_EVENT_CLASS */ + ++/* dentry aliases are in d_u member */ ++/* #undef HAVE_DENTRY_D_U_ALIASES */ ++ +/* 3-arg dequeue_signal() takes a type argument */ +/* #undef HAVE_DEQUEUE_SIGNAL_3ARG_TYPE */ + +/* dequeue_signal() takes 4 arguments */ +/* #undef HAVE_DEQUEUE_SIGNAL_4ARG */ + +/* lookup_bdev() wants dev_t arg */ +/* #undef HAVE_DEVT_LOOKUP_BDEV */ + +/* disk_check_media_change() exists */ +/* #undef HAVE_DISK_CHECK_MEDIA_CHANGE */ + +/* disk_*_io_acct() available */ +/* #undef HAVE_DISK_IO_ACCT */ + +/* disk_update_readahead() exists */ +/* #undef HAVE_DISK_UPDATE_READAHEAD */ + +/* Define to 1 if you have the header file. */ +#define HAVE_DLFCN_H 1 + +/* dops->d_revalidate() takes 4 args */ +/* #undef HAVE_D_REVALIDATE_4ARGS */ + +/* Define if d_set_d_op() is available */ +/* #undef HAVE_D_SET_D_OP */ + +/* Define to 1 if you have the 'execvpe' function. */ +#define HAVE_EXECVPE 1 + +/* fault_in_iov_iter_readable() is available */ +/* #undef HAVE_FAULT_IN_IOV_ITER_READABLE */ + ++/* linux/filelock.h exists */ ++/* #undef HAVE_FILELOCK_HEADER */ ++ +/* file->f_version exists */ +/* #undef HAVE_FILE_F_VERSION */ + +/* flush_dcache_page() is GPL-only */ +/* #undef HAVE_FLUSH_DCACHE_PAGE_GPL_ONLY */ + +/* Define if compiler supports -Wformat-overflow */ +/* #undef HAVE_FORMAT_OVERFLOW */ + +/* fsync_bdev() is declared in include/blkdev.h */ +/* #undef HAVE_FSYNC_BDEV */ + ++/* fs_context exists */ ++/* #undef HAVE_FS_CONTEXT */ ++ +/* yes */ +/* #undef HAVE_GENERIC_FADVISE */ + +/* generic_fillattr requires struct mnt_idmap* */ +/* #undef HAVE_GENERIC_FILLATTR_IDMAP */ + +/* generic_fillattr requires struct mnt_idmap* and u32 request_mask */ +/* #undef HAVE_GENERIC_FILLATTR_IDMAP_REQMASK */ + +/* generic_fillattr requires struct user_namespace* */ +/* #undef HAVE_GENERIC_FILLATTR_USERNS */ + +/* generic_*_io_acct() 4 arg available */ +/* #undef HAVE_GENERIC_IO_ACCT_4ARG */ + +/* GENHD_FL_EXT_DEVT flag is available */ +/* #undef HAVE_GENHD_FL_EXT_DEVT */ + +/* GENHD_FL_NO_PART flag is available */ +/* #undef HAVE_GENHD_FL_NO_PART */ + +/* Define if the GNU gettext() function is already present or preinstalled. */ +/* #undef HAVE_GETTEXT */ + +/* Define to 1 if you have the 'gettid' function. */ +/* #undef HAVE_GETTID */ + +/* iops->get_acl() exists */ +/* #undef HAVE_GET_ACL */ + +/* iops->get_acl() takes rcu */ +/* #undef HAVE_GET_ACL_RCU */ + +/* has iops->get_inode_acl() */ +/* #undef HAVE_GET_INODE_ACL */ + +/* iattr->ia_vfsuid and iattr->ia_vfsgid exist */ +/* #undef HAVE_IATTR_VFSID */ + +/* Define if you have the iconv() function and it works. */ +#define HAVE_ICONV 1 + +/* iops->getattr() takes struct mnt_idmap* */ +/* #undef HAVE_IDMAP_IOPS_GETATTR */ + +/* iops->setattr() takes struct mnt_idmap* */ +/* #undef HAVE_IDMAP_IOPS_SETATTR */ + +/* APIs for idmapped mount are present */ +/* #undef HAVE_IDMAP_MNT_API */ + +/* mnt_idmap does not have user_namespace */ +/* #undef HAVE_IDMAP_NO_USERNS */ + +/* Define if compiler supports -Wimplicit-fallthrough */ +/* #undef HAVE_IMPLICIT_FALLTHROUGH */ + +/* Define if compiler supports -Winfinite-recursion */ +/* #undef HAVE_INFINITE_RECURSION */ + +/* inode_generic_drop() exists */ +/* #undef HAVE_INODE_GENERIC_DROP */ + +/* inode_get_atime() exists in linux/fs.h */ +/* #undef HAVE_INODE_GET_ATIME */ + +/* inode_get_ctime() exists in linux/fs.h */ +/* #undef HAVE_INODE_GET_CTIME */ + +/* inode_get_mtime() exists in linux/fs.h */ +/* #undef HAVE_INODE_GET_MTIME */ + +/* inode_owner_or_capable() exists */ +/* #undef HAVE_INODE_OWNER_OR_CAPABLE */ + +/* inode_owner_or_capable() takes mnt_idmap */ +/* #undef HAVE_INODE_OWNER_OR_CAPABLE_IDMAP */ + +/* inode_owner_or_capable() takes user_ns */ +/* #undef HAVE_INODE_OWNER_OR_CAPABLE_USERNS */ + +/* inode_set_atime_to_ts() exists in linux/fs.h */ +/* #undef HAVE_INODE_SET_ATIME_TO_TS */ + +/* inode_set_ctime_to_ts() exists in linux/fs.h */ +/* #undef HAVE_INODE_SET_CTIME_TO_TS */ + +/* inode_set_mtime_to_ts() exists in linux/fs.h */ +/* #undef HAVE_INODE_SET_MTIME_TO_TS */ + +/* inode_state_read_once() exists */ +/* #undef HAVE_INODE_STATE_READ_ONCE */ + +/* timestamp_truncate() exists */ +/* #undef HAVE_INODE_TIMESTAMP_TRUNCATE */ + +/* Define to 1 if you have the header file. */ +#define HAVE_INTTYPES_H 1 + +/* iops->create() takes struct mnt_idmap* */ +/* #undef HAVE_IOPS_CREATE_IDMAP */ + +/* iops->create() takes struct user_namespace* */ +/* #undef HAVE_IOPS_CREATE_USERNS */ + +/* iops->mkdir() returns struct dentry* */ +/* #undef HAVE_IOPS_MKDIR_DENTRY */ + +/* iops->mkdir() takes struct mnt_idmap* */ +/* #undef HAVE_IOPS_MKDIR_IDMAP */ + +/* iops->mkdir() takes struct user_namespace* */ +/* #undef HAVE_IOPS_MKDIR_USERNS */ + +/* iops->mknod() takes struct mnt_idmap* */ +/* #undef HAVE_IOPS_MKNOD_IDMAP */ + +/* iops->mknod() takes struct user_namespace* */ +/* #undef HAVE_IOPS_MKNOD_USERNS */ + +/* iops->permission() takes struct mnt_idmap* */ +/* #undef HAVE_IOPS_PERMISSION_IDMAP */ + +/* iops->permission() takes struct user_namespace* */ +/* #undef HAVE_IOPS_PERMISSION_USERNS */ + +/* iops->rename() takes struct mnt_idmap* */ +/* #undef HAVE_IOPS_RENAME_IDMAP */ + +/* iops->rename() takes struct user_namespace* */ +/* #undef HAVE_IOPS_RENAME_USERNS */ + +/* iops->symlink() takes struct mnt_idmap* */ +/* #undef HAVE_IOPS_SYMLINK_IDMAP */ + +/* iops->symlink() takes struct user_namespace* */ +/* #undef HAVE_IOPS_SYMLINK_USERNS */ + +/* iov_iter_get_pages2() is available */ +/* #undef HAVE_IOV_ITER_GET_PAGES2 */ + +/* iov_iter_type() is available */ +/* #undef HAVE_IOV_ITER_TYPE */ + +/* Define to 1 if you have the 'issetugid' function. */ +#define HAVE_ISSETUGID 1 *** 491 LINES SKIPPED *** From nobody Thu May 14 00:57:06 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 4gGBkC0h2qz6dL4Q for ; Thu, 14 May 2026 00:57:07 +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 "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gGBkB72Tkz4B7f for ; Thu, 14 May 2026 00:57:06 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778720227; 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=xM95WSV2I8l9Ov64k11N6cf4PGyXTGAoAr5pgfRAHhE=; b=BwBXIwCbHr0IoYqluYnDMKzQLU5hFP43Y/mLu+I0Ezvyi6/fV7ALRkfqDso6JFJXpGpOwp rX+Sq8QXnNmSoE2aqpvOpWnrDFFtxBFJSDxSH1/J9pqrGEON3seTEqc5CFDOvD5h7IhO4H W9nXMvXURXuZeCMBq7cCWuSRk7TDkwnZxnALL0Cb5k8upKr60F2jc2B0NyQWLkEgJwwoGx JctGZfCzrvYLDP9XPNJ3FX+RYjiY9z2nKjqUPqMvX8pvv5i/nfF69m2F7WkBCZ5wc0YKtx Ui6X+wiykVEKUsAUk90MQIKRcE8w6q3baog4/kuiVDSVMFnSDh0BLAbTs29JKA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778720227; a=rsa-sha256; cv=none; b=nTyqqKWWgiEbdAnMb4hzsbIkJ4EiOt07/i5RK4LGN0s7n6E0X+3PuwIE+bcwKE90aWk9rP GPe4rvX6iUVcX85CIzX2kEkq5uk49yDPDAq9Fw/UEaEf9sLI1mr9HR8UJ1ZCVt2lIExI1L fMES1jUmB2USWR+bai32KxSkaSh1PRaGe3PCbevJagUk0rmxVAu3ocVUlhtgAJc8gVLcvv 1WKNZbsooQh60W+Qp7M7x6reblUnn4qDXOcZce1ZBww17K1xPhssN75eNke5kR3k2I/Nf0 Kzc2kyrZIG6TRfttRufsXj8NbvVLPiajhrr3tBftvMIsSQNWU4PukJLMS8l14w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778720227; 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=xM95WSV2I8l9Ov64k11N6cf4PGyXTGAoAr5pgfRAHhE=; b=iCThLjZGESL2z6ykJVJkwXtDDqQoXmEa9WfiXQh2UICfST6yoGf4jJDfeWP+AzfFV/4wv8 hffUiqKYt/lhPv9WaKv49UgpXcCPgrvWcp3dPnsMopaE0nmKRobszDSWPZMrDyGT3tLXjg Hny52joTOVoR+iIvSLYXARlWrmtOwR0gF8lmulaSX22U/pbb6okyozf+QCpIQSIywNu7c+ Ab5UUa8AdZAjakKVL7XxzGlaRDYYklNz1pJSfGEu2tI0US6CA9dU4YG5Uxdc3DPwU5BSnX r2Pi1/Ab/t1vsES1b3L5Nnb/VP270zk3YDxQw6vfbjQVYZK2unl5cYDFrtEvkw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gGBkB6bbGzZZ for ; Thu, 14 May 2026 00:57:06 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 21bb5 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 14 May 2026 00:57:06 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: 5af938fb03d0 - stable/15 - fdescfs: do not change vnode type on VOP_GETATTR() 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: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org List-Id: 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: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 5af938fb03d004ef97621f4c9319446f2fb8f77c Auto-Submitted: auto-generated Date: Thu, 14 May 2026 00:57:06 +0000 Message-Id: <6a051de2.21bb5.5ef9e75e@gitrepo.freebsd.org> The branch stable/15 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=5af938fb03d004ef97621f4c9319446f2fb8f77c commit 5af938fb03d004ef97621f4c9319446f2fb8f77c Author: Konstantin Belousov AuthorDate: 2026-05-03 19:09:15 +0000 Commit: Konstantin Belousov CommitDate: 2026-05-14 00:48:03 +0000 fdescfs: do not change vnode type on VOP_GETATTR() PR: 294768 (cherry picked from commit fbecfc4aa028964f972a0457809aa041d415f61b) --- sys/fs/fdescfs/fdesc_vnops.c | 1 - 1 file changed, 1 deletion(-) diff --git a/sys/fs/fdescfs/fdesc_vnops.c b/sys/fs/fdescfs/fdesc_vnops.c index 58a22b8bdc50..05630ef5e48c 100644 --- a/sys/fs/fdescfs/fdesc_vnops.c +++ b/sys/fs/fdescfs/fdesc_vnops.c @@ -469,7 +469,6 @@ fdesc_getattr(struct vop_getattr_args *ap) break; } - vp->v_type = vap->va_type; return (0); } From nobody Thu May 14 00:57:08 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 4gGBkD1bGwz6dKkl for ; Thu, 14 May 2026 00:57:08 +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 "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gGBkD0zG2z4C8r for ; Thu, 14 May 2026 00:57:08 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778720228; 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=R3LKJ8VFQlpnJ2Xl73LghMnjmbKu3O87GDcCkdIqO6Q=; b=XGDPVN3pCJeYmWvMjiPhG/VgxTUGDN5o9qM44FHUi66DJtdW36yP0tbuk1go2Xf6edu3Ad uw2yzSCgGlKtk6LU8GqDWVLyINbXxjOU8/Z5pELjHlbndq22bb7f5HgoN96PCks8zC9YX2 j/JNNRzO2Ioy0mIivGLJ+H+O4QGgbSFETwqrmZAEiJ5O65qrNA5xt7OTA0OCaId8TGeVxW roYUpihG2JiZ4LT49TWUILOWiGf/UEQY4sm0l60cgmh+EZKL5CCMtTi9RYh8KIN/UVmcqZ cj5cFUZ2ttUqW5GHisxASCOSzMTDkcwVKGAM/wq/jH14v4nU5SSwOMNEMr9NOg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778720228; a=rsa-sha256; cv=none; b=SlMCbzkDzkOtZEAIXs/d8dHS3P+OK2+NS2LphVW5OvQsKKhXu+pO95kmM7LgmEFr5XsUVZ S1ogDlBm0IXcFRCbo5aQ5pIGo4mgbpaaKjU0sYUuea1vM5JXZPpn/ic52pygavzvdURv1/ ThMETVyhZUHVHJbNX7w3Zh9f1lEzh/+JKovQhRc066fXBTYidon6wBKbc8vwcNC4P8mQfp 7PViTjMmUbuI6BgKHixfOBGY4wxdb0sxBPc4bSfiwInttzfNVb2Us46uatVyC0U+vWWZe1 0lvMjQ1ad8paJEAZ91H5sf9mRD7HsVFrMHFObcnRgykTg8oGSquUztXX1Iwu8w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778720228; 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=R3LKJ8VFQlpnJ2Xl73LghMnjmbKu3O87GDcCkdIqO6Q=; b=rIkSVH97tqLCf8QeZ9yciJJfpQlnMSZ2XxqJZPyCjYC84KtIHD822udcVStQTZ24YQ5kRz p0vLU8Pemvwx5lTuJ3K/d0o6xDN4qESq9Id4iFRZe4RdCRoaxMTBG3TTD+4PeQcjG5BbvX w4P+9kBpg3hoFrSQKoHvAXi+b+3N5LasRC5zHRSEPqisPXx6w5fKK2GxZym8+88VH9y3+b AZf6Y2d850hPshArcsiNxf4KkuahaILMj2bqA8QbocR2Jx17RPQkMMjUE0vR5oRIH2q3As 3sv8+aFMQTSukzYdPoD9dWOaww4H92dfvWBSJIzSr4AiofYaHiheN2AxDqhLIQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gGBkD0GBYzm6 for ; Thu, 14 May 2026 00:57:08 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 21d60 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 14 May 2026 00:57:08 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Ryan Libby From: Konstantin Belousov Subject: git: cd1e479361bf - stable/15 - amd/int0x80 test: fix inline asm for gcc 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: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org List-Id: 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: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: cd1e479361bf3919019f27f28a4314449b30c764 Auto-Submitted: auto-generated Date: Thu, 14 May 2026 00:57:08 +0000 Message-Id: <6a051de4.21d60.19c6081@gitrepo.freebsd.org> The branch stable/15 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=cd1e479361bf3919019f27f28a4314449b30c764 commit cd1e479361bf3919019f27f28a4314449b30c764 Author: Ryan Libby AuthorDate: 2026-05-04 16:34:41 +0000 Commit: Konstantin Belousov CommitDate: 2026-05-14 00:48:03 +0000 amd/int0x80 test: fix inline asm for gcc (cherry picked from commit d5728351a58b87764f3302eb8c4ca9f35e99e8b6) --- tests/sys/arch/amd64/int0x80.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/tests/sys/arch/amd64/int0x80.c b/tests/sys/arch/amd64/int0x80.c index e03462a6dccd..fbe98fb341a1 100644 --- a/tests/sys/arch/amd64/int0x80.c +++ b/tests/sys/arch/amd64/int0x80.c @@ -46,12 +46,13 @@ fire(void) { int res; + res = SYS_getpid; asm volatile( ".globl\tafter_int0x80\n" "\tint\t$0x80\n" "after_int0x80:" - : "=a" (res) - : "%0" (SYS_getpid) + : "+a" (res) + : : "rdx", "memory", "cc"); return (res); } From nobody Thu May 14 00:57:09 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 4gGBkF2zr4z6dKkq for ; Thu, 14 May 2026 00:57:09 +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 "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gGBkF1Gm5z4C90 for ; Thu, 14 May 2026 00:57:09 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778720229; 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=gbMkLGlHw8B61Yt9vZgB0eIlQDld9iQZOrxfzqTNm5E=; b=nCHiXQDQfbqdwqNlphS/9G3wDBX2+pw0EN57rEX0uW6Zhl3Kdtp/U7YDGeCR9LXmS+tUIC 3LXeUMhZaJKtZ9QSYJn/LX0AvcBZ6yLVeAYQphX0tD7d1WY+BkgFErR9uLVN/UGfyn7wZc tmbX4K8Iz8FYS1BZGqTbNx34sS2HP2+24EFEg+mfdFs2yNGIEbK4OY6TtKxRcR7TizJsjU yJqOMZSUo5JmkdbtApwUZqXns3B2kgxjDE5OkOP1ZbjrXxdpgAsIJt4QwMSgHBkJOBGaJ3 z6XgY5fPPfMzp1jXLXGbSSwMo3rIMnXsasEdWh8ufoMdVdYtjc5mG8rDy7wRCQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778720229; a=rsa-sha256; cv=none; b=km64kCE3V8m/dZGEaLtzp3weshDpjx3rUdM3/FS/saXMRtZGsitLy4/RZg+Bbk90ukja4x sNZ+CgueU0TvOyVzjaRO71KRaHONR1WoWK0QzamCJqtfDIJ2Q7WGc6Glj0h8CpdphIy0Be WIeHkVvdKMHeGGF/UL8k9nhxH3H66o2yPPQSE9kZuTDAktU4+8BC/qX+Ts4DHyuxzGEyFV TdPHT6ejyJnk4m0WGnwPDBcLGehF1UrWOR8g0iF7hIqk3xcm82DngaE0F1EfHabLIRLsWE u+snbxvvT7wyPb+yUZQ+F9M9iMIpmkMnOKZVN+VuyLUxJ6hq/3jkKpHqBpfBug== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778720229; 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=gbMkLGlHw8B61Yt9vZgB0eIlQDld9iQZOrxfzqTNm5E=; b=Gw+YiLeZQmyk3ANfSNPqjC9eJnJt+ENUJssIuQPrQU69iITRzTy/EI7C0R1cVsq33CMkvU yw2V7tZwg1fMLy2QXQeJwvxsapL/LrdHI9kmMOMYnPuq3nYVoTKorjUJn6fXSL/cYNk3QD qfKD1dQ6o3v9MsZgjH6xiV0eh76p2/JVNdECRBe+W188dcAR+sFhIXRqcjmwoksktLrg+n l4ZFhd4aaryiR17aME6XOr+iODMxeeltqpFgf8sVOPVU87roLNdQXxown+NGIbM73XcNn3 1oE5zkafoG1Xxq3qzMqRyD+pYJiWJ4GPGPhMsuYRknExPMkzoHvugXUOnUIP9w== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gGBkF0lkdzZb for ; Thu, 14 May 2026 00:57:09 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 216c4 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 14 May 2026 00:57:09 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: 43c00fbfe676 - stable/15 - bufspace_wait(): only try to help bufdaemon if there is a chance to help 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: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org List-Id: 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: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 43c00fbfe6763570b9cf69ec7bbfb7d62a3d8ca9 Auto-Submitted: auto-generated Date: Thu, 14 May 2026 00:57:09 +0000 Message-Id: <6a051de5.216c4.4e74dcc4@gitrepo.freebsd.org> The branch stable/15 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=43c00fbfe6763570b9cf69ec7bbfb7d62a3d8ca9 commit 43c00fbfe6763570b9cf69ec7bbfb7d62a3d8ca9 Author: Konstantin Belousov AuthorDate: 2026-04-22 05:09:34 +0000 Commit: Konstantin Belousov CommitDate: 2026-05-14 00:48:03 +0000 bufspace_wait(): only try to help bufdaemon if there is a chance to help (cherry picked from commit ce4e8c478a261ce6c7af7d81817f86420c5239b9) --- sys/kern/vfs_bio.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/sys/kern/vfs_bio.c b/sys/kern/vfs_bio.c index 2368f863a248..5b8d4a87c1ab 100644 --- a/sys/kern/vfs_bio.c +++ b/sys/kern/vfs_bio.c @@ -727,7 +727,8 @@ bufspace_wait(struct bufdomain *bd, struct vnode *vp, int gbflags, BD_LOCK(bd); while (bd->bd_wanted) { if (vp != NULL && vp->v_type != VCHR && - (td->td_pflags & TDP_BUFNEED) == 0) { + (td->td_pflags & TDP_BUFNEED) == 0 && + vp->v_bufobj.bo_dirty.bv_cnt > 0) { BD_UNLOCK(bd); /* * getblk() is called with a vnode locked, and From nobody Thu May 14 00:57:10 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 4gGBkG62vBz6dL4Y for ; Thu, 14 May 2026 00:57:10 +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 "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gGBkG3xWvz4Brv for ; Thu, 14 May 2026 00:57:10 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778720230; 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=fFNIzHVd6Y1/R5j90RjPPEf613eeRzcKhG5vLAGuKNk=; b=lkX6gvVKSpeB5j4pslBhER4NGV7OoWPg5MEceinE4aB6PzpMrbHH9KKcZueuTlByT4Ozjv c8r3qoYeWZVEat0gz5gPauRRAIm7UFMV9xkJBU/Zk3RxuPxIMwezoZBien+5Hvucm1ksSz PLfkQYoVGTg+Jy0BC5cd0i2BNEiNclEePlgema0jINshmYHwkDl70SUUT7C8791wHg2Eod mbaw8KQLiOHY9zfR+R4+CXh2FbNa1Ays5hm+89E+me1+b03xq4U7ox/G7Pg9Skgy/iGts6 wSSsm6Sw62mjyIb/XJFElvJDKLGji7KaXcw1ryDAImH08Lpgpl5lp/uU+zXI2g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778720230; a=rsa-sha256; cv=none; b=g1E6zQ0QfgVlDc2CHoqtBc2utXEzx2XHDSdbSdcko35nzPOt8+1RhWZboVc1Awc/GIBn6q K1ez8U8+0oMnBEa4hkEc6GAwVSfB/ZQXNl7h4roy8cIXE7WQguoFoqZyq+u3RfBTq6BgAB sJk7+KiyYZ63LHVTazA6iDlBaLEyTu3Y46AjWqgT3NgAM2zNydSXn2ZaijStHsZYKANXVU +j9SrglJD061/f15QJiixUCrBioKve/V4P9ZB/aKy/R1RqhbVj0eWPGZyIW7v1UetB5c8I xG/1b7jk3SHdckUdTMKlJqiIJbaeAt/n5rioago8cSjIqLpBuydOpgpTCA+0gA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778720230; 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=fFNIzHVd6Y1/R5j90RjPPEf613eeRzcKhG5vLAGuKNk=; b=oazRc3wI7ZL/2236hjXTt6Qa7Lh5Y/1WRNyvwZ6Q25Wu2ShWt9xmKBHLDQKiQM0LtreqAj qp3DdkvUvX513B2yCWdAwWbQzOUHtCoqvilh3iyUbE7A/cO6rhdePTSzTjrV7VCE7Uyx4B Bz4192VYjCHrXKdhvSkiFmaIgySp99CcoTfOdNkhPeOOLoEMtbzzmLCoCEIomQJDeZ8vq8 JtKOW8Uvmi7RngooLMKKLxzGjQrW7MYOS620FYTs3JaWwu1syoh8DiZPiNEaes/JKGHzpM BXY6zwprc0PA/DKcFCTLujyzMsFQ1Qoq/GsKEnUsQFDHRC/+jiFT103StiPAAQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gGBkG1kSPzZc for ; Thu, 14 May 2026 00:57:10 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 21e4b by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 14 May 2026 00:57:10 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: e0e4d7b1f1c2 - stable/15 - vm_map_growstack(): consistently use local vars instead of curthread/proc 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: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org List-Id: 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: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: e0e4d7b1f1c256fb47a8eb8a7932b9e7769d1bf0 Auto-Submitted: auto-generated Date: Thu, 14 May 2026 00:57:10 +0000 Message-Id: <6a051de6.21e4b.6165e525@gitrepo.freebsd.org> The branch stable/15 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=e0e4d7b1f1c256fb47a8eb8a7932b9e7769d1bf0 commit e0e4d7b1f1c256fb47a8eb8a7932b9e7769d1bf0 Author: Konstantin Belousov AuthorDate: 2026-05-07 16:00:31 +0000 Commit: Konstantin Belousov CommitDate: 2026-05-14 00:48:03 +0000 vm_map_growstack(): consistently use local vars instead of curthread/proc (cherry picked from commit 642dd17ee94377c3d5533d05d0d9a58b88f60387) --- sys/vm/vm_map.c | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/sys/vm/vm_map.c b/sys/vm/vm_map.c index 63bdce9d60f8..0a81e62d2d63 100644 --- a/sys/vm/vm_map.c +++ b/sys/vm/vm_map.c @@ -4731,6 +4731,7 @@ static int vm_map_growstack(vm_map_t map, vm_offset_t addr, vm_map_entry_t gap_entry) { vm_map_entry_t stack_entry; + struct thread *td; struct proc *p; struct vmspace *vm; vm_offset_t gap_end, gap_start, grow_start; @@ -4746,7 +4747,8 @@ vm_map_growstack(vm_map_t map, vm_offset_t addr, vm_map_entry_t gap_entry) int error __diagused; #endif - p = curproc; + td = curthread; + p = td->td_proc; vm = p->p_vmspace; /* @@ -4760,9 +4762,9 @@ vm_map_growstack(vm_map_t map, vm_offset_t addr, vm_map_entry_t gap_entry) MPASS(!vm_map_is_system(map)); - lmemlim = lim_cur(curthread, RLIMIT_MEMLOCK); - stacklim = lim_cur(curthread, RLIMIT_STACK); - vmemlim = lim_cur(curthread, RLIMIT_VMEM); + lmemlim = lim_cur(td, RLIMIT_MEMLOCK); + stacklim = lim_cur(td, RLIMIT_STACK); + vmemlim = lim_cur(td, RLIMIT_VMEM); retry: /* If addr is not in a hole for a stack grow area, no need to grow. */ if (gap_entry == NULL && !vm_map_lookup_entry(map, addr, &gap_entry)) @@ -4778,8 +4780,8 @@ retry: } else { return (KERN_FAILURE); } - guard = ((curproc->p_flag2 & P2_STKGAP_DISABLE) != 0 || - (curproc->p_fctl0 & NT_FREEBSD_FCTL_STKGAP_DISABLE) != 0) ? 0 : + guard = ((p->p_flag2 & P2_STKGAP_DISABLE) != 0 || + (p->p_fctl0 & NT_FREEBSD_FCTL_STKGAP_DISABLE) != 0) ? 0 : gap_entry->next_read; max_grow = gap_entry->end - gap_entry->start; if (guard > max_grow) From nobody Thu May 14 00:57:11 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 4gGBkJ035Dz6dLHQ for ; Thu, 14 May 2026 00:57:12 +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 "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gGBkH3t1pz4B84 for ; Thu, 14 May 2026 00:57:11 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778720231; 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=z8vnQ6h0U7Z9tHygR5aauNWHvLhyqVqeIS/x6p25BZU=; b=yuSNsFJwQ0Ii6xU8tRdZpXuqQ1zINHNVsZ4Ro3dQ+KN1mlTXkoNeta0Gk5glFSh0nyZBq8 p+WVE1oOhRoYD+IlEGgJAx0Va26PkOyHnNf+93qRXu+xsGNGMB4+KGOIXNXzYqt0Q9YXH5 3viwgdLqpZQWinJbbaiBOJckINh1uxheYbuJZOsPIpXK3jnwJj3idsBZn/JeRguLYFWVa2 TuLZ9aMRPg4dHbtdu7NWxoUo2TLMpfrGUWVBSnH+8szHp4EljWKORjD6w0Ytt1Bo5M2Jds TawcA77O/gorHNNB2IDG6R1aaLmbJWFvoKGirFr7MaDE0+IpVoZe2CxVOm8JPQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778720231; a=rsa-sha256; cv=none; b=t3M95+TRRmaKaJ1wXdGx15+cXNcLM1mtvbpPTz5wvEkeUSfp02nP0W1rlESNrZFhwaeHP5 cPk7GweAmo/6gztb5z2nnScxNccOh7cs1tjI9Z+L8FPlgHBdKHo5rdY7hb20/OoKnwAvCH qt3UJJNkmcRczMBUcVb76ilqJW9tp3yXRyAhndSrdkA9bvX4YZZFYvNN0kc73yeT5apTaH 7m6q3+ONYq1xiR2G5ElX2wv1JmBr6JYDUO5N0ylmhUl0ApCdgL2yUG8KbQas736pxQiosb KiGgRFKDrXd4ED60/Tq758Oz2Hh+rRRip3W9xXJFhQVfsaK7cUyA4YP4DA8s9w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778720231; 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=z8vnQ6h0U7Z9tHygR5aauNWHvLhyqVqeIS/x6p25BZU=; b=Et0pEIRi368E1SrlZvXy+2Ujl0lbsHmiZloiFCj4rwcI7qmNXGFp1xnLRjodUJ0HYeHBgg TI6ntsjO1Td6JB/MjtTbomGnuB25hH5ly9AKpr4vCI6VtLoAOZ+k7PdX5YuiMSmsNUmFM4 e6gyWVmceOx62pWk2BafmS2EyPW5Ae6b3KsteKW0Tng9Bad8MfnStHsLFKwED1Ggo3OLuk x/UOzzC71jmNTWVFc/6FztFEdZGbg3owltNVRW/G9E4PqbxGN6IRyjVA17wNaWymmZy5sM gzx+ta4k2qithXhTV2eV8ei6U5fdRbNpg7hETORzqZazDxZOSlwYaiSp8uQYBw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gGBkH25WZz1Cy7 for ; Thu, 14 May 2026 00:57:11 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 2065e by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 14 May 2026 00:57:11 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: 1aa72148d19f - stable/15 - vm_map_growstack(): give a hint to user that stack was blown out 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: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org List-Id: 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: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 1aa72148d19fbf73ec1c864ac9efbc9c37c4d8d3 Auto-Submitted: auto-generated Date: Thu, 14 May 2026 00:57:11 +0000 Message-Id: <6a051de7.2065e.642938a5@gitrepo.freebsd.org> The branch stable/15 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=1aa72148d19fbf73ec1c864ac9efbc9c37c4d8d3 commit 1aa72148d19fbf73ec1c864ac9efbc9c37c4d8d3 Author: Konstantin Belousov AuthorDate: 2026-05-06 22:53:59 +0000 Commit: Konstantin Belousov CommitDate: 2026-05-14 00:48:03 +0000 vm_map_growstack(): give a hint to user that stack was blown out (cherry picked from commit 18c5a26f8a747583b9bca3a6a1ae9db1ed4591a3) --- sys/vm/vm_map.c | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/sys/vm/vm_map.c b/sys/vm/vm_map.c index 0a81e62d2d63..7ead7d7e6472 100644 --- a/sys/vm/vm_map.c +++ b/sys/vm/vm_map.c @@ -4723,6 +4723,11 @@ vm_map_stack_locked(vm_map_t map, vm_offset_t addrbos, vm_size_t max_ssize, return (rv); } +static bool report_stackoverflow = true; +SYSCTL_BOOL(_vm, OID_AUTO, report_stackoverflow, CTLFLAG_RWTUN, + &report_stackoverflow, 0, + "uprintf() on stack overflow"); + /* * Attempts to grow a vm stack entry. Returns KERN_SUCCESS if we * successfully grow the stack. @@ -4787,8 +4792,12 @@ retry: if (guard > max_grow) return (KERN_NO_SPACE); max_grow -= guard; - if (grow_amount > max_grow) + if (grow_amount > max_grow) { + if (report_stackoverflow) + uprintf("pid %d comm %s tid %d stack overflow\n", + p->p_pid, p->p_comm, td->td_tid); return (KERN_NO_SPACE); + } /* * If this is the main process stack, see if we're over the stack @@ -4796,8 +4805,12 @@ retry: */ is_procstack = addr >= (vm_offset_t)vm->vm_maxsaddr && addr < (vm_offset_t)vm->vm_stacktop; - if (is_procstack && (ctob(vm->vm_ssize) + grow_amount > stacklim)) + if (is_procstack && (ctob(vm->vm_ssize) + grow_amount > stacklim)) { + if (report_stackoverflow) + uprintf("pid %d comm %s tid %d stack overflow\n", + p->p_pid, p->p_comm, td->td_tid); return (KERN_NO_SPACE); + } #ifdef RACCT if (racct_enable) { From nobody Thu May 14 00:57:12 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 4gGBkK0zqLz6dKl0 for ; Thu, 14 May 2026 00:57:13 +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 "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gGBkJ4bh1z4CHp for ; Thu, 14 May 2026 00:57:12 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778720232; 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=ZrzOQdCjjn4xl+g02UqmJ+igXYfdk0tiZkH8kfqC3Yk=; b=PofeplzknkTz6pe9o3YF8/zLfRHSKWAdbD8jqooy/dgnIDDowHcIPuwbuPjRDajeww6sZG HlAYWByq/izRv6A0zRF8K00NWcurGJjNtUrosX8aAzhbNpf/h6RcHhYXo1MWtGJdBlPuIU qORTMEGdERseLlel/VvTqsuKcHFuJvJSNLScKM8w4qu6V1U3uwmbu6tPXw1QP0LCIvY3a4 iXKP/wZo50KwhGzFPWXMdc+qGLT8asRuP/8LMVObGDH/vlzo7ChDw6u8t2Sra+qGNESl/i QjY1uvF5qzWuvuf9KtiIdGvX09P1qiAwKe5VK/A80xR5XcupxL8fbp2lmZHb0A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778720232; a=rsa-sha256; cv=none; b=xFGP2WhldYtuH952Pqg3W3jJrdqcMFs0qKC5GiB3zhOZtF3mRyuA/6PPSQarqlOjk/RVcA DTsYjWeKRa2hp+V+Y1y4LiA20GYSMwqALT7oMpbwYhrcbaP2uCzPRV91fc8GDVgJTmoV0t iF2+0pYr33BwJ9AdU7DHUnkuyfeKmeKt2iydiSSHcr13bKocsDuA8culrFFCCVWQTRuDyI r4n+k2nwVfmr9H7WvuNlGHCzb8m1w7i5BqlUCSA4DOLamlbS1ZUH8V537UZv3TVIPJCc2G T9ulA2huqRxEQ76/+jQAHyTDEhhWe0Z8bsQt+Yk1fLBxrorg3HctGBcDdXN+hw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778720232; 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=ZrzOQdCjjn4xl+g02UqmJ+igXYfdk0tiZkH8kfqC3Yk=; b=yzJRLon+Cr2o5iYTPDNb3+Do5FqmZ89SZalOFE5gzqs+5Zq1tY49WL992qrrsl9PcdJotw gArecJkrsNYxhsaQL8KNg4Z9f0RIzcnLzzRXGge3vgdlMLlkegqTvLXGd4pxULqlZydUrq sHA9ZESgFFG4UigiOR68PMIdI1MkXy2AOAkIdaqkHhhQ373yA8R98u6Bm0qkczheKZmYpq otdAVUQmrNtPLsgO/gmnegQgIWx4f1c71Jo8YiU6RFT2LZ1ERYFaUw72IbrNZOIPIAqGUN bBLFK1GhdaqJFWLL3BAqd1LpEAEEzdp1j1jLDX639Ub7sais1c/zaytNPKrx3w== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gGBkJ2wTwzVB for ; Thu, 14 May 2026 00:57:12 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 2319b by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 14 May 2026 00:57:12 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: 871bf8a8a063 - stable/15 - vm_map_growstack(): use local for p->p_vmspace 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: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org List-Id: 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: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 871bf8a8a063aea22b91ac12460042f4c800398a Auto-Submitted: auto-generated Date: Thu, 14 May 2026 00:57:12 +0000 Message-Id: <6a051de8.2319b.28609003@gitrepo.freebsd.org> The branch stable/15 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=871bf8a8a063aea22b91ac12460042f4c800398a commit 871bf8a8a063aea22b91ac12460042f4c800398a Author: Konstantin Belousov AuthorDate: 2026-05-07 19:58:18 +0000 Commit: Konstantin Belousov CommitDate: 2026-05-14 00:48:03 +0000 vm_map_growstack(): use local for p->p_vmspace (cherry picked from commit 8eef59db254283eaaee47be94d4ea9f2fef4f2ad) --- sys/vm/vm_map.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/sys/vm/vm_map.c b/sys/vm/vm_map.c index 7ead7d7e6472..94dd7d3a19bc 100644 --- a/sys/vm/vm_map.c +++ b/sys/vm/vm_map.c @@ -4761,8 +4761,7 @@ vm_map_growstack(vm_map_t map, vm_offset_t addr, vm_map_entry_t gap_entry) * debugger or AIO daemon. The reason is that the wrong * resource limits are applied. */ - if (p != initproc && (map != &p->p_vmspace->vm_map || - p->p_textvp == NULL)) + if (p != initproc && (map != &vm->vm_map || p->p_textvp == NULL)) return (KERN_FAILURE); MPASS(!vm_map_is_system(map)); From nobody Thu May 14 01:02:26 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 4gGBrL2vYVz6dLhK for ; Thu, 14 May 2026 01:02:26 +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 "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gGBrL1ctzz4Fbl for ; Thu, 14 May 2026 01:02:26 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778720546; 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=OkYjtMteP+DPOZ5XGV1oDEjzaimgUAVH278biQXtyr4=; b=PDbvfWVpV0xEscQdhDI/vsmASPSK3Y/vBAXaVYdzPT1BWisXDPnAdhtHntzRAq2joohgTT xhTFtHIKmT0ztIzNR783tJkVyLX2dMykr3GdcGylsLitzP6zSiMJeP8mql8sKkcKl7MthM dz+xWPJPLpO9Q6zOgxFl8uUVsdBAcyOdFnAy8Cu9oLUpY3SYxr+erwVaOMmyPKogc+8X9X XdKbKVOa7Z0kOLuubtzdYAHS2vjIsmvH7cs+1OLjMo9wOg+sdsV2w8jbOquVpnoAD4ni2M 2H4fyLjeMa59gCMM8o1RyZFRH5z1aO4FMsaqpp8dYy/Si1a9A2Kkho/5Kub7zg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778720546; a=rsa-sha256; cv=none; b=rtET8FTU/JGuHIPfQg1v9qt28e75Xd65xItju5AIl6kqH0zRuiu6CKiE+gE0f0UNg1LL+r h6cda2Wrlm/Sit7oraNGRTWvzXhvmOFrwclhZYjFM0p/6It/nvWw4VO9HVErDUmFQZxqpE PuUUyAinWfIc8sQj9PiPE/lewVT6g44TE8RqQeiY1ut/zRAKJnf63l4crfA/Woo7r0NoXa E9vh58bYzayIu7d9VLbKvWaBA/hMlzlg9RXaAce8rwei7R1RhNMGlx6mtW3XySm8z94/KS vtXEWOV0nYIvfyru+k74Lr40oBEpIotKDziIaX92sxIN6TgB47pmBcyD7lkxMw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778720546; 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=OkYjtMteP+DPOZ5XGV1oDEjzaimgUAVH278biQXtyr4=; b=raMQkN8MhYvKBQz1Wia1y6Zfi5iIdx1IcYehIjIANiBsZbn0V6aTGQUbBDSMl96A4jaKYU J2QxOGKApVj0cZxzLnMrG68TQ4YAbZXRrwdnN5Y3yVKuN+SC9PjOLPcNShdpR2/6N22UcT 4yA1ChEIVKPnRVZXaFE/7x1OEC4kWxUZc0RxKMjYSckZYS3dMiq6Fd/P/Np+C/x7SJ3QA7 7kUjFqnba0COereekqd1g7Yp3Iv3QbDF7qi9N0ktqq3kuniY3bPoWaMTiQ47pfCFh+nTqH 7kLk7S9e2/yvxK/TaiOfTfVLsN2ZLDktaeoheFPfTdpJ7anDsQx6gsZI3S1vmQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gGBrL19PnzKH for ; Thu, 14 May 2026 01:02:26 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 242d2 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 14 May 2026 01:02:26 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Rick Macklem Subject: git: 49937a6face3 - stable/15 - nfscl: Disable use of callbacks for NFSv4.0 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: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org List-Id: 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: rmacklem X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 49937a6face3cc78353adacac8f5040ac6abb324 Auto-Submitted: auto-generated Date: Thu, 14 May 2026 01:02:26 +0000 Message-Id: <6a051f22.242d2.222798ca@gitrepo.freebsd.org> The branch stable/15 has been updated by rmacklem: URL: https://cgit.FreeBSD.org/src/commit/?id=49937a6face3cc78353adacac8f5040ac6abb324 commit 49937a6face3cc78353adacac8f5040ac6abb324 Author: Rick Macklem AuthorDate: 2026-04-30 21:37:36 +0000 Commit: Rick Macklem CommitDate: 2026-05-14 01:00:52 +0000 nfscl: Disable use of callbacks for NFSv4.0 The only use for callbacks for NFSv4.0 is delegations and delegations rarely work well for NFSv4.0 anyhow. Therefore, this patch disables callbacks for the NFSv4.0 client. This is the same behavior as occurred when the nfscbd(8) daemon was not running. This change allowed a function called nfscl_getmyip() to be removed from the kernel, which is nice since maintaining this function was bothersome, due to its use of routing, etc. (cherry picked from commit 71ac1ec5c9d990e7881e75f04140eb0bfe473a21) --- sys/fs/nfs/nfs_commonport.c | 4 --- sys/fs/nfs/nfs_var.h | 1 - sys/fs/nfsclient/nfs_clport.c | 79 ----------------------------------------- sys/fs/nfsclient/nfs_clrpcops.c | 50 +++----------------------- 4 files changed, 5 insertions(+), 129 deletions(-) diff --git a/sys/fs/nfs/nfs_commonport.c b/sys/fs/nfs/nfs_commonport.c index dbc2b3b942e9..91d9188d30c5 100644 --- a/sys/fs/nfs/nfs_commonport.c +++ b/sys/fs/nfs/nfs_commonport.c @@ -62,7 +62,6 @@ int newnfs_numnfsd = 0; struct nfsstatsv1 nfsstatsv1; int nfs_numnfscbd = 0; int nfscl_debuglevel = 0; -char nfsv4_callbackaddr[INET6_ADDRSTRLEN]; int nfsrv_lughashsize = 100; struct mtx nfsrv_dslock_mtx; struct nfsdevicehead nfsrv_devidhead; @@ -90,9 +89,6 @@ SYSCTL_INT(_vfs_nfs, OID_AUTO, realign_test, CTLFLAG_RW, &nfs_realign_test, 0, "Number of realign tests done"); SYSCTL_INT(_vfs_nfs, OID_AUTO, realign_count, CTLFLAG_RW, &nfs_realign_count, 0, "Number of mbuf realignments done"); -SYSCTL_STRING(_vfs_nfs, OID_AUTO, callback_addr, CTLFLAG_RW, - nfsv4_callbackaddr, sizeof(nfsv4_callbackaddr), - "NFSv4 callback addr for server to use"); SYSCTL_INT(_vfs_nfs, OID_AUTO, debuglevel, CTLFLAG_RW, &nfscl_debuglevel, 0, "Debug level for NFS client"); SYSCTL_INT(_vfs_nfs, OID_AUTO, userhashsize, CTLFLAG_RDTUN, &nfsrv_lughashsize, diff --git a/sys/fs/nfs/nfs_var.h b/sys/fs/nfs/nfs_var.h index 2f81905f6c36..8d8de381cbaf 100644 --- a/sys/fs/nfs/nfs_var.h +++ b/sys/fs/nfs/nfs_var.h @@ -373,7 +373,6 @@ int nfsrpc_destroysession(struct nfsmount *, struct nfsclsession *, /* nfs_clcomsubs.c */ int nfsm_uiombuf(struct nfsrv_descript *, struct uio *, int); struct mbuf *nfsm_uiombuflist(struct uio *, int, u_int); -u_int8_t *nfscl_getmyip(struct nfsmount *, struct in6_addr *, int *); int nfsm_getfh(struct nfsrv_descript *, struct nfsfh **); int nfscl_mtofh(struct nfsrv_descript *, struct nfsfh **, struct nfsvattr *, int *); diff --git a/sys/fs/nfsclient/nfs_clport.c b/sys/fs/nfsclient/nfs_clport.c index d23051058ce4..bc5f74b79749 100644 --- a/sys/fs/nfsclient/nfs_clport.c +++ b/sys/fs/nfsclient/nfs_clport.c @@ -34,8 +34,6 @@ */ #include -#include "opt_inet.h" -#include "opt_inet6.h" #include @@ -47,11 +45,6 @@ #include #include #include -#include -#include -#include -#include -#include #include @@ -1046,78 +1039,6 @@ nfscl_loadfsinfo(struct nfsmount *nmp, struct nfsfsinfo *fsp, nmp->nm_state |= NFSSTA_GOTFSINFO; } -/* - * Lookups source address which should be used to communicate with - * @nmp and stores it inside @pdst. - * - * Returns 0 on success. - */ -u_int8_t * -nfscl_getmyip(struct nfsmount *nmp, struct in6_addr *paddr, int *isinet6p) -{ -#if defined(INET6) || defined(INET) - int fibnum; - - fibnum = curthread->td_proc->p_fibnum; -#endif -#ifdef INET - if (nmp->nm_nam->sa_family == AF_INET) { - struct epoch_tracker et; - struct nhop_object *nh; - struct sockaddr_in *sin; - struct in_addr addr = {}; - - sin = (struct sockaddr_in *)nmp->nm_nam; - NET_EPOCH_ENTER(et); - CURVNET_SET(CRED_TO_VNET(nmp->nm_sockreq.nr_cred)); - nh = fib4_lookup(fibnum, sin->sin_addr, 0, NHR_NONE, 0); - if (nh != NULL) { - addr = IA_SIN(ifatoia(nh->nh_ifa))->sin_addr; - if (IN_LOOPBACK(ntohl(addr.s_addr))) { - /* Ignore loopback addresses */ - nh = NULL; - } - } - CURVNET_RESTORE(); - NET_EPOCH_EXIT(et); - - if (nh == NULL) - return (NULL); - *isinet6p = 0; - *((struct in_addr *)paddr) = addr; - - return (u_int8_t *)paddr; - } -#endif -#ifdef INET6 - if (nmp->nm_nam->sa_family == AF_INET6) { - struct epoch_tracker et; - struct sockaddr_in6 *sin6; - int error; - - sin6 = (struct sockaddr_in6 *)nmp->nm_nam; - - NET_EPOCH_ENTER(et); - CURVNET_SET(CRED_TO_VNET(nmp->nm_sockreq.nr_cred)); - error = in6_selectsrc_addr(fibnum, &sin6->sin6_addr, - sin6->sin6_scope_id, NULL, paddr, NULL); - CURVNET_RESTORE(); - NET_EPOCH_EXIT(et); - if (error != 0) - return (NULL); - - if (IN6_IS_ADDR_LOOPBACK(paddr)) - return (NULL); - - /* Scope is embedded in */ - *isinet6p = 1; - - return (u_int8_t *)paddr; - } -#endif - return (NULL); -} - /* * Copy NFS uid, gids from the cred structure. */ diff --git a/sys/fs/nfsclient/nfs_clrpcops.c b/sys/fs/nfsclient/nfs_clrpcops.c index 308c45462002..43fc0af299b1 100644 --- a/sys/fs/nfsclient/nfs_clrpcops.c +++ b/sys/fs/nfsclient/nfs_clrpcops.c @@ -74,7 +74,6 @@ extern struct timeval nfsboottime; extern u_int32_t newnfs_false, newnfs_true; extern nfstype nfsv34_type[9]; extern int nfsrv_useacl; -extern char nfsv4_callbackaddr[INET6_ADDRSTRLEN]; extern int nfscl_debuglevel; extern int nfs_pnfsiothreads; extern u_long sb_max_adj; @@ -1040,13 +1039,10 @@ nfsrpc_setclient(struct nfsmount *nmp, struct nfsclclient *clp, int reclaim, u_int32_t *tl; struct nfsrv_descript nfsd; struct nfsrv_descript *nd = &nfsd; - u_int8_t *cp = NULL, *cp2, addr[INET6_ADDRSTRLEN + 9]; - u_short port; - int error, isinet6 = 0, callblen; + int error; nfsquad_t confirm; static u_int32_t rev = 0; struct nfsclds *dsp, *odsp; - struct in6_addr a6; struct nfsclsession *tsep; struct rpc_reconupcall recon; struct nfscl_reconarg *rcp; @@ -1204,49 +1200,13 @@ nfsrpc_setclient(struct nfsmount *nmp, struct nfsclclient *clp, int reclaim, (void) nfsm_strtom(nd, clp->nfsc_id, clp->nfsc_idlen); /* - * set up the callback address + * Always set the callback address to 0.0.0.0.0.0 so NFSv4.0 + * callbacks are disabled. */ NFSM_BUILD(tl, u_int32_t *, NFSX_UNSIGNED); *tl = txdr_unsigned(NFS_CALLBCKPROG); - callblen = strlen(nfsv4_callbackaddr); - if (callblen == 0) - cp = nfscl_getmyip(nmp, &a6, &isinet6); - if (nfscl_enablecallb && nfs_numnfscbd > 0 && - (callblen > 0 || cp != NULL)) { - port = htons(nfsv4_cbport); - cp2 = (u_int8_t *)&port; -#ifdef INET6 - if ((callblen > 0 && - strchr(nfsv4_callbackaddr, ':')) || isinet6) { - char ip6buf[INET6_ADDRSTRLEN], *ip6add; - - (void) nfsm_strtom(nd, "tcp6", 4); - if (callblen == 0) { - ip6_sprintf(ip6buf, (struct in6_addr *)cp); - ip6add = ip6buf; - } else { - ip6add = nfsv4_callbackaddr; - } - snprintf(addr, INET6_ADDRSTRLEN + 9, "%s.%d.%d", - ip6add, cp2[0], cp2[1]); - } else -#endif - { - (void) nfsm_strtom(nd, "tcp", 3); - if (callblen == 0) - snprintf(addr, INET6_ADDRSTRLEN + 9, - "%d.%d.%d.%d.%d.%d", cp[0], cp[1], - cp[2], cp[3], cp2[0], cp2[1]); - else - snprintf(addr, INET6_ADDRSTRLEN + 9, - "%s.%d.%d", nfsv4_callbackaddr, - cp2[0], cp2[1]); - } - (void) nfsm_strtom(nd, addr, strlen(addr)); - } else { - (void) nfsm_strtom(nd, "tcp", 3); - (void) nfsm_strtom(nd, "0.0.0.0.0.0", 11); - } + (void)nfsm_strtom(nd, "tcp", 3); + (void)nfsm_strtom(nd, "0.0.0.0.0.0", 11); NFSM_BUILD(tl, u_int32_t *, NFSX_UNSIGNED); *tl = txdr_unsigned(clp->nfsc_cbident); nd->nd_flag |= ND_USEGSSNAME; From nobody Thu May 14 02:35:19 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 4gGDvW4NdKz6dSTt for ; Thu, 14 May 2026 02:35:19 +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 "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gGDvW3Pw4z4MCL for ; Thu, 14 May 2026 02:35:19 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778726119; 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=AipcIvnmUxa5M2IurqUswpNJJGZ1d3rRJ3hEeX1W7fk=; b=m0xcVsR8nIx2wF78Bby8now+/PGX2osMRbVcI6O2oZ5MgGKEvSFkoW81TVdjAhenIhZfwp 4EWagtOO77+e0TuK6sYu5hVQsPJv5PWkEF69iMlTVGKVl/bi0hoV/cZCq0fk/YS0Wr0sNd JRbGml1+S89pJhC1fOjy8UqMJ4hMQJW9D6oKbjppb/bMocPWCv+hwXTGTPJ5UmHL8gHVPq +YbPDrxZROqaCBP3E77NebG19eTygS371OxHWqrGgTBcF+SyfBQkcMBdP+73aybn9o0eav pVcRAx+g2rR3p2lFQFuKIK8+B9ULPV8FtaYhnKCsrwm61tmu0Ra5YCLIiT8ldg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778726119; a=rsa-sha256; cv=none; b=lEgCataTKfkhPpJXbYRyXLJ/6mAOcVs0guMmV7UrtPQHXlpZnATyHTyORGk68LTewgJ/y4 Sx4hwCCh2YIuRy2ibxUZzX3kg1/lfHHwPtipDWKkokqMuMcvvQ98XNsjmjhaW2MimOiKvG lqjsUBFT1GEutXxg8filA7svCaWftxdzcqNfT+i+7F1xD5XxDIw+PoAqr5Hh5vH/6mkfeM y5EqJodJ1X2HcPRCM4dls3BnW6jJd0SyhFXs7DJ2R9YS094j6JJ2LNTrLG6fFVPbu+zQ1Q Iq/hwzOwJIwiyeQElbOOgdfvnmEWnH23oQW7ByxOoaf+jcmdm0nirs4q9hrnpA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778726119; 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=AipcIvnmUxa5M2IurqUswpNJJGZ1d3rRJ3hEeX1W7fk=; b=qubDZAEo6tmA8owVtM1UzvoajAP8f1pnY/HQTkFwxs35H6ndfeTNxLAiL+bSr3PHT7NlR8 iRZN5Abz/95fQeqxUzi2mrOp7HFI3aER1J2Ny/7GeZTo6ATmmsCPcx/WV5JiVPty47CA0r Zkfj85hrGJHYb2GDHaUAS0wfDPogtNnrIus8QkuioiqfOMXayBufBYSYf6NbymcyWLVwX/ 7Q4mEHs4jaMfw8Wf4jHoC4vkCdP0L/kuqnh7FNsNX/4i5X/0qdudR0MCAn06Mn0gS+g23a 2hSeTBQGktUcZsdi6qbQ7cy9iy+lDusmRG+4KlloTZAB8byMka8RWyZfLUp2/Q== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gGDvW2kDQz2r8 for ; Thu, 14 May 2026 02:35:19 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 366c4 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 14 May 2026 02:35:19 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: e71e7dd6176e - stable/14 - fdescfs: do not change vnode type on VOP_GETATTR() 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: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org List-Id: 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: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: e71e7dd6176ebb8e5169e8845f3b7c92c94c5dff Auto-Submitted: auto-generated Date: Thu, 14 May 2026 02:35:19 +0000 Message-Id: <6a0534e7.366c4.17ba9f9b@gitrepo.freebsd.org> The branch stable/14 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=e71e7dd6176ebb8e5169e8845f3b7c92c94c5dff commit e71e7dd6176ebb8e5169e8845f3b7c92c94c5dff Author: Konstantin Belousov AuthorDate: 2026-05-03 19:09:15 +0000 Commit: Konstantin Belousov CommitDate: 2026-05-14 02:35:03 +0000 fdescfs: do not change vnode type on VOP_GETATTR() PR: 294768 (cherry picked from commit fbecfc4aa028964f972a0457809aa041d415f61b) --- sys/fs/fdescfs/fdesc_vnops.c | 1 - 1 file changed, 1 deletion(-) diff --git a/sys/fs/fdescfs/fdesc_vnops.c b/sys/fs/fdescfs/fdesc_vnops.c index f4b3eba91ef3..70120eddc947 100644 --- a/sys/fs/fdescfs/fdesc_vnops.c +++ b/sys/fs/fdescfs/fdesc_vnops.c @@ -471,7 +471,6 @@ fdesc_getattr(struct vop_getattr_args *ap) break; } - vp->v_type = vap->va_type; return (0); } From nobody Thu May 14 18:53: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 4gGfcD6lg3z5Wqbn for ; Thu, 14 May 2026 18:53:32 +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 "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gGfcD59KGz44Vm for ; Thu, 14 May 2026 18:53:32 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778784812; 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=bISKC17dpedfZ6IVdiQ3kp4k6vZBcfJzptlYG6MyRNI=; b=F54RoGxXlTmRvUxno/G98I+66tbx3PoJTJOa8DJTswCQPyK2JIS0daCbhTci5fz15x4jcS SHtrbYvY2EaaHK35r/k01Ay21LYgdibvD0gdnQ2+mGFmJEo4eSqeeq2+6h9GtHuo09D30l 5LzsSmq4t9UCBvQuRBOyVXe5VUVChHWruxRKfIruKzIBrYDgAjJQodOu6npVcOtfumr2Aj ysRMG7EQx/lTP8fsSWbqD+I6KF0XRQMiXXkg5kt4AdxLSZmhPakdB0DTopn01y4Jgy9Fws iJZ6XCZWDZZlDgBH/p9la763wRAdeQkZ8fa8ibIjQneohTGgPY+JAf2gX9rsxA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778784812; a=rsa-sha256; cv=none; b=yefvEV7yR60pZNBuPdS6/9+d9F3vvrd4DnacOOA2dqoAht5AEwaTDqjL29GR5tqcAyDNr3 q68LmiiO9hjcu3FSUpC+Z4vLliDH+ShyQNfVrxJn96Ei6w5Gc+PsKn2N3AZgc/JvmjZT/L 6QQVBlVBYjuWzdVVlHDjVPmmnJ57HPQAI9L3fNibMGGgFomGW4mNky7bysUpFcioQw5+FO 8C2oVMAVlVTKTyMuydtEm79LUoIORScAlaYlt4I3yNXayyrcSt3lwiIsgGx9TMr+K9t8sQ FqjKU6GULillMU7ktZsSycLhsUWBZynjb41yXvh0MXCkX6i4m+h5iw14D8+Dlw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778784812; 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=bISKC17dpedfZ6IVdiQ3kp4k6vZBcfJzptlYG6MyRNI=; b=sjYacj4so3MSgccOG78XaxvsK32prtHZtD1J+RyZwHiNchF4dS1hxFDiB558uYTZqHddoC DPM3/FpEeBTWjAS6SvEbw1ppGEVzDkHZRumWzn/wg4UjHN7i0o+ic7RkwgnACRkK4EpN0t yco8MjiLuAVHlUq16h905GyqLTYA73P/D+tGlcHygKk4D0qYxBudQJZTzqZrwVjGH7kS6k R1v/Ww4kudzT/jUXehDLcoQT/IikZOxXKyAburS34ihaie/1G7SlV7mwI9zic7TJi2E4rk pkhNb4OPFhY9rssWTUlKOg6T1OVWvmyKBGWyB+Jm5GkM1rUKs2Cl6mh6gXIUGQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gGfcD3vbQzqXY for ; Thu, 14 May 2026 18:53:32 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 25c2f by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 14 May 2026 18:53:32 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Colin Percival Subject: git: 01d5910b8766 - stable/15 - pkg-stage.sh: Add ext2 and ntfs 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: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org List-Id: 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: cperciva X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 01d5910b8766671afdbd9e274fd62b397aca9e1a Auto-Submitted: auto-generated Date: Thu, 14 May 2026 18:53:32 +0000 Message-Id: <6a061a2c.25c2f.7465fc96@gitrepo.freebsd.org> The branch stable/15 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=01d5910b8766671afdbd9e274fd62b397aca9e1a commit 01d5910b8766671afdbd9e274fd62b397aca9e1a Author: Colin Percival AuthorDate: 2026-02-22 00:38:01 +0000 Commit: Colin Percival CommitDate: 2026-05-14 18:53:15 +0000 pkg-stage.sh: Add ext2 and ntfs Having these packages available on release media may help users who need to sneakernet other packages (e.g. firmware) from systems running Linux or Windows. Suggested by: vladlen, ziaee MFC after: 3 days (cherry picked from commit 6881fd278d80ac63b4d511fc130a79ff16d1bb48) --- release/scripts/pkg-stage.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/release/scripts/pkg-stage.sh b/release/scripts/pkg-stage.sh index 5c4ec76150da..2f56cf794973 100755 --- a/release/scripts/pkg-stage.sh +++ b/release/scripts/pkg-stage.sh @@ -16,6 +16,8 @@ comms/usbmuxd devel/git@lite editors/emacs@nox editors/vim +filesystems/ext2 +filesystems/ntfs misc/freebsd-doc-all net/mpd5 net/rsync From nobody Thu May 14 19:05:03 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 4gGfsW49jqz5WrN7 for ; Thu, 14 May 2026 19:05:03 +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 "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gGfsW3RpCz47BF for ; Thu, 14 May 2026 19:05:03 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778785503; 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=QywnHLg6+DXbHKghz2sZYQYLBV5Ff2mV9PTerx8OITA=; b=YowmhNCGIkI/k6sH3MghBNBTwwdiytBYHEbDZ0HQkfUDF7gX9OpFNtRajcyXZBY0+py2ew uiGEbH1Oc4UFDO3RPIh1SY394dSkaletQzfIr9ABuosIl11IxPRXygyLvV0E7GwXolZUgg Rdv7zNCl5CT/2g5Dn6hrRCSzGFpFBTOCSwxnEdqOAWlCSxTnylm0O9/07lLkOorbgo9URo io1EMQTSqDCzjH+bCP9vmd/NvwGbaDP4HbUglMy5octIOBxVT4QP0vCnqRPDUk+i8S6PFr La/fivbbVPoVJ26gFuVJIuFRXHRS3JfmvfC+qMg5ohWWet69DCZ5KI/+WkGGDg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778785503; a=rsa-sha256; cv=none; b=smqu6TDupe83qD/D4T/BbXihSd4V6SitQJNtjWoSPtzKS5u4ZmSTDKDm2HqKGzy25t6os6 rqcwATQFpdkIQ3o4EqfV1BsQ93jrsufnq90S0+Q0LqDueFR+WBbCYN5q24KtkCfl1Z0mol 8tRywbbIY17p+ZR4+nCmVcbwuNRG7aIYmzdeAuD8ZSS432qAV0PLlJcoL9cdyxdrbaGdjV LufewajgYdMAb01rwAOt3qZq0AJPpONJ33CDWBiAYy1F052k9awAFjYTvJi6wy1aMkdN6Y DsB7uWhV7WgvuOcUyduPBWmCvnn23WzYpnqg4KGENjZDTYpujyiOMOtSZAE7cQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778785503; 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=QywnHLg6+DXbHKghz2sZYQYLBV5Ff2mV9PTerx8OITA=; b=BX9o9IRb6rJTxspokUm0fpkWXsALxHAY2rMDfJyWRVbip7PUlBXXLsr/Qj+4f8ATwmP6De xMfnGXxOMYhkjGyrVT6gfQnz2BX648ynJlHcLIB9qPS4l7NyGtBbGi0og5hlgGnnjw7HD6 AyhQbqpKaZv8n/buzyxxP9aK55i0rFEEFTS6ZzZLJykbqG3SXbuzWvuIe4PNxzY4S/R1hn BJ3e8E7RAhdH9XNiIybPSZbV4pMhwAF9H1nphBI0z5zA1+0LvBr6USorvFL1+ua/a2Gw2s 2IKkUcPawnD4sV/0V9IhxeAd0fL2g5Mtobsc0f0nzW8BxhL0BCMiiYp/noyjsg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gGfsW2WCZzqY8 for ; Thu, 14 May 2026 19:05:03 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 25cd5 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 14 May 2026 19:05:03 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Cy Schubert From: Colin Percival Subject: git: 92eeed88a416 - releng/15.1 - krb5: Fix two NegoEx parsing vulnerabilities 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: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org List-Id: 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: cperciva X-Git-Repository: src X-Git-Refname: refs/heads/releng/15.1 X-Git-Reftype: branch X-Git-Commit: 92eeed88a416ec63d4fb1ad88df8d76fd70a528c Auto-Submitted: auto-generated Date: Thu, 14 May 2026 19:05:03 +0000 Message-Id: <6a061cdf.25cd5.7d9b6eec@gitrepo.freebsd.org> The branch releng/15.1 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=92eeed88a416ec63d4fb1ad88df8d76fd70a528c commit 92eeed88a416ec63d4fb1ad88df8d76fd70a528c Author: Cy Schubert AuthorDate: 2026-04-30 19:27:31 +0000 Commit: Colin Percival CommitDate: 2026-05-14 19:04:13 +0000 krb5: Fix two NegoEx parsing vulnerabilities Bring in upstream commit 2e75f0d93 fixing two CVEs. Upstream commit log is: In parse_nego_message(), check the result of the second call to vector_base() before dereferencing it. In parse_message(), check for a short header_len to prevent an integer underflow when calculating the remaining message length. Reported by Cem Onat Karagun. CVE-2026-40355: In MIT krb5 release 1.18 and later, if an application calls gss_accept_sec_context() on a system with a NegoEx mechanism registered in /etc/gss/mech, an unauthenticated remote attacker can trigger a null pointer dereference, causing the process to terminate. CVE-2026-40356: In MIT krb5 release 1.18 and later, if an application calls gss_accept_sec_context() on a system with a NegoEx mechanism registered in /etc/gss/mech, an unauthenticated remote attacker can trigger a read overrun of up to 52 bytes, possibly causing the process to terminate. Exfiltration of the bytes read does not appear possible. Approved by: re (cperciva) (cherry picked from commit c9dd7bffa58c50b2f7ed9e66ace39197c468d8e6) (cherry picked from commit a22ad16deb2ce23050c949b43210f5c6feb5afa8) --- crypto/krb5/src/lib/gssapi/spnego/negoex_util.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/crypto/krb5/src/lib/gssapi/spnego/negoex_util.c b/crypto/krb5/src/lib/gssapi/spnego/negoex_util.c index edc5462e8441..a65238e57305 100644 --- a/crypto/krb5/src/lib/gssapi/spnego/negoex_util.c +++ b/crypto/krb5/src/lib/gssapi/spnego/negoex_util.c @@ -253,6 +253,10 @@ parse_nego_message(OM_uint32 *minor, struct k5input *in, offset = k5_input_get_uint32_le(in); count = k5_input_get_uint16_le(in); p = vector_base(offset, count, EXTENSION_LENGTH, msg_base, msg_len); + if (p == NULL) { + *minor = ERR_NEGOEX_INVALID_MESSAGE_SIZE; + return GSS_S_DEFECTIVE_TOKEN; + } for (i = 0; i < count; i++) { extension_type = load_32_le(p + i * EXTENSION_LENGTH); if (extension_type & EXTENSION_FLAG_CRITICAL) { @@ -391,7 +395,8 @@ parse_message(OM_uint32 *minor, spnego_gss_ctx_id_t ctx, struct k5input *in, msg_len = k5_input_get_uint32_le(in); conv_id = k5_input_get_bytes(in, GUID_LENGTH); - if (in->status || msg_len > token_remaining || header_len > msg_len) { + if (in->status || msg_len > token_remaining || + header_len < (size_t)(in->ptr - msg_base) || header_len > msg_len) { *minor = ERR_NEGOEX_INVALID_MESSAGE_SIZE; return GSS_S_DEFECTIVE_TOKEN; } From nobody Thu May 14 19:05:04 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 4gGfsX6CZ7z5Wqql for ; Thu, 14 May 2026 19:05:04 +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 "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gGfsX3qRfz47Ry for ; Thu, 14 May 2026 19:05:04 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778785504; 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=gtxYwusQNroB+h2BlDyTDgXwnd2n0ayXKY/MpNFsZw0=; b=XAVe4K/K7CIOa9MpTgPILpchVUa0npgaImm9uiX3tIkwKwGH73jRjRsokuvRC8108VIa7O XH8i7Rf+OkRcUqWBxCEN7SWeYg30a7JemkBmaUZ1r7qf1vgZ8aumyyAjo+ydGeGDCESR44 gQlMHIrd+UG/itHy3amIdoB61RqgoJqpa7lkp8sdCfLE3nHmxGIS9wbFai+ZqhBzaKRcHR 2eGpiO5BqRyZr4nmAlYZPFEoVpjjiWTEsYgczaMKyrMmIVs4m8tGsCtNVHPb3HdoSAhIFV LN2pagsWHtPThADGTd7UNk++P5MTelI37GUKqBgzataNVpP1Y/AwAzHdo5qBKA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778785504; a=rsa-sha256; cv=none; b=Uybdrq9cMDkK8dxJMZzMVZH6GG0+/W9wpP3y25Y5/X7wU/JcjBAVI+f+RH16KpT8fu4wYq 44PwjGBmMYJSH0ttKlydFumXxZa2dCSR5MvxiBdQACeSBoDWWopcJKFyLKlToNVQEFxnSS m/HR2XReKXMsHscsfr/aMvOHECJ8wKZ1JeQ7y+jQ+OcVX913PbECDoG2Cq+udXL1lWMcv3 fXeEbd6z5jCiClOrd3aUBF7IzCXjvoh7e3QtYas2AfiWF8P3NCHlqBpsO1sRgzOy9Qd4zB lz9Pcce/fFZKNpPPJjSuhJxqlvxlpsyd6VIlqVwvE1c7kXL/tTMicYLG+ulDww== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778785504; 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=gtxYwusQNroB+h2BlDyTDgXwnd2n0ayXKY/MpNFsZw0=; b=I/y4Dhy2jM/VuQ0IwQ128MQJd6v+r5NgRlq57ixAQzNAt3LAJ8l/byh6qeP69iw5puoieI Deg1Rzb/ADgaYdX5/zvrhsAny01y2TWMHjfpTuB9qEZe4pB6yeFGeyzYRGpAm9WdAKTQ+V /uMOCxx8LVqPa++0rw3AuwnMyptb/VXc87j4VZGERHJ0Yui+i/sQ83kWjHbKPZxLWYe35A pBo6N/rBb83JscjDyGgUnD84Qqt8FjqWh67kYs3ZkvWCZHE/kzbRuWHbcOMSvGFKtl7DcO h6yXBoTrHBsGiUPHUSwZpMJgjkXTJjywOUkPBaDf8JPNoX7PXCiPkfNVipy9bA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gGfsX3FBczql2 for ; Thu, 14 May 2026 19:05:04 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 258c2 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 14 May 2026 19:05:04 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Cy Schubert From: Colin Percival Subject: git: 3ee9a0f8924d - releng/15.1 - krb5: Adjust version to 1.22.2 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: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org List-Id: 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: cperciva X-Git-Repository: src X-Git-Refname: refs/heads/releng/15.1 X-Git-Reftype: branch X-Git-Commit: 3ee9a0f8924d58ccf460ae1894557245b06fe5e2 Auto-Submitted: auto-generated Date: Thu, 14 May 2026 19:05:04 +0000 Message-Id: <6a061ce0.258c2.6cfbc2d5@gitrepo.freebsd.org> The branch releng/15.1 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=3ee9a0f8924d58ccf460ae1894557245b06fe5e2 commit 3ee9a0f8924d58ccf460ae1894557245b06fe5e2 Author: Cy Schubert AuthorDate: 2026-05-01 00:57:39 +0000 Commit: Colin Percival CommitDate: 2026-05-14 19:04:16 +0000 krb5: Adjust version to 1.22.2 Approved by: re (cperciva) Fixes: 736e411a737b (cherry picked from commit 8f46ba065143d9d89968a20b23844287d54c04a2) (cherry picked from commit ea93554de436e84d27200d12f3a3b6dc1670fac9) --- krb5/Makefile.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/krb5/Makefile.inc b/krb5/Makefile.inc index 34d04daab0b1..e3f85fdded3c 100644 --- a/krb5/Makefile.inc +++ b/krb5/Makefile.inc @@ -10,7 +10,7 @@ .include PACKAGE?= kerberos -KRB5_VERSION= 1.22.1 +KRB5_VERSION= 1.22.2 # MIT KRB5 uses KRB5_DIR. Heimdal uses KRB5DIR. KRB5_SRCTOP= ${SRCTOP}/krb5 From nobody Thu May 14 19:05:05 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 4gGfsY6r6bz5WrKy for ; Thu, 14 May 2026 19:05:05 +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 "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gGfsY4vSkz47VM for ; Thu, 14 May 2026 19:05:05 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778785505; 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=eMTiyKIk47IRD9t43fV0PmqwWgwCxisCxckTY8YI+AU=; b=rSRIWl7+2JVKywUvVMJXBnjf2feKT3hsmdO46O5kW7mf10d6kIP2hP4mzB71FglN0FHdli ZPK3b+RL4uxilGTq93Pjg0sCpWTCYhkqyppFApiPGTDWL2NLsz9rqT22kUrKKorj1gnNKg 3MNwHksydupkwHQoq7LcEpWTnALxDIvwE6gPjzZa8aKPy7ghla5UCOQFE//onBwKHQvQxn UuWIkyK6eG48zpEUoHZH3d2a6zBCfbk+tmdVF8uiTXJzLWDVLUG1wQUFRQd5ujy5h1So77 uwRBYTwZnAYKpCDfxcdctYFUZjrUg88DrOZuvP52I93Vb+tEK3P0DToyXbw2Zw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778785505; a=rsa-sha256; cv=none; b=WCTXp3zE/fedN3idOaiIQOAUlwo5sEPrXFK6ES++X+t5MkJyxzoELXmZ4Jpg0wtAHR7F41 yTI+evqm8Hyifo81Si/M/VtJ6elOGLzHaY52ZAejTjUcNbcqNoc6n/EuLqgkbsYSQ+Mt2U SYw8Ne1v7gugxfQp0nnT9NSBOkAJ+uNzt5NXZ27TQr5SwmI3AG7wbFtfD2IF2rGPLkaswu EMwhQbJL4qtcnnWvkGqp1Y6Gv2AOaVVpcEORRonAWR6W2iJ3LUWJ2Vv6nhh9iRuV6jjN9G /m0xTAAoHy6UH+HAwxTISMo/f0wv+Hk6qOHyUmizUunmwaF/gEad5UlFC+q6mA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778785505; 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=eMTiyKIk47IRD9t43fV0PmqwWgwCxisCxckTY8YI+AU=; b=DJxinTne59f0FkQ+iAUabEYMyQcbiX6967/NqzA4k5aO+YQTGj4XZsSk5xBdiGJUPAO9Yl Fo/1kLncxfqOBNhrF399uh+BQ+whSXypd7QgTWyUluCDyYBZ+VGHB12RudDRXplnlLTSkQ h3WVBl+4VstdqzA3HQ8OSoOIOX1VNhVs/TKvPef+bOieHxJGglTwzM/GvlNs7Q8rpmIBOU u2P4cEYTXGFqXjNqnqU98goPd3qNXA/Fwpcu2SfWqhClYN+On6JFsB3fp1ILrA9wtyDfi6 zYPwYvZa9cdrqjhCGVYNi6Y2PgWACjU3mQJ02DW2GWBCXf0mAvFn2DuZlbmiiQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gGfsY42jwzqr7 for ; Thu, 14 May 2026 19:05:05 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 26e96 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 14 May 2026 19:05:05 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Cy Schubert From: Colin Percival Subject: git: 684cb0d678d2 - releng/15.1 - krb5: Adjust additional version strings 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: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org List-Id: 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: cperciva X-Git-Repository: src X-Git-Refname: refs/heads/releng/15.1 X-Git-Reftype: branch X-Git-Commit: 684cb0d678d233c08fdc008a2b95e64be04d5dab Auto-Submitted: auto-generated Date: Thu, 14 May 2026 19:05:05 +0000 Message-Id: <6a061ce1.26e96.7eaa386f@gitrepo.freebsd.org> The branch releng/15.1 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=684cb0d678d233c08fdc008a2b95e64be04d5dab commit 684cb0d678d233c08fdc008a2b95e64be04d5dab Author: Cy Schubert AuthorDate: 2026-05-01 14:40:19 +0000 Commit: Colin Percival CommitDate: 2026-05-14 19:04:18 +0000 krb5: Adjust additional version strings Approved by: re (cperciva) Fixes: 736e411a737b (cherry picked from commit c64ee36e5d09ecee4ce4951047014c8461734fb5) (cherry picked from commit e3fc367366319466dd91fe0217a06c0655e35a8a) --- krb5/include/autoconf.h | 4 ++-- krb5/util/build-tools/Makefile | 1 + krb5/util/build-tools/krb5-config.sh | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/krb5/include/autoconf.h b/krb5/include/autoconf.h index 760aca79176b..ef6a1fa2090d 100644 --- a/krb5/include/autoconf.h +++ b/krb5/include/autoconf.h @@ -641,7 +641,7 @@ #define PACKAGE_NAME "Kerberos 5" /* Define to the full name and version of this package. */ -#define PACKAGE_STRING "Kerberos 5 1.22.1" +#define PACKAGE_STRING "Kerberos 5 1.22.2" /* Define to the one symbol short name of this package. */ #define PACKAGE_TARNAME "krb5" @@ -650,7 +650,7 @@ #define PACKAGE_URL "" /* Define to the version of this package. */ -#define PACKAGE_VERSION "1.22.1" +#define PACKAGE_VERSION "1.22.2" /* Default PKCS11 module name */ #define PKCS11_MODNAME "opensc-pkcs11.so" diff --git a/krb5/util/build-tools/Makefile b/krb5/util/build-tools/Makefile index 8bafbb777c07..bf8396dfd939 100644 --- a/krb5/util/build-tools/Makefile +++ b/krb5/util/build-tools/Makefile @@ -8,6 +8,7 @@ # .include "../Makefile.inc" +.include "../../Makefile.pc" SCRIPTS= krb5-config.sh BINDIR?= /usr/bin diff --git a/krb5/util/build-tools/krb5-config.sh b/krb5/util/build-tools/krb5-config.sh index 9980f054b88f..401c19474f84 100755 --- a/krb5/util/build-tools/krb5-config.sh +++ b/krb5/util/build-tools/krb5-config.sh @@ -26,7 +26,7 @@ # Configurable parameters set by autoconf # Disreagard the above. Edit this by hand in the bespoke FreeBSD build. -version_string="Kerberos 5 release 1.22.1" +version_string="Kerberos 5 release 1.22.2" prefix=/usr exec_prefix=${prefix} From nobody Thu May 14 19:05:02 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 4gGfsb3s9Kz5Wr1m for ; Thu, 14 May 2026 19:05:07 +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 "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gGfsb2HT8z47MY for ; Thu, 14 May 2026 19:05:07 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778785507; 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=Gy0a5HRFiaUEOZy+yIAZ88n8bOhEjP/oP+xLbrCiPdk=; b=MHTON9l4zccrcPyYa0brChESnxXeUmrTifBiXcYJ8EnZMg3fztBhUKoGgvJ0RoFNCvbcwT 56IFY/6sDJiNYyG9L2GpDVFy5P+Y1yb/flz3Oxn3BNSHS8X9ejYZDCZuprN+gVeh5+ZlnF ZBAkKx+hSBs2xicthrUlkQ+29ryxQOzlGyoiOAdeiEY6iIijusFJ0kr1HH8NwcfeJgQBtj s0ukSdT0kWrcu71s6zBeiSfn+aWRQbDYqeHOZvlny3vWuGb38dPXZ6727qlUoo/AD47PGx c2yfazRucRoh/Fa9pJtHPYQrpSczSIaHT7b5nXRO/+7aFwxxC37l4QNI8IpsiA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778785507; a=rsa-sha256; cv=none; b=A9FYNGkAzl3yGqZ1M/KGEeRVRah2VnQ48pRpxe1C2c7k2RbNjcpfPg1ZTEoxB6hK+Z+dff ZBfzhAfk8OG0MdVRqnm32ghCjQBF/tuWRj7yNn7oQroNNvJcE89OLiXEj0Fxdl79B7uIYa GSL/K/8VQDl8SJirEE/FQCVpgE+t9FhvX835rj/aTjEgDByW9l+gWtQl95V3jfemAGKexZ jaBx8KNeioA1i0T0Sh9pqA0oLFPQTQVxi4Y4Xv1SE41wV1QI8zckk74WluoRev2AkT81e8 llRHOAOm4V010Hfg+MQ+BP3VUirrmnp2lbiPhKZhHxOYg3pqa4g8TI8xu3eN7g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778785507; 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=Gy0a5HRFiaUEOZy+yIAZ88n8bOhEjP/oP+xLbrCiPdk=; b=ZeBEofCff1TMl+BxHZhAv93x+6mbw+VKsWQ5m8Isdtn1i03lWDbpX4LX1sAxKa3qY8VWcK vlhsvLzcOWWGn+MBRyrWqFLCNTk9J60DHQuEn6Ges8/5THw26PzrVmAi2efzoKr85yRDPj L8heiBrYCsgF9gDrEg4v8nlLsWGuQLNBFCRjI2G66jggehyiP9+ciPQZ8L5Xuo3eym3QFd 7S7PeOJbTYzCbFBBbcEx1YyE3h+K0HUgxm8T3aDhGQr4ZDy4ay5qoKL5NzSVxCIJHgJMjq NlR5NIBmoc55bZggibIyGrJRhd3pSNkEktazAASIyfxcAfnVhzA6XQBOirsldA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gGfsb1sR7zpnK for ; Thu, 14 May 2026 19:05:07 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 2688d by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 14 May 2026 19:05:02 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Cy Schubert From: Colin Percival Subject: git: 3de8ca652d93 - releng/15.1 - krb5: import MIT 1.22.2 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: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org List-Id: 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: cperciva X-Git-Repository: src X-Git-Refname: refs/heads/releng/15.1 X-Git-Reftype: branch X-Git-Commit: 3de8ca652d9308858a9504265c7c88a71f058859 Auto-Submitted: auto-generated Date: Thu, 14 May 2026 19:05:02 +0000 Message-Id: <6a061cde.2688d.653d2d3d@gitrepo.freebsd.org> The branch releng/15.1 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=3de8ca652d9308858a9504265c7c88a71f058859 commit 3de8ca652d9308858a9504265c7c88a71f058859 Author: Cy Schubert AuthorDate: 2026-04-30 19:24:20 +0000 Commit: Colin Percival CommitDate: 2026-05-14 19:04:09 +0000 krb5: import MIT 1.22.2 Merge commit '90c687295e2d62f9411fc5b571f5af4e8ee187a7' Approved by: re (cperciva) (cherry picked from commit 736e411a737b9f57c1303e6d15c5afd4f63af0d3) (cherry picked from commit 919b10729753336ef16338295c61ebd085348fb9) --- crypto/krb5/NOTICE | 2 +- crypto/krb5/README | 24 +++++++++++++++- crypto/krb5/src/configure | 20 ++++++------- crypto/krb5/src/lib/gssapi/krb5/acquire_cred.c | 1 + crypto/krb5/src/lib/gssapi/krb5/iakerb.c | 1 + crypto/krb5/src/lib/gssapi/spnego/spnego_mech.c | 2 +- crypto/krb5/src/lib/krad/packet.c | 2 +- crypto/krb5/src/lib/krb5/ccache/cc_file.c | 8 ++++++ crypto/krb5/src/lib/krb5/ccache/cc_mslsa.c | 37 ++++++++++--------------- crypto/krb5/src/man/k5identity.man | 4 +-- crypto/krb5/src/man/k5login.man | 4 +-- crypto/krb5/src/man/k5srvutil.man | 4 +-- crypto/krb5/src/man/kadm5.acl.man | 4 +-- crypto/krb5/src/man/kadmin.man | 4 +-- crypto/krb5/src/man/kadmind.man | 4 +-- crypto/krb5/src/man/kdb5_ldap_util.man | 4 +-- crypto/krb5/src/man/kdb5_util.man | 4 +-- crypto/krb5/src/man/kdc.conf.man | 4 +-- crypto/krb5/src/man/kdestroy.man | 4 +-- crypto/krb5/src/man/kerberos.man | 4 +-- crypto/krb5/src/man/kinit.man | 4 +-- crypto/krb5/src/man/klist.man | 4 +-- crypto/krb5/src/man/kpasswd.man | 4 +-- crypto/krb5/src/man/kprop.man | 4 +-- crypto/krb5/src/man/kpropd.man | 4 +-- crypto/krb5/src/man/kproplog.man | 4 +-- crypto/krb5/src/man/krb5-config.man | 4 +-- crypto/krb5/src/man/krb5.conf.man | 4 +-- crypto/krb5/src/man/krb5kdc.man | 4 +-- crypto/krb5/src/man/ksu.man | 4 +-- crypto/krb5/src/man/kswitch.man | 4 +-- crypto/krb5/src/man/ktutil.man | 4 +-- crypto/krb5/src/man/kvno.man | 4 +-- crypto/krb5/src/man/sclient.man | 4 +-- crypto/krb5/src/man/sserver.man | 4 +-- crypto/krb5/src/patchlevel.h | 6 ++-- crypto/krb5/src/po/mit-krb5.pot | 4 +-- crypto/krb5/src/prototype/prototype.c | 2 +- crypto/krb5/src/prototype/prototype.h | 2 +- crypto/krb5/src/windows/version.rc | 2 +- 40 files changed, 120 insertions(+), 97 deletions(-) diff --git a/crypto/krb5/NOTICE b/crypto/krb5/NOTICE index 3d78b73035cf..20d8ef24e604 100644 --- a/crypto/krb5/NOTICE +++ b/crypto/krb5/NOTICE @@ -1,4 +1,4 @@ -Copyright (C) 1985-2025 by the Massachusetts Institute of Technology. +Copyright (C) 1985-2026 by the Massachusetts Institute of Technology. All rights reserved. diff --git a/crypto/krb5/README b/crypto/krb5/README index d1de8357e388..73eafa585dc9 100644 --- a/crypto/krb5/README +++ b/crypto/krb5/README @@ -6,7 +6,7 @@ Copyright and Other Notices --------------------------- -Copyright (C) 1985-2025 by the Massachusetts Institute of Technology +Copyright (C) 1985-2026 by the Massachusetts Institute of Technology and its contributors. All rights reserved. Please see the file named NOTICE for additional notices. @@ -97,6 +97,24 @@ removed. Beginning with the krb5-1.18 release, all support for single-DES encryption types has been removed. +Major changes in 1.22.2 (2026-01-29) +------------------------------------ + +This is a bug fix release. + +* Fix a SPNEGO packet parsing bug which could cause GSS mechanism + negotiation failure. + +krb5-1.22.2 changes by ticket ID +-------------------------------- + +9183 Fix SPNEGO mechListMIC parsing +9188 Improve MSLSA ccache timestamp conversion +9189 Fix krb5 gss_acquire_cred() leak on some errors +9190 Make atomic ccache replacement work on Windows +9193 Fix uninitialized pointer dereference in libkrad +9194 Fix IAKERB realm discovery state machine logic + Major changes in 1.22.1 (2025-08-20) ------------------------------------ @@ -378,6 +396,7 @@ reports, suggestions, and valuable resources: Gerald Combs Simon Cooper Sylvain Cortes + Robert Crowston Ian Crowther Arran Cudbard-Bell Adam Dabrowski @@ -475,6 +494,7 @@ reports, suggestions, and valuable resources: Tomas Kuthan Pierre Labastie Andreas Ladanyi + Yubi Lee Chris Leick Volker Lendecke Jan iankko Lieskovsky @@ -519,6 +539,7 @@ reports, suggestions, and valuable resources: Felipe Ortega Michael Osipov Andrej Ota + Dmitry Ovsyannikov Dmitri Pal Javier Palacios Dilyan Palauzov @@ -530,6 +551,7 @@ reports, suggestions, and valuable resources: Zoran Pericic W. Michael Petullo Mark Phalan + Ben Pope Sharwan Ram Brett Randall Jonathan Reams diff --git a/crypto/krb5/src/configure b/crypto/krb5/src/configure index c8dc43de1380..ed823e9244a1 100755 --- a/crypto/krb5/src/configure +++ b/crypto/krb5/src/configure @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.71 for Kerberos 5 1.22.1. +# Generated by GNU Autoconf 2.71 for Kerberos 5 1.22.2. # # Report bugs to . # @@ -615,8 +615,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='Kerberos 5' PACKAGE_TARNAME='krb5' -PACKAGE_VERSION='1.22.1' -PACKAGE_STRING='Kerberos 5 1.22.1' +PACKAGE_VERSION='1.22.2' +PACKAGE_STRING='Kerberos 5 1.22.2' PACKAGE_BUGREPORT='krb5-bugs@mit.edu' PACKAGE_URL='' @@ -1506,7 +1506,7 @@ if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures Kerberos 5 1.22.1 to adapt to many kinds of systems. +\`configure' configures Kerberos 5 1.22.2 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1577,7 +1577,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of Kerberos 5 1.22.1:";; + short | recursive ) echo "Configuration of Kerberos 5 1.22.2:";; esac cat <<\_ACEOF @@ -1739,7 +1739,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -Kerberos 5 configure 1.22.1 +Kerberos 5 configure 1.22.2 generated by GNU Autoconf 2.71 Copyright (C) 2021 Free Software Foundation, Inc. @@ -2439,7 +2439,7 @@ cat >config.log <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by Kerberos 5 $as_me 1.22.1, which was +It was created by Kerberos 5 $as_me 1.22.2, which was generated by GNU Autoconf 2.71. Invocation command line was $ $0$ac_configure_args_raw @@ -8159,7 +8159,7 @@ fi -KRB5_VERSION=1.22.1 +KRB5_VERSION=1.22.2 @@ -15366,7 +15366,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by Kerberos 5 $as_me 1.22.1, which was +This file was extended by Kerberos 5 $as_me 1.22.2, which was generated by GNU Autoconf 2.71. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -15430,7 +15430,7 @@ ac_cs_config_escaped=`printf "%s\n" "$ac_cs_config" | sed "s/^ //; s/'/'\\\\\\\\ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config='$ac_cs_config_escaped' ac_cs_version="\\ -Kerberos 5 config.status 1.22.1 +Kerberos 5 config.status 1.22.2 configured by $0, generated by GNU Autoconf 2.71, with options \\"\$ac_cs_config\\" diff --git a/crypto/krb5/src/lib/gssapi/krb5/acquire_cred.c b/crypto/krb5/src/lib/gssapi/krb5/acquire_cred.c index aa1a486dcaa0..12e6b7ea805b 100644 --- a/crypto/krb5/src/lib/gssapi/krb5/acquire_cred.c +++ b/crypto/krb5/src/lib/gssapi/krb5/acquire_cred.c @@ -912,6 +912,7 @@ error_out: if (cred->name) kg_release_name(context, &cred->name); krb5_free_principal(context, cred->impersonator); + krb5_free_principal(context, cred->acceptor_mprinc); zapfreestr(cred->password); k5_mutex_destroy(&cred->lock); xfree(cred); diff --git a/crypto/krb5/src/lib/gssapi/krb5/iakerb.c b/crypto/krb5/src/lib/gssapi/krb5/iakerb.c index 90a9bce11ad7..7cc4710e25d3 100644 --- a/crypto/krb5/src/lib/gssapi/krb5/iakerb.c +++ b/crypto/krb5/src/lib/gssapi/krb5/iakerb.c @@ -631,6 +631,7 @@ iakerb_initiator_step(iakerb_ctx_id_t ctx, cred->name->princ->realm = server_realm; server_realm = empty_data(); + ctx->state = IAKERB_AS_REQ; /* Done with realm discovery; fall through to AS request. */ case IAKERB_AS_REQ: if (ctx->icc == NULL) { diff --git a/crypto/krb5/src/lib/gssapi/spnego/spnego_mech.c b/crypto/krb5/src/lib/gssapi/spnego/spnego_mech.c index 43ba63ab2a7b..4a778364336e 100644 --- a/crypto/krb5/src/lib/gssapi/spnego/spnego_mech.c +++ b/crypto/krb5/src/lib/gssapi/spnego/spnego_mech.c @@ -3515,7 +3515,7 @@ get_negTokenResp(OM_uint32 *minor_status, struct k5input *in, return GSS_S_DEFECTIVE_TOKEN; } - if (k5_der_get_value(&seq, CONTEXT | 0x04, &field)) { + if (k5_der_get_value(&seq, CONTEXT | 0x03, &field)) { *mechListMIC = get_octet_string(&field); /* Handle Windows 2000 duplicate response token */ diff --git a/crypto/krb5/src/lib/krad/packet.c b/crypto/krb5/src/lib/krad/packet.c index ed19385f71a6..22128350428c 100644 --- a/crypto/krb5/src/lib/krad/packet.c +++ b/crypto/krb5/src/lib/krad/packet.c @@ -565,7 +565,7 @@ krad_packet_decode_request(krb5_context ctx, const char *secret, if (cb != NULL) { for (tmp = (*cb)(data, FALSE); tmp != NULL; tmp = (*cb)(data, FALSE)) { - if (pkt_id_get(*reqpkt) == pkt_id_get(tmp)) + if (pkt_id_get(req) == pkt_id_get(tmp)) break; } diff --git a/crypto/krb5/src/lib/krb5/ccache/cc_file.c b/crypto/krb5/src/lib/krb5/ccache/cc_file.c index 198152a9ecd0..f34c0f1064aa 100644 --- a/crypto/krb5/src/lib/krb5/ccache/cc_file.c +++ b/crypto/krb5/src/lib/krb5/ccache/cc_file.c @@ -1311,6 +1311,14 @@ fcc_replace(krb5_context context, krb5_ccache id, krb5_principal princ, goto errno_cleanup; st = rename(tmpname, data->filename); +#ifdef _WIN32 + /* Windows cannot rename over an existing file under most circumstances. + * Try ReplaceFile() (which only works if the destination file exists). */ + if (st != 0) { + if (ReplaceFile(data->filename, tmpname, NULL, 0, NULL, NULL)) + st = 0; + } +#endif if (st != 0) goto errno_cleanup; tmpfile_exists = FALSE; diff --git a/crypto/krb5/src/lib/krb5/ccache/cc_mslsa.c b/crypto/krb5/src/lib/krb5/ccache/cc_mslsa.c index 4931e6c172a5..675cf4d11206 100644 --- a/crypto/krb5/src/lib/krb5/ccache/cc_mslsa.c +++ b/crypto/krb5/src/lib/krb5/ccache/cc_mslsa.c @@ -249,24 +249,15 @@ KerbExternalNameToMITPrinc(KERB_EXTERNAL_NAME *msprinc, WCHAR *realm, krb5_conte return FALSE; } -static time_t -FileTimeToUnixTime(LARGE_INTEGER *ltime) +/* + * Convert a Windows file time (number of 100-nanosecond intervals since + * 1601-01-01 UTC) to a POSIX timestamp (number of seconds since 1970-01-01 + * UTC). + */ +static inline time_t +FileTimeToUnixTime(int64_t ft) { - FILETIME filetime, localfiletime; - SYSTEMTIME systime; - struct tm utime; - filetime.dwLowDateTime=ltime->LowPart; - filetime.dwHighDateTime=ltime->HighPart; - FileTimeToLocalFileTime(&filetime, &localfiletime); - FileTimeToSystemTime(&localfiletime, &systime); - utime.tm_sec=systime.wSecond; - utime.tm_min=systime.wMinute; - utime.tm_hour=systime.wHour; - utime.tm_mday=systime.wDay; - utime.tm_mon=systime.wMonth-1; - utime.tm_year=systime.wYear-1900; - utime.tm_isdst=-1; - return(mktime(&utime)); + return ft / 10000000 - 11644473600; } static void @@ -346,9 +337,9 @@ MSCredToMITCred(KERB_EXTERNAL_TICKET *msticket, UNICODE_STRING ClientRealm, MSSessionKeyToMITKeyblock(&msticket->SessionKey, context, &creds->keyblock); MSFlagsToMITFlags(msticket->TicketFlags, &creds->ticket_flags); - creds->times.starttime=FileTimeToUnixTime(&msticket->StartTime); - creds->times.endtime=FileTimeToUnixTime(&msticket->EndTime); - creds->times.renew_till=FileTimeToUnixTime(&msticket->RenewUntil); + creds->times.starttime=FileTimeToUnixTime(msticket->StartTime.QuadPart); + creds->times.endtime=FileTimeToUnixTime(msticket->EndTime.QuadPart); + creds->times.renew_till=FileTimeToUnixTime(msticket->RenewUntil.QuadPart); creds->addresses = NULL; @@ -377,9 +368,9 @@ CacheInfoEx2ToMITCred(KERB_TICKET_CACHE_INFO_EX2 *info, creds->keyblock.enctype = info->SessionKeyType; creds->ticket_flags = info->TicketFlags; MSFlagsToMITFlags(info->TicketFlags, &creds->ticket_flags); - creds->times.starttime=FileTimeToUnixTime(&info->StartTime); - creds->times.endtime=FileTimeToUnixTime(&info->EndTime); - creds->times.renew_till=FileTimeToUnixTime(&info->RenewTime); + creds->times.starttime=FileTimeToUnixTime(info->StartTime.QuadPart); + creds->times.endtime=FileTimeToUnixTime(info->EndTime.QuadPart); + creds->times.renew_till=FileTimeToUnixTime(info->RenewTime.QuadPart); /* MS Tickets are addressless. MIT requires an empty address * not a NULL list of addresses. diff --git a/crypto/krb5/src/man/k5identity.man b/crypto/krb5/src/man/k5identity.man index a7d533f077fd..40962b7a49c2 100644 --- a/crypto/krb5/src/man/k5identity.man +++ b/crypto/krb5/src/man/k5identity.man @@ -27,7 +27,7 @@ level margin: \\n[rst2man-indent\\n[rst2man-indent-level]] .\" new: \\n[rst2man-indent\\n[rst2man-indent-level]] .in \\n[rst2man-indent\\n[rst2man-indent-level]]u .. -.TH "K5IDENTITY" "5" " " "1.22.1" "MIT Kerberos" +.TH "K5IDENTITY" "5" " " "1.22.2" "MIT Kerberos" .SH NAME k5identity \- Kerberos V5 client principal selection rules .SH DESCRIPTION @@ -96,6 +96,6 @@ kerberos(1), \fI\%krb5.conf\fP .SH AUTHOR MIT .SH COPYRIGHT -1985-2025, MIT +1985-2026, MIT .\" Generated by docutils manpage writer. . diff --git a/crypto/krb5/src/man/k5login.man b/crypto/krb5/src/man/k5login.man index 906f8854f87c..d0e327d1bfa4 100644 --- a/crypto/krb5/src/man/k5login.man +++ b/crypto/krb5/src/man/k5login.man @@ -27,7 +27,7 @@ level margin: \\n[rst2man-indent\\n[rst2man-indent-level]] .\" new: \\n[rst2man-indent\\n[rst2man-indent-level]] .in \\n[rst2man-indent\\n[rst2man-indent-level]]u .. -.TH "K5LOGIN" "5" " " "1.22.1" "MIT Kerberos" +.TH "K5LOGIN" "5" " " "1.22.2" "MIT Kerberos" .SH NAME k5login \- Kerberos V5 acl file for host access .SH DESCRIPTION @@ -87,6 +87,6 @@ kerberos(1) .SH AUTHOR MIT .SH COPYRIGHT -1985-2025, MIT +1985-2026, MIT .\" Generated by docutils manpage writer. . diff --git a/crypto/krb5/src/man/k5srvutil.man b/crypto/krb5/src/man/k5srvutil.man index 537ed15d8f3b..e926a1eb3b3f 100644 --- a/crypto/krb5/src/man/k5srvutil.man +++ b/crypto/krb5/src/man/k5srvutil.man @@ -27,7 +27,7 @@ level margin: \\n[rst2man-indent\\n[rst2man-indent-level]] .\" new: \\n[rst2man-indent\\n[rst2man-indent-level]] .in \\n[rst2man-indent\\n[rst2man-indent-level]]u .. -.TH "K5SRVUTIL" "1" " " "1.22.1" "MIT Kerberos" +.TH "K5SRVUTIL" "1" " " "1.22.2" "MIT Kerberos" .SH NAME k5srvutil \- host key table (keytab) manipulation utility .SH SYNOPSIS @@ -90,6 +90,6 @@ variables. .SH AUTHOR MIT .SH COPYRIGHT -1985-2025, MIT +1985-2026, MIT .\" Generated by docutils manpage writer. . diff --git a/crypto/krb5/src/man/kadm5.acl.man b/crypto/krb5/src/man/kadm5.acl.man index 3517c08bd6fe..95cf849d7493 100644 --- a/crypto/krb5/src/man/kadm5.acl.man +++ b/crypto/krb5/src/man/kadm5.acl.man @@ -28,7 +28,7 @@ level margin: \\n[rst2man-indent\\n[rst2man-indent-level]] .\" new: \\n[rst2man-indent\\n[rst2man-indent-level]] .in \\n[rst2man-indent\\n[rst2man-indent-level]]u .. -.TH "KADM5.ACL" "5" " " "1.22.1" "MIT Kerberos" +.TH "KADM5.ACL" "5" " " "1.22.2" "MIT Kerberos" .SH NAME kadm5.acl \- Kerberos ACL file .SH DESCRIPTION @@ -271,6 +271,6 @@ To operate without an ACL file, set the \fIacl_file\fP variable in .SH AUTHOR MIT .SH COPYRIGHT -1985-2025, MIT +1985-2026, MIT .\" Generated by docutils manpage writer. . diff --git a/crypto/krb5/src/man/kadmin.man b/crypto/krb5/src/man/kadmin.man index 005c2add8135..15ddc17dc573 100644 --- a/crypto/krb5/src/man/kadmin.man +++ b/crypto/krb5/src/man/kadmin.man @@ -27,7 +27,7 @@ level margin: \\n[rst2man-indent\\n[rst2man-indent-level]] .\" new: \\n[rst2man-indent\\n[rst2man-indent-level]] .in \\n[rst2man-indent\\n[rst2man-indent-level]]u .. -.TH "KADMIN" "1" " " "1.22.1" "MIT Kerberos" +.TH "KADMIN" "1" " " "1.22.2" "MIT Kerberos" .SH NAME kadmin \- Kerberos V5 database administration program .SH SYNOPSIS @@ -1089,6 +1089,6 @@ variables. .SH AUTHOR MIT .SH COPYRIGHT -1985-2025, MIT +1985-2026, MIT .\" Generated by docutils manpage writer. . diff --git a/crypto/krb5/src/man/kadmind.man b/crypto/krb5/src/man/kadmind.man index c0b355c79a9b..842b5082c8b7 100644 --- a/crypto/krb5/src/man/kadmind.man +++ b/crypto/krb5/src/man/kadmind.man @@ -27,7 +27,7 @@ level margin: \\n[rst2man-indent\\n[rst2man-indent-level]] .\" new: \\n[rst2man-indent\\n[rst2man-indent-level]] .in \\n[rst2man-indent\\n[rst2man-indent-level]]u .. -.TH "KADMIND" "8" " " "1.22.1" "MIT Kerberos" +.TH "KADMIND" "8" " " "1.22.2" "MIT Kerberos" .SH NAME kadmind \- KADM5 administration server .SH SYNOPSIS @@ -156,6 +156,6 @@ activation is used. .SH AUTHOR MIT .SH COPYRIGHT -1985-2025, MIT +1985-2026, MIT .\" Generated by docutils manpage writer. . diff --git a/crypto/krb5/src/man/kdb5_ldap_util.man b/crypto/krb5/src/man/kdb5_ldap_util.man index 7cfda216e399..23461beafc60 100644 --- a/crypto/krb5/src/man/kdb5_ldap_util.man +++ b/crypto/krb5/src/man/kdb5_ldap_util.man @@ -27,7 +27,7 @@ level margin: \\n[rst2man-indent\\n[rst2man-indent-level]] .\" new: \\n[rst2man-indent\\n[rst2man-indent-level]] .in \\n[rst2man-indent\\n[rst2man-indent-level]]u .. -.TH "KDB5_LDAP_UTIL" "8" " " "1.22.1" "MIT Kerberos" +.TH "KDB5_LDAP_UTIL" "8" " " "1.22.2" "MIT Kerberos" .SH NAME kdb5_ldap_util \- Kerberos configuration utility .SH SYNOPSIS @@ -500,6 +500,6 @@ variables. .SH AUTHOR MIT .SH COPYRIGHT -1985-2025, MIT +1985-2026, MIT .\" Generated by docutils manpage writer. . diff --git a/crypto/krb5/src/man/kdb5_util.man b/crypto/krb5/src/man/kdb5_util.man index 0e5f1d1bf5fe..a777ad8ec933 100644 --- a/crypto/krb5/src/man/kdb5_util.man +++ b/crypto/krb5/src/man/kdb5_util.man @@ -27,7 +27,7 @@ level margin: \\n[rst2man-indent\\n[rst2man-indent-level]] .\" new: \\n[rst2man-indent\\n[rst2man-indent-level]] .in \\n[rst2man-indent\\n[rst2man-indent-level]]u .. -.TH "KDB5_UTIL" "8" " " "1.22.1" "MIT Kerberos" +.TH "KDB5_UTIL" "8" " " "1.22.2" "MIT Kerberos" .SH NAME kdb5_util \- Kerberos database maintenance utility .SH SYNOPSIS @@ -563,6 +563,6 @@ variables. .SH AUTHOR MIT .SH COPYRIGHT -1985-2025, MIT +1985-2026, MIT .\" Generated by docutils manpage writer. . diff --git a/crypto/krb5/src/man/kdc.conf.man b/crypto/krb5/src/man/kdc.conf.man index 33bbb13c6157..ca82a2f1796e 100644 --- a/crypto/krb5/src/man/kdc.conf.man +++ b/crypto/krb5/src/man/kdc.conf.man @@ -28,7 +28,7 @@ level margin: \\n[rst2man-indent\\n[rst2man-indent-level]] .\" new: \\n[rst2man-indent\\n[rst2man-indent-level]] .in \\n[rst2man-indent\\n[rst2man-indent-level]]u .. -.TH "KDC.CONF" "5" " " "1.22.1" "MIT Kerberos" +.TH "KDC.CONF" "5" " " "1.22.2" "MIT Kerberos" .SH NAME kdc.conf \- Kerberos V5 KDC configuration file .sp @@ -1178,6 +1178,6 @@ Here\(aqs an example of a kdc.conf file: .SH AUTHOR MIT .SH COPYRIGHT -1985-2025, MIT +1985-2026, MIT .\" Generated by docutils manpage writer. . diff --git a/crypto/krb5/src/man/kdestroy.man b/crypto/krb5/src/man/kdestroy.man index 88888d590133..e91ed47d35bf 100644 --- a/crypto/krb5/src/man/kdestroy.man +++ b/crypto/krb5/src/man/kdestroy.man @@ -27,7 +27,7 @@ level margin: \\n[rst2man-indent\\n[rst2man-indent-level]] .\" new: \\n[rst2man-indent\\n[rst2man-indent-level]] .in \\n[rst2man-indent\\n[rst2man-indent-level]]u .. -.TH "KDESTROY" "1" " " "1.22.1" "MIT Kerberos" +.TH "KDESTROY" "1" " " "1.22.2" "MIT Kerberos" .SH NAME kdestroy \- destroy Kerberos tickets .SH SYNOPSIS @@ -90,6 +90,6 @@ Default location of Kerberos 5 credentials cache .SH AUTHOR MIT .SH COPYRIGHT -1985-2025, MIT +1985-2026, MIT .\" Generated by docutils manpage writer. . diff --git a/crypto/krb5/src/man/kerberos.man b/crypto/krb5/src/man/kerberos.man index 64d9290688cb..295d154c44d3 100644 --- a/crypto/krb5/src/man/kerberos.man +++ b/crypto/krb5/src/man/kerberos.man @@ -27,7 +27,7 @@ level margin: \\n[rst2man-indent\\n[rst2man-indent-level]] .\" new: \\n[rst2man-indent\\n[rst2man-indent-level]] .in \\n[rst2man-indent\\n[rst2man-indent-level]]u .. -.TH "KERBEROS" "7" " " "1.22.1" "MIT Kerberos" +.TH "KERBEROS" "7" " " "1.22.2" "MIT Kerberos" .SH NAME kerberos \- Overview of using Kerberos .SH DESCRIPTION @@ -210,6 +210,6 @@ Institute of Technology .SH AUTHOR MIT .SH COPYRIGHT -1985-2025, MIT +1985-2026, MIT .\" Generated by docutils manpage writer. . diff --git a/crypto/krb5/src/man/kinit.man b/crypto/krb5/src/man/kinit.man index 9934f21b6895..6153166a1165 100644 --- a/crypto/krb5/src/man/kinit.man +++ b/crypto/krb5/src/man/kinit.man @@ -27,7 +27,7 @@ level margin: \\n[rst2man-indent\\n[rst2man-indent-level]] .\" new: \\n[rst2man-indent\\n[rst2man-indent-level]] .in \\n[rst2man-indent\\n[rst2man-indent-level]]u .. -.TH "KINIT" "1" " " "1.22.1" "MIT Kerberos" +.TH "KINIT" "1" " " "1.22.2" "MIT Kerberos" .SH NAME kinit \- obtain and cache Kerberos ticket-granting ticket .SH SYNOPSIS @@ -250,6 +250,6 @@ default location for the local host\(aqs keytab. .SH AUTHOR MIT .SH COPYRIGHT -1985-2025, MIT +1985-2026, MIT .\" Generated by docutils manpage writer. . diff --git a/crypto/krb5/src/man/klist.man b/crypto/krb5/src/man/klist.man index e4e505bc6573..aa5e44ab4298 100644 --- a/crypto/krb5/src/man/klist.man +++ b/crypto/krb5/src/man/klist.man @@ -27,7 +27,7 @@ level margin: \\n[rst2man-indent\\n[rst2man-indent-level]] .\" new: \\n[rst2man-indent\\n[rst2man-indent-level]] .in \\n[rst2man-indent\\n[rst2man-indent-level]]u .. -.TH "KLIST" "1" " " "1.22.1" "MIT Kerberos" +.TH "KLIST" "1" " " "1.22.2" "MIT Kerberos" .SH NAME klist \- list cached Kerberos tickets .SH SYNOPSIS @@ -151,6 +151,6 @@ Default location for the local host\(aqs keytab file. .SH AUTHOR MIT .SH COPYRIGHT -1985-2025, MIT +1985-2026, MIT .\" Generated by docutils manpage writer. . diff --git a/crypto/krb5/src/man/kpasswd.man b/crypto/krb5/src/man/kpasswd.man index 7577b9213beb..0321cac4d0a2 100644 --- a/crypto/krb5/src/man/kpasswd.man +++ b/crypto/krb5/src/man/kpasswd.man @@ -27,7 +27,7 @@ level margin: \\n[rst2man-indent\\n[rst2man-indent-level]] .\" new: \\n[rst2man-indent\\n[rst2man-indent-level]] .in \\n[rst2man-indent\\n[rst2man-indent-level]]u .. -.TH "KPASSWD" "1" " " "1.22.1" "MIT Kerberos" +.TH "KPASSWD" "1" " " "1.22.2" "MIT Kerberos" .SH NAME kpasswd \- change a user's Kerberos password .SH SYNOPSIS @@ -63,6 +63,6 @@ variables. .SH AUTHOR MIT .SH COPYRIGHT -1985-2025, MIT +1985-2026, MIT .\" Generated by docutils manpage writer. . diff --git a/crypto/krb5/src/man/kprop.man b/crypto/krb5/src/man/kprop.man index c21bd9692735..f3fc60a71b43 100644 --- a/crypto/krb5/src/man/kprop.man +++ b/crypto/krb5/src/man/kprop.man @@ -27,7 +27,7 @@ level margin: \\n[rst2man-indent\\n[rst2man-indent-level]] .\" new: \\n[rst2man-indent\\n[rst2man-indent-level]] .in \\n[rst2man-indent\\n[rst2man-indent-level]]u .. -.TH "KPROP" "8" " " "1.22.1" "MIT Kerberos" +.TH "KPROP" "8" " " "1.22.2" "MIT Kerberos" .SH NAME kprop \- propagate a Kerberos V5 principal database to a replica server .SH SYNOPSIS @@ -77,6 +77,6 @@ variables. .SH AUTHOR MIT .SH COPYRIGHT -1985-2025, MIT +1985-2026, MIT .\" Generated by docutils manpage writer. . diff --git a/crypto/krb5/src/man/kpropd.man b/crypto/krb5/src/man/kpropd.man index b1caad000718..182ecfe8b7f7 100644 --- a/crypto/krb5/src/man/kpropd.man +++ b/crypto/krb5/src/man/kpropd.man @@ -27,7 +27,7 @@ level margin: \\n[rst2man-indent\\n[rst2man-indent-level]] .\" new: \\n[rst2man-indent\\n[rst2man-indent-level]] .in \\n[rst2man-indent\\n[rst2man-indent-level]]u .. -.TH "KPROPD" "8" " " "1.22.1" "MIT Kerberos" +.TH "KPROPD" "8" " " "1.22.2" "MIT Kerberos" .SH NAME kpropd \- Kerberos V5 replica KDC update server .SH SYNOPSIS @@ -164,6 +164,6 @@ variables. .SH AUTHOR MIT .SH COPYRIGHT -1985-2025, MIT +1985-2026, MIT .\" Generated by docutils manpage writer. . diff --git a/crypto/krb5/src/man/kproplog.man b/crypto/krb5/src/man/kproplog.man index 8d404de88b48..95a4b0800ca6 100644 --- a/crypto/krb5/src/man/kproplog.man +++ b/crypto/krb5/src/man/kproplog.man @@ -27,7 +27,7 @@ level margin: \\n[rst2man-indent\\n[rst2man-indent-level]] .\" new: \\n[rst2man-indent\\n[rst2man-indent-level]] .in \\n[rst2man-indent\\n[rst2man-indent-level]]u .. -.TH "KPROPLOG" "8" " " "1.22.1" "MIT Kerberos" +.TH "KPROPLOG" "8" " " "1.22.2" "MIT Kerberos" .SH NAME kproplog \- display the contents of the Kerberos principal update log .SH SYNOPSIS @@ -108,6 +108,6 @@ variables. .SH AUTHOR MIT .SH COPYRIGHT -1985-2025, MIT +1985-2026, MIT .\" Generated by docutils manpage writer. . diff --git a/crypto/krb5/src/man/krb5-config.man b/crypto/krb5/src/man/krb5-config.man index 0b743cf5d124..ecc696a7919e 100644 --- a/crypto/krb5/src/man/krb5-config.man +++ b/crypto/krb5/src/man/krb5-config.man @@ -28,7 +28,7 @@ level margin: \\n[rst2man-indent\\n[rst2man-indent-level]] .\" new: \\n[rst2man-indent\\n[rst2man-indent-level]] .in \\n[rst2man-indent\\n[rst2man-indent-level]]u .. -.TH "KRB5-CONFIG" "1" " " "1.22.1" "MIT Kerberos" +.TH "KRB5-CONFIG" "1" " " "1.22.2" "MIT Kerberos" .SH NAME krb5-config \- tool for linking against MIT Kerberos libraries .SH SYNOPSIS @@ -135,6 +135,6 @@ shell% krb5\-config \-\-libs krb5 .SH AUTHOR MIT .SH COPYRIGHT -1985-2025, MIT +1985-2026, MIT .\" Generated by docutils manpage writer. . diff --git a/crypto/krb5/src/man/krb5.conf.man b/crypto/krb5/src/man/krb5.conf.man index 2590f2151eaf..eaba2b4cdab0 100644 --- a/crypto/krb5/src/man/krb5.conf.man +++ b/crypto/krb5/src/man/krb5.conf.man @@ -28,7 +28,7 @@ level margin: \\n[rst2man-indent\\n[rst2man-indent-level]] .\" new: \\n[rst2man-indent\\n[rst2man-indent-level]] .in \\n[rst2man-indent\\n[rst2man-indent-level]]u .. -.TH "KRB5.CONF" "5" " " "1.22.1" "MIT Kerberos" +.TH "KRB5.CONF" "5" " " "1.22.2" "MIT Kerberos" .SH NAME krb5.conf \- Kerberos configuration file .sp @@ -1500,6 +1500,6 @@ syslog(3) .SH AUTHOR MIT .SH COPYRIGHT -1985-2025, MIT +1985-2026, MIT .\" Generated by docutils manpage writer. . diff --git a/crypto/krb5/src/man/krb5kdc.man b/crypto/krb5/src/man/krb5kdc.man index bcbd19d01a98..3f38828b8b0f 100644 --- a/crypto/krb5/src/man/krb5kdc.man +++ b/crypto/krb5/src/man/krb5kdc.man @@ -27,7 +27,7 @@ level margin: \\n[rst2man-indent\\n[rst2man-indent-level]] .\" new: \\n[rst2man-indent\\n[rst2man-indent-level]] .in \\n[rst2man-indent\\n[rst2man-indent-level]]u .. -.TH "KRB5KDC" "8" " " "1.22.1" "MIT Kerberos" +.TH "KRB5KDC" "8" " " "1.22.2" "MIT Kerberos" .SH NAME krb5kdc \- Kerberos V5 KDC .SH SYNOPSIS @@ -140,6 +140,6 @@ caller\-provided sockets will be ignored if socket activation is used. .SH AUTHOR MIT .SH COPYRIGHT -1985-2025, MIT +1985-2026, MIT .\" Generated by docutils manpage writer. . diff --git a/crypto/krb5/src/man/ksu.man b/crypto/krb5/src/man/ksu.man index 59015c2dd4dc..e1f1c16efab6 100644 --- a/crypto/krb5/src/man/ksu.man +++ b/crypto/krb5/src/man/ksu.man @@ -27,7 +27,7 @@ level margin: \\n[rst2man-indent\\n[rst2man-indent-level]] .\" new: \\n[rst2man-indent\\n[rst2man-indent-level]] .in \\n[rst2man-indent\\n[rst2man-indent-level]]u .. -.TH "KSU" "1" " " "1.22.1" "MIT Kerberos" +.TH "KSU" "1" " " "1.22.2" "MIT Kerberos" .SH NAME ksu \- Kerberized super-user .SH SYNOPSIS @@ -462,6 +462,6 @@ variables. .SH AUTHOR MIT .SH COPYRIGHT -1985-2025, MIT +1985-2026, MIT .\" Generated by docutils manpage writer. . diff --git a/crypto/krb5/src/man/kswitch.man b/crypto/krb5/src/man/kswitch.man index 7c21199fcee4..0ed5168aaa67 100644 --- a/crypto/krb5/src/man/kswitch.man +++ b/crypto/krb5/src/man/kswitch.man @@ -27,7 +27,7 @@ level margin: \\n[rst2man-indent\\n[rst2man-indent-level]] .\" new: \\n[rst2man-indent\\n[rst2man-indent-level]] .in \\n[rst2man-indent\\n[rst2man-indent-level]]u .. -.TH "KSWITCH" "1" " " "1.22.1" "MIT Kerberos" +.TH "KSWITCH" "1" " " "1.22.2" "MIT Kerberos" .SH NAME kswitch \- switch primary ticket cache .SH SYNOPSIS @@ -66,6 +66,6 @@ Default location of Kerberos 5 credentials cache .SH AUTHOR MIT .SH COPYRIGHT -1985-2025, MIT +1985-2026, MIT .\" Generated by docutils manpage writer. . diff --git a/crypto/krb5/src/man/ktutil.man b/crypto/krb5/src/man/ktutil.man index 8e4ec837732a..53077975bb87 100644 --- a/crypto/krb5/src/man/ktutil.man +++ b/crypto/krb5/src/man/ktutil.man @@ -27,7 +27,7 @@ level margin: \\n[rst2man-indent\\n[rst2man-indent-level]] .\" new: \\n[rst2man-indent\\n[rst2man-indent-level]] .in \\n[rst2man-indent\\n[rst2man-indent-level]]u .. -.TH "KTUTIL" "1" " " "1.22.1" "MIT Kerberos" +.TH "KTUTIL" "1" " " "1.22.2" "MIT Kerberos" .SH NAME ktutil \- Kerberos keytab file maintenance utility .SH SYNOPSIS @@ -157,6 +157,6 @@ variables. .SH AUTHOR MIT .SH COPYRIGHT -1985-2025, MIT +1985-2026, MIT .\" Generated by docutils manpage writer. . diff --git a/crypto/krb5/src/man/kvno.man b/crypto/krb5/src/man/kvno.man index f068f0664ab4..b63ba3b238d2 100644 --- a/crypto/krb5/src/man/kvno.man +++ b/crypto/krb5/src/man/kvno.man @@ -27,7 +27,7 @@ level margin: \\n[rst2man-indent\\n[rst2man-indent-level]] .\" new: \\n[rst2man-indent\\n[rst2man-indent-level]] .in \\n[rst2man-indent\\n[rst2man-indent-level]]u .. -.TH "KVNO" "1" " " "1.22.1" "MIT Kerberos" +.TH "KVNO" "1" " " "1.22.2" "MIT Kerberos" .SH NAME kvno \- print key version numbers of Kerberos principals .SH SYNOPSIS @@ -136,6 +136,6 @@ Default location of the credentials cache .SH AUTHOR MIT .SH COPYRIGHT -1985-2025, MIT +1985-2026, MIT .\" Generated by docutils manpage writer. . diff --git a/crypto/krb5/src/man/sclient.man b/crypto/krb5/src/man/sclient.man index e697bd44b281..10976c05a46a 100644 --- a/crypto/krb5/src/man/sclient.man +++ b/crypto/krb5/src/man/sclient.man @@ -27,7 +27,7 @@ level margin: \\n[rst2man-indent\\n[rst2man-indent-level]] .\" new: \\n[rst2man-indent\\n[rst2man-indent-level]] .in \\n[rst2man-indent\\n[rst2man-indent-level]]u .. -.TH "SCLIENT" "1" " " "1.22.1" "MIT Kerberos" +.TH "SCLIENT" "1" " " "1.22.2" "MIT Kerberos" .SH NAME sclient \- sample Kerberos version 5 client .SH SYNOPSIS @@ -49,6 +49,6 @@ variables. .SH AUTHOR MIT .SH COPYRIGHT -1985-2025, MIT +1985-2026, MIT .\" Generated by docutils manpage writer. . diff --git a/crypto/krb5/src/man/sserver.man b/crypto/krb5/src/man/sserver.man index c71194e59aaa..e60cb696d9c3 100644 --- a/crypto/krb5/src/man/sserver.man +++ b/crypto/krb5/src/man/sserver.man @@ -27,7 +27,7 @@ level margin: \\n[rst2man-indent\\n[rst2man-indent-level]] .\" new: \\n[rst2man-indent\\n[rst2man-indent-level]] .in \\n[rst2man-indent\\n[rst2man-indent-level]]u .. -.TH "SSERVER" "8" " " "1.22.1" "MIT Kerberos" +.TH "SSERVER" "8" " " "1.22.2" "MIT Kerberos" .SH NAME sserver \- sample Kerberos version 5 server .SH SYNOPSIS @@ -177,6 +177,6 @@ variables. .SH AUTHOR MIT .SH COPYRIGHT -1985-2025, MIT +1985-2026, MIT .\" Generated by docutils manpage writer. . diff --git a/crypto/krb5/src/patchlevel.h b/crypto/krb5/src/patchlevel.h index 1a6d3e47098f..7cde36884833 100644 --- a/crypto/krb5/src/patchlevel.h +++ b/crypto/krb5/src/patchlevel.h @@ -51,7 +51,7 @@ */ #define KRB5_MAJOR_RELEASE 1 #define KRB5_MINOR_RELEASE 22 -#define KRB5_PATCHLEVEL 1 +#define KRB5_PATCHLEVEL 2 /* #undef KRB5_RELTAIL */ -#define KRB5_RELDATE "20250820" -#define KRB5_RELTAG "krb5-1.22.1-final" +#define KRB5_RELDATE "20260129" +#define KRB5_RELTAG "krb5-1.22.2-final" diff --git a/crypto/krb5/src/po/mit-krb5.pot b/crypto/krb5/src/po/mit-krb5.pot index 6358f57081b2..6b4ba3bc3121 100644 --- a/crypto/krb5/src/po/mit-krb5.pot +++ b/crypto/krb5/src/po/mit-krb5.pot @@ -6,9 +6,9 @@ #, fuzzy msgid "" msgstr "" -"Project-Id-Version: mit-krb5 1.22.1\n" +"Project-Id-Version: mit-krb5 1.22.2\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2025-08-20 15:43-0400\n" +"POT-Creation-Date: 2026-01-28 19:53-0500\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/crypto/krb5/src/prototype/prototype.c b/crypto/krb5/src/prototype/prototype.c index a9c225f92b0f..ada2a0d8b7ed 100644 --- a/crypto/krb5/src/prototype/prototype.c +++ b/crypto/krb5/src/prototype/prototype.c @@ -1,7 +1,7 @@ /* -*- mode: c; c-basic-offset: 4; indent-tabs-mode: nil -*- */ /* prototype/prototype.c - <<< One-line description of file >>> */ /* - * Copyright (C) 2025 by the Massachusetts Institute of Technology. + * Copyright (C) 2026 by the Massachusetts Institute of Technology. * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/crypto/krb5/src/prototype/prototype.h b/crypto/krb5/src/prototype/prototype.h index 94ab86d5859d..d17862561a6f 100644 --- a/crypto/krb5/src/prototype/prototype.h +++ b/crypto/krb5/src/prototype/prototype.h @@ -1,7 +1,7 @@ /* -*- mode: c; c-basic-offset: 4; indent-tabs-mode: nil -*- */ /* prototype/prototype.h - <<< One-line description of file >>> */ /* - * Copyright (C) 2025 by the Massachusetts Institute of Technology. + * Copyright (C) 2026 by the Massachusetts Institute of Technology. * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/crypto/krb5/src/windows/version.rc b/crypto/krb5/src/windows/version.rc index 491daf417785..8d36ec6c682e 100644 --- a/crypto/krb5/src/windows/version.rc +++ b/crypto/krb5/src/windows/version.rc @@ -41,7 +41,7 @@ #define K5_PRODUCT_VERSION_STRING MAJOR_MINOR MAYBE_PATCH RELTAIL "\0" #define K5_PRODUCT_VERSION KRB5_MAJOR_RELEASE, KRB5_MINOR_RELEASE, KRB5_PATCHLEVEL, KRB5_BUILDLEVEL -#define K5_COPYRIGHT "Copyright (C) 1997-2025 by the Massachusetts Institute of Technology\0" +#define K5_COPYRIGHT "Copyright (C) 1997-2026 by the Massachusetts Institute of Technology\0" #define K5_COMPANY_NAME "Massachusetts Institute of Technology.\0" /* From nobody Thu May 14 19:05:06 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 4gGfsb0ndPz5WqwK for ; Thu, 14 May 2026 19:05:07 +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 "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gGfsZ563yz47F9 for ; Thu, 14 May 2026 19:05:06 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778785506; 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=HJoo3aZLA8p9XE4mkya0nph2/Nlt3GXQ+myNHvxpxg8=; b=DDx827TRMC/W21Gw22gH2bPBznq0tSLQmggIWkHjoSS0Q8x7zCdmuxXdheOTFLC9FKaelj nYQymf7ehu+IkD2WFCdAu0jEADl/wTKuvx2qRFluHmi+tycN3UZJRluUeudC7MssHr350y uV38bS1r2jrSdOjMHxfAgv72h87KBtJ1LOwnmFp/0FkwfbewsFD8gPA/DJNTnJ3ykPS+tI SMRX0etWt0EEMHEPrU02so9otyshVAbQlmUtB4CtqzJ10o9MQLJhecwUOdHhFNhVliFKJk OywRdAjAV2vJBn8SK+7KwhpyDRVnNeIAr6vRORHSEI/mtj43Wxj0IjwgS/l/4g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778785506; a=rsa-sha256; cv=none; b=AMKRK/Y+bNNvjb8XAZUY3siDQ+uyENkPp9e+o2hxjjL054txcuT99IPfH7lTvDau0u8EnY 6/dm5mEfpraqAT4I/RI8NWDLiihqlyKMIxDZfaeJsbkG4X1mUSsCC6wppdOPmtw8e9iB8k RSqUVbZp5zXKwjkyS1FIssXIa/80QK799njrl6l6h52SQFkyKTUnquNCFYX9egjoczz3dM clAVtYhwfSHslRu3knhoNsWujcfs5CPROPQsyH0OAJFpXlPaSpNwTx9Hyjl2A2KScLOXSU 9wjUhGOHz7v/UclMvI+DOpPdW4TNN8OnqqVjOnjg2soSVqb79Shpgm9xh38iPQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778785506; 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=HJoo3aZLA8p9XE4mkya0nph2/Nlt3GXQ+myNHvxpxg8=; b=WGH3PP32Tg6nDf4afuOnBcZ5EgAAmrXQ4iaIGYSaLurhEW1Jzu/Ru4ozk0OMF0+aIRDGlM G1vhkzmZNswiqXvLH8JS70gizH+rlbH9yR+R+yPVELkVA4hCa8ZqcMZH49QVxewghd5+N9 jnxV3/FGwNlDdqnHBjOBW2XGRJqMMQvQcDSSP4Cj6a8XaQA0R6lh3HI5+zTAacspDW/NOS W5bXbeGcr7K5bV29Rct3CnZ4DsfE0Pw4qbQmPt1r6E6Hcdkk8GDR/m2SxcessAh0ttYRLx b9kqFL66HGfRhqufTTyoHmYSPbOA4c0/+shW6GIsivPA/P4UkaX46r8/hh4Waw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gGfsZ4gQpzqnm for ; Thu, 14 May 2026 19:05:06 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 27684 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 14 May 2026 19:05:06 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Mateusz Piotrowski <0mp@FreeBSD.org> From: Colin Percival Subject: git: 628c42a28e76 - releng/15.1 - bsdinstall.8: Document DISTRIBUTIONS defaults correctly 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: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org List-Id: 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: cperciva X-Git-Repository: src X-Git-Refname: refs/heads/releng/15.1 X-Git-Reftype: branch X-Git-Commit: 628c42a28e76e281045c7b3225fbe6b9bb4f1e3b Auto-Submitted: auto-generated Date: Thu, 14 May 2026 19:05:06 +0000 Message-Id: <6a061ce2.27684.56d40927@gitrepo.freebsd.org> The branch releng/15.1 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=628c42a28e76e281045c7b3225fbe6b9bb4f1e3b commit 628c42a28e76e281045c7b3225fbe6b9bb4f1e3b Author: Mateusz Piotrowski <0mp@FreeBSD.org> AuthorDate: 2026-04-20 15:52:25 +0000 Commit: Colin Percival CommitDate: 2026-05-14 19:04:19 +0000 bsdinstall.8: Document DISTRIBUTIONS defaults correctly Some targets override the default value of DISTRIBUTIONS. Document that in the manual page. Approved by: re (cperciva) Reported by: Nia Alarie Reviewed by: jlduran MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D56528 (cherry picked from commit 4029e765436ff1633139c1afe1bc25185a0f4ef1) (cherry picked from commit f4678f7613538c63567e2e44cd5aceaee4b4a383) --- usr.sbin/bsdinstall/bsdinstall.8 | 24 ++++++++++++++++++++++-- 1 file changed, 22 insertions(+), 2 deletions(-) diff --git a/usr.sbin/bsdinstall/bsdinstall.8 b/usr.sbin/bsdinstall/bsdinstall.8 index ee141e1d4296..282b88328e99 100644 --- a/usr.sbin/bsdinstall/bsdinstall.8 +++ b/usr.sbin/bsdinstall/bsdinstall.8 @@ -29,7 +29,7 @@ .\" ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE .\" POSSIBILITY OF SUCH DAMAGE. .\" -.Dd October 3, 2025 +.Dd April 20, 2026 .Dt BSDINSTALL 8 .Os .Sh NAME @@ -79,6 +79,12 @@ targets. .Bl -tag -width "-D file" .It Cm auto Run the standard interactive installation, including disk partitioning. +.Pp +The +.Ev DISTRIBUTIONS +environment variable is set to +.Dq base.txz kernel.txz +by default for this target. .It Cm jail Ar destination Sets up a new chroot system at .Pa destination , @@ -88,12 +94,24 @@ Behavior is generally similar to .Cm auto , except that disk partitioning and network setup are skipped and a kernel is not installed into the new system. +.Pp +The +.Ev DISTRIBUTIONS +environment variable is set to +.Dq base.txz +by default for this target. .It Cm script Ar script Runs the installation script at .Pa script . See .Sx SCRIPTING for more information on this target. +.Pp +The +.Ev DISTRIBUTIONS +environment variable is set to +.Dq base.txz kernel.txz +by default for this target. .It Cm keymap If the current controlling TTY is a .Xr syscons 4 @@ -305,7 +323,9 @@ Default: .Dq Pa /tmp .It Ev DISTRIBUTIONS The set of distributions to install, e.g., "base.txz kernel.txz ports.txz". -Default: unset +Default: unset unless noted otherwise in the +.Sx TARGETS +section. .It Ev PARTITIONS The partitioning of the disk onto which the system is being installed. See From nobody Thu May 14 19:05:07 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 4gGfsb6ylcz5WqwV for ; Thu, 14 May 2026 19:05:07 +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 "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gGfsb60dRz47Xf for ; Thu, 14 May 2026 19:05:07 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778785507; 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=JRJV+TT96T8kLszzKN6Nd9fBRf1d+fzYUA9nK0L9ncc=; b=kp/wkL0MZaux2N9lQ/5WtTtNsmQSEGGGE1nQa53Wo3wad75ySW1Ruczd2+FvYTHP15ZJkb C8BPM25Lb1XiXuJA6H6/LfcAQ8syIfG5Vhf6z02WeK06TMkBRVkRiCpBFyeNapI/0taUvp 1mBzjn4orqanlRtX8hFUMpccvjcw1/1W1MMgIeiqhaNiD9XpCf2G31F7wWkZvrwSsbNydU XTXCWHZSr8y1UTz2V3cRT13RKdO9NHqgdRaOxv27rpyLcaVks5M1hjoX5YMVc1Y2BAsz3K aHfcsiwnGvMkWd7msz3WzmU18jWY4KNvgfFjN2KIKmB/HF1C6v4cgzkj4JcEFA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778785507; a=rsa-sha256; cv=none; b=n6RtsC/DmOHaldhtw1FnIh2E6/ovitTKHXUow6AQGoCzFwxfrSTntBsB/i5qFF6r/5slMl +mjUBU7xdZYWrKCZWRv2UKPQyQYxY6Rl1LA9LzMI8boK6RDw3RQE4k2wA3+8mt7fMLyuP7 RCG/NL8pcmVrUzqC2Nz1KLnZ3Qn7fGY6xVO27Uywsq/VNGRLBVzWwUIO/aq8lOlcFyO+uj p+5XS1jjnemdkpyru7xCit55qhVw1V1jktzfFJpXGT8t2IhxjKZPi/64cePS/9gAsVokfC kdktxHouRS+pqDH35of4aqDmruYCkKdL1mOorljXsTDbiiTkpWZFDLzLt2aPtQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778785507; 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=JRJV+TT96T8kLszzKN6Nd9fBRf1d+fzYUA9nK0L9ncc=; b=R56xXJvPQXmiRGCgSDEB6thfZARYtgo61Nwht/89jPzx6sa/apIjBop5aTzVpKWfCvlu1O KAVnqx3kL2lPUQhfN3vS1BOeC0i/iiIhbLejE1jOzTsPY2VPhpuhyaN9BOhrZtMdRcyNhM 3NI/lejXm77Aubu0qWm4vMFRtu5KI7Odmx+fJs+zQ3O0LUkXTpXutLpXVGfvOA2Ta6tnER sS0rvOG9i6RsxRBqorwY7XlMOyer9A41Ov8zKdpOHYSfuw5bJJwQc3zfSlF9Fz04OGq/Tl xGzmfXb7Wataj5ZSrExgwwFhqnt9IkjDdbQmaHEvKH6y+9myzRy4vpOhBZC4LQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gGfsb5KC3zqrB for ; Thu, 14 May 2026 19:05:07 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 25cda by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 14 May 2026 19:05:07 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Alan Somers From: Colin Percival Subject: git: cb7880bb0900 - releng/15.1 - bsdinstall: do pkgbase installations with the "script" command 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: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org List-Id: 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: cperciva X-Git-Repository: src X-Git-Refname: refs/heads/releng/15.1 X-Git-Reftype: branch X-Git-Commit: cb7880bb09009c977d3fb70a66b0f57f9fbe83ed Auto-Submitted: auto-generated Date: Thu, 14 May 2026 19:05:07 +0000 Message-Id: <6a061ce3.25cda.7c9c4d16@gitrepo.freebsd.org> The branch releng/15.1 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=cb7880bb09009c977d3fb70a66b0f57f9fbe83ed commit cb7880bb09009c977d3fb70a66b0f57f9fbe83ed Author: Alan Somers AuthorDate: 2026-04-28 17:27:17 +0000 Commit: Colin Percival CommitDate: 2026-05-14 19:04:21 +0000 bsdinstall: do pkgbase installations with the "script" command "bsdinstall script" will now do a pkgbase installation by default. The system components to install can be specified in the COMPONENTS variable, and have the same names as those used in the interactive installer. bsdinstall will still do a legacy distset installation if DISTRIBUTIONS is defined in the installerconfig file. Approved by: re (cperciva) PR: 290375 Sponsored by: ConnectWise Reviewed by: ziaee, ivy, jduran Differential Revision: https://reviews.freebsd.org/D56717 (cherry picked from commit dc14ae4217a0babb1240f813b642edc2d7b955a6) (cherry picked from commit 1f5869130f6ebd299e65a627eff23a8c3d360afb) --- UPDATING | 5 +++ usr.sbin/bsdinstall/bsdinstall.8 | 45 ++++++++++++++++----- usr.sbin/bsdinstall/scripts/pkgbase.in | 15 ++++++- usr.sbin/bsdinstall/scripts/script | 71 ++++++++++++++++++++-------------- 4 files changed, 95 insertions(+), 41 deletions(-) diff --git a/UPDATING b/UPDATING index 034dabc4da81..137d2aa78e6c 100644 --- a/UPDATING +++ b/UPDATING @@ -12,6 +12,11 @@ Items affecting the ports and packages system can be found in /usr/ports/UPDATING. Please read that file before updating system packages and/or ports. +20260512: + "bsdinstall script" will now do a pkgbase installation by default. To + revert to the legacy distset installation, set "DISTRIBUTIONS" in + your installerconfig. + 20260422: Bump __FreeBSD_version to 1500508 for LinuxKPI after merges of changes to eventfd and changes for DRM 6.11, as well as diff --git a/usr.sbin/bsdinstall/bsdinstall.8 b/usr.sbin/bsdinstall/bsdinstall.8 index 282b88328e99..a35c8f56ada7 100644 --- a/usr.sbin/bsdinstall/bsdinstall.8 +++ b/usr.sbin/bsdinstall/bsdinstall.8 @@ -29,7 +29,7 @@ .\" ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE .\" POSSIBILITY OF SUCH DAMAGE. .\" -.Dd April 20, 2026 +.Dd May 12, 2026 .Dt BSDINSTALL 8 .Os .Sh NAME @@ -109,9 +109,12 @@ for more information on this target. .Pp The .Ev DISTRIBUTIONS -environment variable is set to -.Dq base.txz kernel.txz -by default for this target. +environment variable is unset by default for this target. +Instead, the +.Ev COMPONENTS +environment variable is effectively set to +.Dq base kernel kernel-dbg +for this target. .It Cm keymap If the current controlling TTY is a .Xr syscons 4 @@ -321,8 +324,17 @@ overridden when making scripted or customized installers. The directory to use for temporary files. Default: .Dq Pa /tmp +.It Ev COMPONENTS +The set of components to install for scripted installations using +base system packages, e.g., +.Dq base lib32 kernel-dbg tests . +Default: "base kernel-dbg" .It Ev DISTRIBUTIONS -The set of distributions to install, e.g., "base.txz kernel.txz ports.txz". +The set of distributions to install for traditional installations, e.g., +.Dq base.txz kernel.txz ports.txz . +If unset, then +.Nm +will install using base system packages. Default: unset unless noted otherwise in the .Sx TARGETS section. @@ -609,18 +621,18 @@ A typical bsdinstall script, using the default filesystem layout and the UFS filesystem, looks like this: .Bd -literal -offset indent PARTITIONS=DEFAULT -DISTRIBUTIONS="kernel.txz base.txz" +COMPONENTS="base debug" #!/bin/sh sysrc ifconfig_DEFAULT=DHCP sysrc sshd_enable=YES -pkg install puppet +pkg install -y puppet .Ed .Pp For a scripted installation involving a ZFS pool spanning multiple disks, the script instead looks like this: .Bd -literal -offset indent -DISTRIBUTIONS="kernel.txz base.txz" +COMPONENTS="base debug" export ZFSBOOT_VDEV_TYPE=stripe export ZFSBOOT_DISKS="ada0 ada1" export nonInteractive="YES" @@ -628,7 +640,20 @@ export nonInteractive="YES" #!/bin/sh echo "ifconfig_DEFAULT=DHCP" >> /etc/rc.conf echo "sshd_enable=YES" >> /etc/rc.conf -pkg install puppet +pkg install -y puppet +.Ed +.Pp +To install using traditional distributions sets instead of packages, set +.Ev DISTRIBUTIONS +to the list of distribution sets to install, like this: +.Bd -literal -offset indent +PARTITIONS=DEFAULT +DISTRIBUTIONS="kernel.txz base.txz" + +#!/bin/sh +sysrc ifconfig_DEFAULT=DHCP +sysrc sshd_enable=YES +pkg install -y puppet .Ed .Pp On @@ -653,7 +678,7 @@ arbitrary commands can be run here to extend the installer. In addition to the variables in .Sx ENVIRONMENT VARIABLES , in particular -.Ev DISTRIBUTIONS , +.Ev COMPONENTS , the preamble can contain a variable .Ev PARTITIONS which is passed to the diff --git a/usr.sbin/bsdinstall/scripts/pkgbase.in b/usr.sbin/bsdinstall/scripts/pkgbase.in index 89ddc244171e..2c7d6bcae904 100755 --- a/usr.sbin/bsdinstall/scripts/pkgbase.in +++ b/usr.sbin/bsdinstall/scripts/pkgbase.in @@ -180,7 +180,18 @@ local function select_components(components, options) } append_list(bsddialog_args, checklist_items) - local exit_code, output = bsddialog(bsddialog_args) + local exit_code = 0 + local output = "" + if options.non_interactive then + local env_components = os.getenv("COMPONENTS") + if env_components then + output = env_components:gsub(" ", "\n") + else + output = "base\nkernel-dbg" + end + else + exit_code, output = bsddialog(bsddialog_args) + end -- This should only be possible if bsddialog is killed by a signal -- or buggy, we disable the cancel option and esc key. -- If this does happen, there's not much we can do except exit with a @@ -300,6 +311,8 @@ local function parse_options() for _, a in ipairs(arg) do if a == "--jail" then options.jail = true + elseif a == "--non-interactive" then + options.non_interactive = true else io.stderr:write("Error: unknown option " .. a .. "\n") os.exit(1) diff --git a/usr.sbin/bsdinstall/scripts/script b/usr.sbin/bsdinstall/scripts/script index 21da2ea7c366..93d07c7899c3 100755 --- a/usr.sbin/bsdinstall/scripts/script +++ b/usr.sbin/bsdinstall/scripts/script @@ -40,6 +40,7 @@ f_include $BSDCFG_SHARE/variable.subr # PARTITIONS # DISTRIBUTIONS # BSDINSTALL_DISTDIR +# COMPONENTS # # Default name of the ZFS boot-pool @@ -97,7 +98,6 @@ awk 'BEGIN {pathb=ARGV[2]; ARGV[2]=""} /^#!/{b=1} { >$TMPDIR/bsdinstall-installscript-preamble . $TMPDIR/bsdinstall-installscript-preamble -: ${DISTRIBUTIONS="kernel.txz base.txz"}; export DISTRIBUTIONS export BSDINSTALL_DISTDIR # Re-initialize a new log if preamble changed BSDINSTALL_LOG @@ -118,37 +118,48 @@ else fi bsdinstall mount -# Fetch missing distribution files, if any -exec 5>&1 -export BSDINSTALL_DISTDIR=$(`dirname $0`/fetchmissingdists 2>&1 1>&5) -FETCH_RESULT=$? -exec 5>&- +if [ -n "$COMPONENTS" -a -n "$DISTRIBUTIONS" ]; then + error "Cannot set both COMPONENTS and DISTRIBUTIONS" +elif [ -z "$DISTRIBUTIONS" ]; then + # If COMPONENTS is set, or neither is, install with pkgbase + bsdinstall pkgbase --non-interactive +else + # Otherwise, unpack distsets -[ $FETCH_RESULT -ne 0 ] && error "Could not fetch remote distributions" + # Fetch missing distribution files, if any + exec 5>&1 + export BSDINSTALL_DISTDIR=$(`dirname $0`/fetchmissingdists 2>&1 1>&5) + FETCH_RESULT=$? + exec 5>&- -# Unpack distributions -bsdinstall checksum -if [ -t 0 ]; then - # If install is a tty, use distextract as normal - bsdinstall distextract -else - # Otherwise, we need to use tar (see https://reviews.freebsd.org/D10736) - for set in $DISTRIBUTIONS; do - f_dprintf "Extracting $BSDINSTALL_DISTDIR/$set" - # XXX: The below fails if any mountpoints are FAT, due to - # inability to set ctime/mtime on the root of FAT partitions, - # which is needed to support e.g. EFI system partitions. tar has - # no option to ignore this (distextract ignores them internally - # through a hack), and returns 1 on any warning or error, - # effectively turning all warnings into fatal errors. - # - # Work around this in an extremely lame way for the specific - # case of EFI system partitions only. This *ONLY WORKS* if - # /boot/efi is empty and does not handle analogous problems on - # other systems (ARM, PPC64). - tar -xf "$BSDINSTALL_DISTDIR/$set" -C $BSDINSTALL_CHROOT --exclude boot/efi - mkdir -p $BSDINSTALL_CHROOT/boot/efi - done + [ $FETCH_RESULT -ne 0 ] && error "Could not fetch remote distributions" + + bsdinstall checksum + if [ -t 0 ]; then + # If install is a tty, use distextract as normal + bsdinstall distextract + else + # Otherwise, we need to use tar (see + # https://reviews.freebsd.org/D10736) + for set in $DISTRIBUTIONS; do + f_dprintf "Extracting $BSDINSTALL_DISTDIR/$set" + # XXX: The below fails if any mountpoints are FAT, due + # to inability to set ctime/mtime on the root of FAT + # partitions, which is needed to support e.g. EFI + # system partitions. tar has no option to ignore this + # (distextract ignores them internally through a hack), + # and returns 1 on any warning or error, effectively + # turning all warnings into fatal errors. + # + # Work around this in an extremely lame way for the + # specific case of EFI system partitions only. This + # *ONLY WORKS* if /boot/efi is empty and does not + # handle analogous problems on other systems (ARM, + # PPC64). + tar -xf "$BSDINSTALL_DISTDIR/$set" -C $BSDINSTALL_CHROOT --exclude boot/efi + mkdir -p $BSDINSTALL_CHROOT/boot/efi + done + fi fi # Configure bootloader if needed From nobody Thu May 14 19:05:08 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 4gGfsd24rfz5WqwW for ; Thu, 14 May 2026 19:05:09 +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 "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gGfsc6bv8z47Xr for ; Thu, 14 May 2026 19:05:08 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778785509; 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=Y/k/LgJDLCHERGJvUtjrejjxMV0DD+ShDWRGuYdi2a4=; b=HHjzIcX/+QujU6qAEQ5r/HQTOEG7s6dKpoBB1piJFroKbw3J9XE/2rq1B0G6VTuwKqIfUq FFXbMYNYccoruV8SNAVv4t1R7Sx4KPu9Rf9/qPIuTLhi5gyL1qSRj0K1XN8BnH6EQaTNs4 WLkLYgeD+2Oafq2OWbEdHNNZeuwUc+xu8gKHdCQ5sYgKIxKuknqUFIBIMFnWsCd16ClSQX 733YIbwvk4nJ5Z4lsMEG5Oa5IhO67EAfeGpeyO2HM/IEwyTDhHGNFPTYtFHEbGLKbpDGh8 Zo0owctaqAcj5gu8Q8sFlY0PcODvvZBNINDym+AIW3WcsDPPS1kjQny2sHiavA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778785509; a=rsa-sha256; cv=none; b=AlqSymfBQIQarZi0LO/3WRI6IGhfPE08GI52VBBCjalip8zjitxsjB3Cu78SiBuiROMWEy nU0RucPLR9g07/BGTOCZlxpp9XzAg2gIVqKlA69Re2yYNTraW3Y0HamvfXys88bSN07sOs epmNTnFEj+I9IQNepuTedBndV1QIb026UQn+3P0QVBaqgFy/CAE7kYllVQBjybi1Z/tJI1 wEoaFRjWQSq30m6n8VJo786Y3GUfpRn/jRqzLjXzBOAw6EjXtJFUH13yG1tXjmINR2pS6l QQUAv+wr1IpjwhLD1cIfvB8sqUcYdNfb51PTtaStuNZXWiRJ+hsrtzoboMuUbg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778785509; 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=Y/k/LgJDLCHERGJvUtjrejjxMV0DD+ShDWRGuYdi2a4=; b=YzzcHYslaoXXAlIQgNa0Ha/jv85/oTu0jG4iRXOY3P0CoVNFM/pqrIo8AkYqoJqA+WNtXH XQdopFipBMU7bkap6nB2bGLL3y2L/imjpb8tD9mM1dJ5fXi/jU9MBO3PYvBqH58EvDdLkl vSTvAOqOPFhZ/HdMeaGLiFZRxt+208WkcqIJ1kiTGILECDpL8WksMEDTIyFhW8UCV9Gqu5 P68AgeKnNnx1wsv0HrPTQJnW9eiXLNY0maB5Kj459S1FUTIXtORZdYpHKPLcjDPfe8Sg7+ pbYB9GJDc5oK23WYrGfgen06LcTx1Z9SkyBzwxTPoubQ5CQbUpuT2wt2zWfjhw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gGfsc5rKyzqnp for ; Thu, 14 May 2026 19:05:08 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 26e0e by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 14 May 2026 19:05:08 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Konstantin Belousov From: Colin Percival Subject: git: 8484cb490a7d - releng/15.1 - fdescfs: do not change vnode type on VOP_GETATTR() 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: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org List-Id: 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: cperciva X-Git-Repository: src X-Git-Refname: refs/heads/releng/15.1 X-Git-Reftype: branch X-Git-Commit: 8484cb490a7dafe3f5509c40fbb4d660665ac8b9 Auto-Submitted: auto-generated Date: Thu, 14 May 2026 19:05:08 +0000 Message-Id: <6a061ce4.26e0e.14edadbf@gitrepo.freebsd.org> The branch releng/15.1 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=8484cb490a7dafe3f5509c40fbb4d660665ac8b9 commit 8484cb490a7dafe3f5509c40fbb4d660665ac8b9 Author: Konstantin Belousov AuthorDate: 2026-05-03 19:09:15 +0000 Commit: Colin Percival CommitDate: 2026-05-14 19:04:22 +0000 fdescfs: do not change vnode type on VOP_GETATTR() Approved by: re (cperciva) PR: 294768 (cherry picked from commit fbecfc4aa028964f972a0457809aa041d415f61b) (cherry picked from commit 5af938fb03d004ef97621f4c9319446f2fb8f77c) --- sys/fs/fdescfs/fdesc_vnops.c | 1 - 1 file changed, 1 deletion(-) diff --git a/sys/fs/fdescfs/fdesc_vnops.c b/sys/fs/fdescfs/fdesc_vnops.c index 58a22b8bdc50..05630ef5e48c 100644 --- a/sys/fs/fdescfs/fdesc_vnops.c +++ b/sys/fs/fdescfs/fdesc_vnops.c @@ -469,7 +469,6 @@ fdesc_getattr(struct vop_getattr_args *ap) break; } - vp->v_type = vap->va_type; return (0); } From nobody Thu May 14 19:05:09 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 4gGfsf2HYsz5WrTb for ; Thu, 14 May 2026 19:05:10 +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 "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gGfsf0Kzxz47Kv for ; Thu, 14 May 2026 19:05:10 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778785510; 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=ptj2KUnI1m9z6rQ1DfxFdUO0EramDQSMZwHZTByhCDM=; b=V29vhE0H97wJpdkL3doyw7740sKMxDVbWaj2iuUWgK2XUcWYrBZFa5HhfSaPex9cOS+1XN BObnQYMyah8AMkZ/TLORzT8qm68DCY6V+8EayZ8BWFPfGJImwQpUYAXgoFINO1QLHc6myb HQuhmohg/43dqZfHEK4+yWbjQLZCLdqiRh494ZouMka39XWIDW0EJRVnM7zAipf0IsWgGQ QMmKcN/tMwDciGxeweBCHaihoW/u6LUqMURZt0UObbsHdFiwwSR9xTsVyJ7lG0krnDLMSn 3RukeQgAOE7Jof21oiBPYAmmTVxjH+eorIOFUCofPGYnUe5/Nk7NRh/UJ2I/Ag== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778785510; a=rsa-sha256; cv=none; b=Jkh8gBC1pwMq1rml+bd+9hGA0lwRe3lMfs/6NJhTivMvjGyErL9kpMWjAgvRep12h5/F76 AwV6xjaR/ocjo58GAmJoqFiVdwC5XpBC/AsyqJLyI/Hh/nIM9ORegKp32KwP0+icohquG1 sANfcDPHZH5r8URV2TfqEPVxu2/tlgAyrlUf3A+kOuAR5rMUXG8nhRthzz5vqyjqDN2OIL zaknPTOfTkjM4b+zAviB+SFjW62NqQs3sI7RHY9JeOAyQoumSev09sE0EwGz7C5xjXPkyb ac1kwtJjx63BtTUSVdj6yek5VWAU5a+CKKTUqZBkGDN2T/50YkVR/rug5gQk5g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778785510; 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=ptj2KUnI1m9z6rQ1DfxFdUO0EramDQSMZwHZTByhCDM=; b=k8cDpCXWNJwrVADRiSWXikqacqyHABrImlcu+7AVWL2y+tQGRnd53vgDAtpytaKy2sCI0J 4JZlnOu3dAFpA8TSH+PTbTi5GowUg2dSOikeRwYCoOgQWUTIaTMSSB1TXzSIOK1M+wAe9P 8kc4iSmJA8jITHJdcHA92Q4okf5RRpvrSo/wJgFeBkGGamii11c2Fuey1gazOlo7uVq8XN HaDdiOqERio675o5RPEikiuj1bArp6qVO58gYtwQxVGOpplEGRXFDHh/M55SPZ4SIo/Qmo Cx7XG9fmW+E0V5b5lZy5m2ECyrnzgpv6QjZHVkv6aKTH00JcBhSjfkEpuLNaVQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gGfsd6jKwzqrC for ; Thu, 14 May 2026 19:05:09 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 26732 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 14 May 2026 19:05:09 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Dave Cottlehuber From: Colin Percival Subject: git: 5457f05b201f - releng/15.1 - release/tools: use same pkg settings in containers as in /etc/pkg/FreeBSD.conf 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: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org List-Id: 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: cperciva X-Git-Repository: src X-Git-Refname: refs/heads/releng/15.1 X-Git-Reftype: branch X-Git-Commit: 5457f05b201f6f5aa0bf9a8739096a3c0ac037d4 Auto-Submitted: auto-generated Date: Thu, 14 May 2026 19:05:09 +0000 Message-Id: <6a061ce5.26732.4488118b@gitrepo.freebsd.org> The branch releng/15.1 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=5457f05b201f6f5aa0bf9a8739096a3c0ac037d4 commit 5457f05b201f6f5aa0bf9a8739096a3c0ac037d4 Author: Dave Cottlehuber AuthorDate: 2026-01-27 22:51:22 +0000 Commit: Colin Percival CommitDate: 2026-05-14 19:04:23 +0000 release/tools: use same pkg settings in containers as in /etc/pkg/FreeBSD.conf Instructions in /etc/pkg/FreeBSD.conf and elsewhere recommend putting changes in /usr/local/etc/pkg/repos/FreeBSD.conf so bring OCI containers into line as well. Reviewed by: dfr, ivy Differential Revision: https://reviews.freebsd.org/D54090 Approved by: re (cperciva) MFC after: 5 days Sponsored by: SkunkWerks, GmbH (cherry picked from commit c73ae67348998a0056145e88debbea9ff6860c4f) (cherry picked from commit d889f6c466d4cec73c34bc71093d08b25e321071) --- release/tools/oci-image-static.conf | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/release/tools/oci-image-static.conf b/release/tools/oci-image-static.conf index 8e642d9defce..e2231d951268 100644 --- a/release/tools/oci-image-static.conf +++ b/release/tools/oci-image-static.conf @@ -36,12 +36,8 @@ oci_image_build() { ;; esac mkdir -p $m/usr/local/etc/pkg/repos - cat > $m/usr/local/etc/pkg/repos/base.conf < $m/usr/local/etc/pkg/repos/FreeBSD.conf <; Thu, 14 May 2026 19:05:11 +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 "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gGfsg0lRWz47T6 for ; Thu, 14 May 2026 19:05:11 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778785511; 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=4qVi7sjZl48FPtdC3NF+wkTUUae2ZeMQSuvD6t4MIAI=; b=CnftHR7Xm6a/o7RFSg/w4/Ip1aWsFPe+vYs7be8nRkL6ikx2SY1vPoUsKHCYSyiD10k09p 7Ikkkb67dHTOUitDKP2Q9b471CqHHRfdqHRQFb3k8ZFvgciYLfU7dnEEPhkbudvQOVPyNB PZtp1gbo9GhKJfNuwewE5TCS1rjqARQhBh0qGT2h11dXVp0562Q2S/dZUxuym1pjv+yF8Z pJPOblFL9/j+vcJVvaTrYAJabTt5bfY6BTI4SVdjjSMxs/sA5PpxfBIQHAtPzszmF3FU9I VqbR05OEt++j2VPOShmxVfFvIIkU/HRj8nJq0BkcyFK2tqvA/UYT0ghplkm9kw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778785511; a=rsa-sha256; cv=none; b=dm9I0YMGrYr1+T7EJBwK+4IC6ockaoB4gU6Iwcu+dDPbiabzt8Z3GrprwoXOWjX1fYnCmy mZffDNaYgeyISg1fWTPHb2+iOGISQ9evpqjnqk5bA0G7dfapk3myvCPft5zfuovnXyTjho upk2kF7RleKn9q6j4F3pZ2MaMAK50CyZVzSYAEEFd/PexFxYICf9Hbc+rEhAVDYdBlj6Qp DzHmG9IYgqF9ds2Xrm1n7Ikrym1oNYB36amBxBj02Fhmle8ZlcTCexfP4tJRG7qRl5mFaS mFsu2jeMMjsYzu0uO3g3+JudWmsZ4O1ebMUHV6OWKD+TvPPxhLu8S2s7BvDfuQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778785511; 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=4qVi7sjZl48FPtdC3NF+wkTUUae2ZeMQSuvD6t4MIAI=; b=eTI7ZvymJ/4yEttZ4VxQPQMomKUcGviZXGR1i7yB38mOvPF31yKviMyzSTRdCPQUOxq1dD VeaG+WgGSG4jXQEe7HI5kFyEIS+MEEtRWUxTJBidnn6RpUUSLjAv1bLNJ1Lsv2DMggvyGG +MMUrOQqYpFoDQUM5fcGU9mcnSCuaJ9P0AFBvPFQtnDJzLCO6GwM3X9dIh2IWAeHSaWfOK vxp1s6NGwAmNxchOVbEQ8VDJDclCOUfQ2w4tnCyTdRO80hktf/uaVyPNv53w7rwRAEDKMk N9tidQeyugUrnKFAn8riCALg03bZ6PY7weuipch9U5KKnTq/g89o4uYCuYHYnw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gGfsg0J94zr2M for ; Thu, 14 May 2026 19:05:11 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 257cc by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 14 May 2026 19:05:11 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Colin Percival Subject: git: 8c8ec2cdc9a9 - releng/15.1 - pkg-stage.sh: Add ext2 and ntfs 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: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org List-Id: 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: cperciva X-Git-Repository: src X-Git-Refname: refs/heads/releng/15.1 X-Git-Reftype: branch X-Git-Commit: 8c8ec2cdc9a9cfa44ecb98a387f426faa1c9f055 Auto-Submitted: auto-generated Date: Thu, 14 May 2026 19:05:11 +0000 Message-Id: <6a061ce7.257cc.5fc5391c@gitrepo.freebsd.org> The branch releng/15.1 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=8c8ec2cdc9a9cfa44ecb98a387f426faa1c9f055 commit 8c8ec2cdc9a9cfa44ecb98a387f426faa1c9f055 Author: Colin Percival AuthorDate: 2026-02-22 00:38:01 +0000 Commit: Colin Percival CommitDate: 2026-05-14 19:04:25 +0000 pkg-stage.sh: Add ext2 and ntfs Having these packages available on release media may help users who need to sneakernet other packages (e.g. firmware) from systems running Linux or Windows. Approved by: re (cperciva) Suggested by: vladlen, ziaee MFC after: 3 days (cherry picked from commit 6881fd278d80ac63b4d511fc130a79ff16d1bb48) (cherry picked from commit 01d5910b8766671afdbd9e274fd62b397aca9e1a) --- release/scripts/pkg-stage.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/release/scripts/pkg-stage.sh b/release/scripts/pkg-stage.sh index 6c9f176cce6a..823c369f011f 100755 --- a/release/scripts/pkg-stage.sh +++ b/release/scripts/pkg-stage.sh @@ -16,6 +16,8 @@ comms/usbmuxd devel/git@lite editors/emacs@nox editors/vim +filesystems/ext2 +filesystems/ntfs misc/freebsd-doc-all net/mpd5 net/rsync From nobody Thu May 14 19:05:12 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 4gGfsh4KMwz5Wr1x for ; Thu, 14 May 2026 19:05:12 +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 "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gGfsh1b95z47dt for ; Thu, 14 May 2026 19:05:12 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778785512; 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=6BxkH8yyHsJBlSglF/6hP7gVHcO1Bk6K7i6tBigN/Jk=; b=vAR/l9sV+BKKlmRIRDmk1k+X4HcY4Xpz3N+0c7bIpYE53eAIHhBi0G0lwrI/w2CmnCA9bG fQc/By1z/swpVpdxAQTsfPYdTTy17v22LpZ5fCxwVvKRivMwHiEgmG2IuPAT+TWjMwfy+N ZQkJtCyLUoT2LDAQTTsK+oQdJ/76DHygNDJe12ahjuxO9acZHg8JKsXuw5fViIlwUS9QG8 fGnBMtdaYdxTkecKsjf7h1DIn+ylsTkBj5St1+7x54oO27FpF2kHcU37PFrIp4x91xyfHU u50nPfKo6367Clt50jXU4YxSYioHSHW7+yD6J0932UNWRPXSNn3BHA0Psctxaw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778785512; a=rsa-sha256; cv=none; b=YOnh2FH0CeSxKEQbF5HG/K9iKuSSKb6jYAJ3XY2FZ6o1q4b7VeqGV1S45wzu3HChJvn/+Y G4e2VPgJpLsqQ6qSBDRRHGiiC/Ad62h4bXCmOGOINkP4DuDeo5DWPZnPvw9rA1KMuS0ana qR/Z/jkVlSTsrU+UgX3qm07meH5tJPLstGIPhoXmpLIGklBagwr7chBt2Y12yERh4Oo6IF d6+ILpkXhtg2qfS3HXgNJvkFMnkmo7OzQYSPN6awg1Hl+5aX5RBrN5lst9ZnBl+Qo1GD7+ x2gLLJGFqTgIqhgZpKw6pUKP4v6hQ6oFA9BmJsugQ3iz0yCUMfom8DOh9IrT8Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778785512; 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=6BxkH8yyHsJBlSglF/6hP7gVHcO1Bk6K7i6tBigN/Jk=; b=l2LUTEPKe0ydJWFjI/NH5Xo8k7E1NBw6YIUTjaGbrf/kl6nbQEopvzEgATcDMwmutqthtg yMIWGiSqWxhk6NJCZffB7XNBL78N25qWHvzw9G6NizUq9Ss3DcNtEPYMzi7w70HzB9ABON YPOTIRSTqSiUoCIvbdxQFyg64MYEpedlGyr0HY+5rXbMWRRhbBUUQAPiaZiWm90V1oSO9h P+rCrDDrI1czn6Rd7u5VAOdsIxX6UBjmlZU0v4ZUnUQXZO2PD4m8pktVf3dw3fmEVK1d2Q MaaGqy2SZ5Ryw2L46E0W6f3Bj6XkMIw+J7TZcZUaEbWRZYMev7YsvA0F8uhhgQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gGfsh14vxzr2P for ; Thu, 14 May 2026 19:05:12 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 2555b by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 14 May 2026 19:05:12 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Alan Somers From: Colin Percival Subject: git: 39fcfcc64bba - releng/15.1 - Fix LOCAL_PEERCRED in 32-bit compat mode 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: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org List-Id: 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: cperciva X-Git-Repository: src X-Git-Refname: refs/heads/releng/15.1 X-Git-Reftype: branch X-Git-Commit: 39fcfcc64bbae6ff8792c8598c6147e3c63b60c1 Auto-Submitted: auto-generated Date: Thu, 14 May 2026 19:05:12 +0000 Message-Id: <6a061ce8.2555b.4afcf4e8@gitrepo.freebsd.org> The branch releng/15.1 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=39fcfcc64bbae6ff8792c8598c6147e3c63b60c1 commit 39fcfcc64bbae6ff8792c8598c6147e3c63b60c1 Author: Alan Somers AuthorDate: 2026-04-27 23:46:53 +0000 Commit: Colin Percival CommitDate: 2026-05-14 19:04:38 +0000 Fix LOCAL_PEERCRED in 32-bit compat mode Previously the cr_pid field would be incorrectly copied to userland, due to a size mismatch between the structure as defined in 32-bit vs 64-bit builds. Fix it by converting the structure before copying it to userland. Approved by: re (cperciva) PR: 294833 Sponsored by: ConnectWise Reviewed by: emaste Differential Revision: https://reviews.freebsd.org/D56675 (cherry picked from commit 1d24638d3e8875e4b99a4b5e39f4241e37221b3d) (cherry picked from commit 3298d82ea34059354dc1ff1a60d8b7d3e495c2cd) --- sys/kern/uipc_usrreq.c | 21 +++++++++++++++++++-- sys/sys/ucred.h | 11 +++++++++++ 2 files changed, 30 insertions(+), 2 deletions(-) diff --git a/sys/kern/uipc_usrreq.c b/sys/kern/uipc_usrreq.c index 44d0185e9d1c..8e8261c9644e 100644 --- a/sys/kern/uipc_usrreq.c +++ b/sys/kern/uipc_usrreq.c @@ -83,6 +83,7 @@ #include #include #include +#include #include #include #include @@ -2755,8 +2756,24 @@ uipc_ctloutput(struct socket *so, struct sockopt *sopt) error = EINVAL; } UNP_PCB_UNLOCK(unp); - if (error == 0) - error = sooptcopyout(sopt, &xu, sizeof(xu)); + if (error != 0) + break; +#ifdef COMPAT_FREEBSD32 + if (SV_PROC_FLAG(sopt->sopt_td->td_proc, SV_ILP32)) { + struct xucred32 xu32 = {}; + int i; + + xu32.cr_version = xu.cr_version; + xu32.cr_uid = xu.cr_uid; + xu32.cr_ngroups = xu.cr_ngroups; + for (i = 0; i < XU_NGROUPS; i++) + xu32.cr_groups[i] = xu.cr_groups[i]; + xu32.cr_pid = xu.cr_pid; + error = sooptcopyout(sopt, &xu32, sizeof(xu32)); + break; + } +#endif + error = sooptcopyout(sopt, &xu, sizeof(xu)); break; case LOCAL_CREDS: diff --git a/sys/sys/ucred.h b/sys/sys/ucred.h index ba241cf9ff3a..4bf48a5e4b87 100644 --- a/sys/sys/ucred.h +++ b/sys/sys/ucred.h @@ -193,6 +193,17 @@ struct setcred32 { uint32_t sc_label; /* struct mac32 [*] */ }; +#ifdef COMPAT_FREEBSD32 +/* 32-bit compatible version of xucred */ +struct xucred32 { + u_int cr_version; /* structure layout version */ + uid_t cr_uid; /* effective user id */ + short cr_ngroups; /* number of groups (incl. cr_gid). */ + gid_t cr_groups[XU_NGROUPS]; /* groups */ + pid_t cr_pid; +}; +#endif + struct thread; /* Common native and 32-bit compatibility entry point. */ From nobody Thu May 14 19:05:13 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 4gGfsj5Qs2z5WqtM for ; Thu, 14 May 2026 19:05:13 +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 "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gGfsj2l1Gz47bj for ; Thu, 14 May 2026 19:05:13 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778785513; 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=jnbRur8/I1bR/BDntt9muU0uOtKNbuy0sZVAyqijNgk=; b=D1oSP0eVqDuTwDZrD50dBkaEHuZlwZ0PY35g7ZOfLc8JyjnS+/YE3igPnBlmzKQYRtZGv1 JrjoItaj8X6Fe7eoqoPyKuh01Z7LOPb1C8WF4O4V+b9VWeiVW101DiJZ4S/6D6SrdQop1/ J1g9o25I8mLzgFVAEiQtMnZbh+uCyDFxrSayzjGH5ZeqrxiMNe+L8tDLeOPDEI3vgqhH46 9l5AAcFSqw3IvS4YglvBql/hNNIAIC+feOxWj4b2A17pgz1dy0VJ8e+7PeLzGgW16u8HJT S7FYw4IW9ZR4GEQt4oBwZcmv2COtmwYb00H/2/Y8CfFPxG3QO51zX8PdLVH30w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778785513; a=rsa-sha256; cv=none; b=se/Jt0bbyIeuD84ZZHojgUIGcuYxnoUhWii5qCuUWb1b4mRRC4L6Y/ouTmynLz72oHavzg zYAi7pySKoGYFet6FhlGNfb7kSBB9bPQr/ORtwO/Zpoy3hBPr5VJ1WmQ5utQuj5Dh5AAC4 wrjf+FxGFbVZ/IytoYkczuGjCzJlweiBCi7taQ6rJmMKbrQCOabxazaM1j/zB0d84iyqn7 gZNQ6aTpQWgBcXR8iTt9TsFD1SfrvC0QBCVXa9BketHFvz+41o2dy61U/Sw8X1FlHvF+H8 a2/SpgruQk1VUY1T5rCWRsjhkms8JqhVgvwM9fXkxKNT4CfJAOuXLuIfEWpDRQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778785513; 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=jnbRur8/I1bR/BDntt9muU0uOtKNbuy0sZVAyqijNgk=; b=u1HUpzzepYyvcfYKEwurE8Wgv/HaLoblRoQgvfkSWOrGLwRmm6M1pvvUYV7gN8KAsi+xzE tVB60gWgOkgsagrnhTw6FNXynssuDtdhkft5jEFtzvOhkOUDiKL4dA3fewCwSVwdSguujP JZpBew1kVnBCbDXz4CP08zGgTOt5SoXFz2repxSLRfMJ8oVqQ92vw03Nzd8Vu4rL6c/H0y I/DroZEh1XgUrgP1Z3N0O76vQHJE4jSJ/0v9uvIbQW7dNMX1UsZN3JYtPqGVguXgR/4i96 3KqmrFPjgzX78pT5TNHBq7JvsTKUTrCtvoDWYw7+9u7Woay2GuwHOON8fmQJLA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gGfsj1sCLzr1j for ; Thu, 14 May 2026 19:05:13 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 27641 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 14 May 2026 19:05:13 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Alan Somers From: Colin Percival Subject: git: 09a53a56b7a6 - releng/15.1 - Make "make update-packages" idempotent 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: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org List-Id: 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: cperciva X-Git-Repository: src X-Git-Refname: refs/heads/releng/15.1 X-Git-Reftype: branch X-Git-Commit: 09a53a56b7a6892935509e2cda1954fff8078c3f Auto-Submitted: auto-generated Date: Thu, 14 May 2026 19:05:13 +0000 Message-Id: <6a061ce9.27641.6ade658@gitrepo.freebsd.org> The branch releng/15.1 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=09a53a56b7a6892935509e2cda1954fff8078c3f commit 09a53a56b7a6892935509e2cda1954fff8078c3f Author: Alan Somers AuthorDate: 2026-05-07 18:18:29 +0000 Commit: Colin Percival CommitDate: 2026-05-14 19:04:52 +0000 Make "make update-packages" idempotent If the user runs "make update-packages" without bumping BRANCH, then it isn't possible to copy packages from the old location to the new one (because the two locations are the same). So just skip that step. Approved by: re (cperciva) Sponsored by: ConnectWise PR: 295085 Reviewed by: ivy, emaste Differential Revision: https://reviews.freebsd.org/D56872 (cherry picked from commit bd1e789b8452a8c2f166a3b4defb95330c71dadd) (cherry picked from commit 89a0148521aefe0a190d4b62749186c705962d32) --- Makefile.inc1 | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Makefile.inc1 b/Makefile.inc1 index 2255b61a30ff..2c79a8c7920a 100644 --- a/Makefile.inc1 +++ b/Makefile.inc1 @@ -2116,7 +2116,7 @@ real-packages: stage-packages create-packages sign-packages .PHONY real-update-packages: stage-packages .PHONY ${_+_}${MAKE} -C ${.CURDIR} PKG_VERSION=${PKG_VERSION} create-packages -.if defined(PKG_VERSION_FROM_DIR) +.if defined(PKG_VERSION_FROM_DIR) && ${PKG_VERSION} != ${PKG_VERSION_FROM} @echo "==> Checking for new packages (comparing ${PKG_VERSION} to ${PKG_VERSION_FROM})" @for pkg in ${PKG_VERSION_FROM_DIR}/${PKG_NAME_PREFIX}-*; do \ pkgname=$$(pkg query -F $${pkg} '%n' | sed 's/${PKG_NAME_PREFIX}-\(.*\)/\1/') ; \ @@ -2134,6 +2134,8 @@ real-update-packages: stage-packages .PHONY echo "==> New package $${newpkgname}" ; \ fi ; \ done +.elif defined(PKG_VERSION_FROM_DIR) + @echo "==> Package version ${PKG_VERSION} unchanged, keeping old package set" .else @echo "==> Bootstrapping repository, not checking for new packages" .endif From nobody Thu May 14 19:07:18 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 4gGfwC5gPQz5Wrbc for ; Thu, 14 May 2026 19:07:23 +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 "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gGfwC38tSz3Dmq for ; Thu, 14 May 2026 19:07:23 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778785643; 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=KneRFxc5jZMFA9/JOtPGp83jChN0gyTj2aB+KNK78SY=; b=ZLRgE1mLxG31aVbPGcmnSpcyjM0f6SRokWMXiOSXLHGtfLaAzUnoI0Epk5osSGbp2OS3QO H7eiqFWhgo3sGagLqGi/RlkCtwCO4xNpWP2Ohe/slG31kdXLcqRq+dGH059R2pcSrZ9LX9 LoswGEcHzpa53M0iYlqj/WZh2CkAWbW/R7+wApe4HYsywtYnrD+NZUWox7dTiVA3PVf1Ls rSWCq9yJvlqUB0XSwI3ytDAZUT4SzWvCyia/ZxRq7aVIdmxUQ5gafaYwZaoLWASBgVXaip zE/iJml1M82Z6g+m9ehf8r7ssW32HHmKXBgpBN8q4VCFAiSbNIQxNHQi0a/3hQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778785643; a=rsa-sha256; cv=none; b=H2xppf8rSCEDbUQUQllyUflAy5B5fQERE7tTKbly6RW7QdU4Sa2PcJZf2VvC/b9bPZlZ5y bpzJshWpq1fYJxePosvvAZDgB1DmQKHkljs8HlSmo6p0qPribvoAO+PT09E1FGfHPHbOdC PA1fVtO8dR/OBP6llMZ34yJ48YCcDIUu0eryzcvGLgAeXQGDyfaB8c+0d/wdg8l6lLaSX9 KyJKOBhD0WPbhktOIg2Vdy/PO4wZw2+5ZUUBbkkKOPD/m1zYAfi0Xa3+USxBZy/o4lib70 33nkLs6nVanHfiBBawmkx1NydmHLtBd0gFD2fGGhmzjBN7R1Yjnnj4H11De2Uw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778785643; 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=KneRFxc5jZMFA9/JOtPGp83jChN0gyTj2aB+KNK78SY=; b=L6oyB7ZsUo9TJUL6pBPNcD57AiL0F7HF2kFqaMIGi44cwownjKQyMm1yvDqaMXTYQEjHlY MOcBmG8gXJpA4rDlrTehNOINHHbpYLSHA1q+pMVOfx/BO03nrgQogIjwBEDJorgqrbM58C aiX4wdUU5ZnaUBcWke/qdS2q9sRHRGnGWkaSTqmC0ktF/lCJ3xf2JDJHxVIVIXliFy7tJ1 hGCjoDtYGy2uIq7AL9MATNGgg24nh53Ap/cC2VFGmzZMywlm7R6dDClJz9JCfFjO7ic0y/ iIIbIfVDlSLQlY6pTSaOZ32n7BnTxsv+nvL51iG7NdPgQXgcGmHk3ljForC/7A== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gGfwC2VKYzqrK for ; Thu, 14 May 2026 19:07:23 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 25a30 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 14 May 2026 19:07:18 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Baptiste Daroussin From: Colin Percival Subject: git: 2ebec3c7ead5 - releng/15.1 - nuageinit: fix command injection and related issues 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: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org List-Id: 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: cperciva X-Git-Repository: src X-Git-Refname: refs/heads/releng/15.1 X-Git-Reftype: branch X-Git-Commit: 2ebec3c7ead5f5b477a5ab47136562777f2bb495 Auto-Submitted: auto-generated Date: Thu, 14 May 2026 19:07:18 +0000 Message-Id: <6a061d66.25a30.368aaaca@gitrepo.freebsd.org> The branch releng/15.1 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=2ebec3c7ead5f5b477a5ab47136562777f2bb495 commit 2ebec3c7ead5f5b477a5ab47136562777f2bb495 Author: Baptiste Daroussin AuthorDate: 2026-05-07 18:22:14 +0000 Commit: Colin Percival CommitDate: 2026-05-14 19:06:56 +0000 nuageinit: fix command injection and related issues - Add shell_escape() helper to safely escape shell arguments - Apply shell_escape to all user-controlled values in shell commands: adduser (usershow, useradd, lock, primary_group, groups) addgroup (groupshow, groupadd, members) exec_change_password (usermod) settimezone (tzsetup root and timezone) install_package (pkg package names) - Escape double quotes in hostname when writing rc.conf.d/hostname - Add missing 'local' declaration for resolvconf_command in nameservers() - Escape interface name in resolvconf -a command - Change open_resolvconf_conf() from 'w' to 'a' mode to prevent data loss when nameservers() is called multiple times - Clean up stale resolvconf.conf at the start of each boot (skip on postnet to preserve config written by first call) Approved by: re (cperciva) MFC After: 1 day (cherry picked from commit 8b70a203be10411c560ed303ab25713d70b316e9) (cherry picked from commit 87b18b611ec9a70347fdd239345fa23977bcb2d0) --- libexec/nuageinit/nuage.lua | 43 +++++++++++++++++++++++------------- libexec/nuageinit/nuageinit | 17 ++++++++++++-- libexec/nuageinit/tests/nuageinit.sh | 6 ++--- 3 files changed, 46 insertions(+), 20 deletions(-) diff --git a/libexec/nuageinit/nuage.lua b/libexec/nuageinit/nuage.lua index 2d962b540b23..f3c23a7c3eb8 100644 --- a/libexec/nuageinit/nuage.lua +++ b/libexec/nuageinit/nuage.lua @@ -52,6 +52,10 @@ local function decode_base64(input) return table.concat(result) end +local function shell_escape(s) + return "'" .. string.gsub(s, "'", "'\\''") .. "'" +end + local function warnmsg(str, prepend) if not str then return @@ -121,7 +125,7 @@ local function sethostname(hostname) warnmsg("Impossible to open " .. hostnamepath .. ":" .. err) return end - f:write('hostname="' .. hostname .. '"\n') + f:write('hostname="' .. hostname:gsub('"', '\\"') .. '"\n') f:close() end @@ -199,7 +203,7 @@ local function adduser(pwd) if root then cmd = cmd .. "-R " .. root .. " " end - local f = io.popen(cmd .. " usershow " .. pwd.name .. " -7 2> /dev/null") + local f = io.popen(cmd .. " usershow " .. shell_escape(pwd.name) .. " -7 2> /dev/null") local pwdstr = f:read("*a") f:close() if pwdstr:len() ~= 0 then @@ -220,13 +224,17 @@ local function adduser(pwd) -- a warning but creates the user anyway. list = purge_group(list) if #list > 0 then - extraargs = " -G " .. table.concat(list, ",") + local escaped_list = {} + for _, g in ipairs(list) do + table.insert(escaped_list, shell_escape(g)) + end + extraargs = " -G " .. table.concat(escaped_list, ",") end end -- pw will automatically create a group named after the username -- do not add a -g option in this case if pwd.primary_group and pwd.primary_group ~= pwd.name then - extraargs = extraargs .. " -g " .. pwd.primary_group + extraargs = extraargs .. " -g " .. shell_escape(pwd.primary_group) end if not pwd.no_create_home then extraargs = extraargs .. " -m " @@ -248,9 +256,9 @@ local function adduser(pwd) if root then cmd = cmd .. "-R " .. root .. " " end - cmd = cmd .. "useradd -n " .. pwd.name .. " -M 0755 -w none " - cmd = cmd .. extraargs .. " -c '" .. pwd.gecos - cmd = cmd .. "' -d '" .. pwd.homedir .. "' -s " .. pwd.shell .. postcmd + cmd = cmd .. "useradd -n " .. shell_escape(pwd.name) .. " -M 0755 -w none " + cmd = cmd .. extraargs .. " -c " .. shell_escape(pwd.gecos) + cmd = cmd .. " -d " .. shell_escape(pwd.homedir) .. " -s " .. shell_escape(pwd.shell) .. postcmd f = io.popen(cmd, "w") if input then @@ -267,7 +275,7 @@ local function adduser(pwd) if root then cmd = cmd .. "-R " .. root .. " " end - cmd = cmd .. "lock " .. pwd.name + cmd = cmd .. "lock " .. shell_escape(pwd.name) os.execute(cmd) end return pwd.homedir @@ -283,7 +291,7 @@ local function addgroup(grp) if root then cmd = cmd .. "-R " .. root .. " " end - local f = io.popen(cmd .. " groupshow " .. grp.name .. " 2> /dev/null") + local f = io.popen(cmd .. " groupshow " .. shell_escape(grp.name) .. " 2> /dev/null") local grpstr = f:read("*a") f:close() if grpstr:len() ~= 0 then @@ -292,13 +300,17 @@ local function addgroup(grp) local extraargs = "" if grp.members then local list = splitlist(grp.members) - extraargs = " -M " .. table.concat(list, ",") + local escaped_list = {} + for _, m in ipairs(list) do + table.insert(escaped_list, shell_escape(m)) + end + extraargs = " -M " .. table.concat(escaped_list, ",") end cmd = "pw " if root then cmd = cmd .. "-R " .. root .. " " end - cmd = cmd .. "groupadd -n " .. grp.name .. extraargs + cmd = cmd .. "groupadd -n " .. shell_escape(grp.name) .. extraargs local r = os.execute(cmd) if not r then warnmsg("fail to add group " .. grp.name) @@ -484,7 +496,7 @@ local function exec_change_password(user, password, type, expire) postcmd = " -w random" end end - cmd = cmd .. "usermod " .. user .. postcmd + cmd = cmd .. "usermod " .. shell_escape(user) .. postcmd if expire then cmd = cmd .. " -p 1" else @@ -577,7 +589,7 @@ local function settimezone(timezone) root = "/" end - local f, _, rc = os.execute("tzsetup -s -C " .. root .. " " .. timezone) + local f, _, rc = os.execute("tzsetup -s -C " .. shell_escape(root) .. " " .. shell_escape(timezone)) if not f then warnmsg("Impossible to configure time zone ( rc = " .. rc .. " )") @@ -600,8 +612,8 @@ local function install_package(package) if package == nil then return true end - local install_cmd = "pkg install -y " .. package - local test_cmd = "pkg info -q " .. package + local install_cmd = "pkg install -y " .. shell_escape(package) + local test_cmd = "pkg info -q " .. shell_escape(package) if os.getenv("NUAGE_RUN_TESTS") then print(install_cmd) print(test_cmd) @@ -683,6 +695,7 @@ local function addfile(file, defer) end local n = { + shell_escape = shell_escape, warn = warnmsg, err = errmsg, chmod = chmod, diff --git a/libexec/nuageinit/nuageinit b/libexec/nuageinit/nuageinit index a1ebd3f52b25..fc8d9582b9c6 100755 --- a/libexec/nuageinit/nuageinit +++ b/libexec/nuageinit/nuageinit @@ -67,7 +67,14 @@ local function open_resolv_conf() end local function open_resolvconf_conf() - return openat("/etc", "resolvconf.conf") + local path_dir = root .. "/etc" + local path_name = path_dir .. "/resolvconf.conf" + nuage.mkdir_p(path_dir) + local f, err = io.open(path_name, "a") + if not f then + nuage.err("unable to open " .. path_name .. ": " .. err) + end + return f, path_name end local function get_ifaces_by_mac() @@ -271,8 +278,9 @@ local function nameservers(interface, obj) end -- Only call resolvconf with interface if interface is provided + local resolvconf_command if interface then - resolvconf_command = "resolvconf -a " .. interface .. " < " .. resolv_conf + resolvconf_command = "resolvconf -a " .. nuage.shell_escape(interface) .. " < " .. resolv_conf else resolvconf_command = "resolvconf -u" end @@ -738,6 +746,11 @@ local function load_userdata() return line, obj end +-- Clean up stale resolvconf.conf from previous boot +if citype ~= "postnet" then + os.remove(root .. "/etc/resolvconf.conf") +end + if citype == "config-2" then -- network config2_network(ni_path) diff --git a/libexec/nuageinit/tests/nuageinit.sh b/libexec/nuageinit/tests/nuageinit.sh index 3a01413f8487..9f7dc7d38a3c 100644 --- a/libexec/nuageinit/tests/nuageinit.sh +++ b/libexec/nuageinit/tests/nuageinit.sh @@ -799,7 +799,7 @@ packages: - yeah/plop EOF chmod 755 "${PWD}"/media/nuageinit/user_data - atf_check -s exit:0 -o inline:"pkg install -y yeah/plop\npkg info -q yeah/plop\n" /usr/libexec/nuageinit "${PWD}"/media/nuageinit postnet + atf_check -s exit:0 -o inline:"pkg install -y 'yeah/plop'\npkg info -q 'yeah/plop'\n" /usr/libexec/nuageinit "${PWD}"/media/nuageinit postnet cat > media/nuageinit/user_data << 'EOF' #cloud-config @@ -807,7 +807,7 @@ packages: - curl EOF chmod 755 "${PWD}"/media/nuageinit/user_data - atf_check -o inline:"pkg install -y curl\npkg info -q curl\n" /usr/libexec/nuageinit "${PWD}"/media/nuageinit postnet + atf_check -o inline:"pkg install -y 'curl'\npkg info -q 'curl'\n" /usr/libexec/nuageinit "${PWD}"/media/nuageinit postnet cat > media/nuageinit/user_data << 'EOF' #cloud-config @@ -816,7 +816,7 @@ packages: - meh: bla EOF chmod 755 "${PWD}"/media/nuageinit/user_data - atf_check -o inline:"pkg install -y curl\npkg info -q curl\n" -e inline:"nuageinit: Invalid type: table for packages entry number 2\n" /usr/libexec/nuageinit "${PWD}"/media/nuageinit postnet + atf_check -o inline:"pkg install -y 'curl'\npkg info -q 'curl'\n" -e inline:"nuageinit: Invalid type: table for packages entry number 2\n" /usr/libexec/nuageinit "${PWD}"/media/nuageinit postnet } config2_userdata_update_packages_body() From nobody Thu May 14 22:38:44 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 4gGlc458Yvz5vwgB for ; Thu, 14 May 2026 22:38:44 +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 "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gGlc44SMkz3d5m for ; Thu, 14 May 2026 22:38:44 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778798324; 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=mtGvXsGsX2T/1aptzL1iqxQ9eVc8jU2KqCOiDX+I3g0=; b=p7Z+hJM/XHAL/FDugMazGXeE/jlNviN6w0SM27uSlrgrQtnhPyrYVWb2uBZrRDvlElidB5 +IM78TbOfLTCY9x68oNeEkX4iWA3Dh5AO3e/bOewXtCNj1K0GJQJfNE7tJkt/GXdWWMrcM rgNu9xko4oEq09NoBCtIQHR+WbK+x8zV0xDKXicrG8KlorW2M1vcC4vyjFg6+OM2JulFY6 lSktsOXzHGA6QH5lGOWII5YFYOsT1qS6W0eAX9h7MKv1fRmjpjrBFqmMJA354V8wG3dosf bqLQ0Te7hhqdXFHzDNb1QMc8ToQ1DcXdHuKW80D/Iubgj0KWTVM/xG8EDH9Kug== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778798324; a=rsa-sha256; cv=none; b=GvQJdN1t5y907yF2a05PTF9i6W7KaDClPC+4kp74nGMvdoKScE9/oUA2m0xIGHg9ELjcOj C6acSuV3N4CMhLfVs3NAOUnfDqbeeQ1/YzGOxxkqVtYE7rBwGtnerbV+H+CpxhDiTnHj6g miqCCpx0DaB+eCgYyH4Hc01JEQfhP3CQegbhVQkGlsaiOZmSOPPLsq/qzxR0rgtLZsYiGW WxBSbFoCf5ieK/goE3atBzut/tsf+icEnrSWo62kSxaC1OG7TQoSt4jTzt1wQey0fbv6Wa pnFqluDPNMt8lxqu0D7yCjurcnUNccGb9OYukUnI1p3qBcNZQO8yhb6HIroqhw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778798324; 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=mtGvXsGsX2T/1aptzL1iqxQ9eVc8jU2KqCOiDX+I3g0=; b=gPVasdf70vHhuJEdlsi8TXYSWpOUhSCnqzA9XEhgNWyoMXeWcfN7ry160zNVMSvMYVeEps qhIKEIRBcUJ/t4djCMNi1X+MDxc+4B0aY3k6y0R0ltyj6yNL72FPre8A7DZm3hC+LGT9eK TqW/c99VEdF1B2NfjZWLH1dc3aROsmhNNc4f5bMXhuyPq1f/aCq03pN2rAP1x5mmmKbxNb pJqNGxm00dy/PkV2g2BfMRr5wALTjy6cN1RRbT7gYJIyBfkpnEpKP0+jvdLWfECLMcIoHl WJOc70eIk4KYfoHeg3UJ2YgJ9EHG6bnudwuEGA06vLrq63Im9agbHFIJvYPZ0Q== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gGlc43Hvjzx44 for ; Thu, 14 May 2026 22:38:44 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 44aec by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 14 May 2026 22:38:44 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Colin Percival Subject: git: 1ae97c95d025 - stable/15 - Cloud releases: More firstboot_pkg_upgrade 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: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org List-Id: 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: cperciva X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 1ae97c95d025277fb542936b0a2686180dd4a7b7 Auto-Submitted: auto-generated Date: Thu, 14 May 2026 22:38:44 +0000 Message-Id: <6a064ef4.44aec.1e46ff59@gitrepo.freebsd.org> The branch stable/15 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=1ae97c95d025277fb542936b0a2686180dd4a7b7 commit 1ae97c95d025277fb542936b0a2686180dd4a7b7 Author: Colin Percival AuthorDate: 2026-05-14 21:14:09 +0000 Commit: Colin Percival CommitDate: 2026-05-14 22:38:12 +0000 Cloud releases: More firstboot_pkg_upgrade Update a couple more cloudware images which I forgot about earlier. Reviewed by: ziaee Fixes: 464a351267dc ("Cloud releases: Switch to firstboot_pkg_upgrade") Differential Revision: https://reviews.freebsd.org/D57006 (cherry picked from commit 4080419d9a2d88d44d20baaf3ea01934561819c1) --- release/tools/basic-cloudinit.conf | 7 ++++--- release/tools/ec2-small.conf | 9 ++++++--- 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/release/tools/basic-cloudinit.conf b/release/tools/basic-cloudinit.conf index 98e11f0bb08b..621165ea1669 100644 --- a/release/tools/basic-cloudinit.conf +++ b/release/tools/basic-cloudinit.conf @@ -8,16 +8,17 @@ export CONFIG_DRIVE=YES export CONFIG_DRIVE_SIZE=1M # Packages to install into the image we're creating. -# * firstboot-freebsd-update, to install security updates at first boot. -export VM_EXTRA_PACKAGES="${VM_EXTRA_PACKAGES} firstboot-freebsd-update" +# * firstboot-pkg-upgrade, to install security updates at first boot. +export VM_EXTRA_PACKAGES="${VM_EXTRA_PACKAGES} firstboot-pkg-upgrade" # Set to a list of third-party software to enable in rc.conf(5). -export VM_RC_LIST="${VM_RC_LIST} firstboot_freebsd_update growfs sshd nuageinit" +export VM_RC_LIST="${VM_RC_LIST} firstboot_pkg_upgrade growfs sshd nuageinit" vm_extra_pre_umount() { cat << EOF >> ${DESTDIR}/etc/rc.conf dumpdev="AUTO" ifconfig_DEFAULT="SYNCDHCP accept_rtadv" +firstboot_pkg_upgrade_repos="FreeBSD-base" # RSA host keys are obsolete and also very slow to generate sshd_rsa_enable="NO" EOF diff --git a/release/tools/ec2-small.conf b/release/tools/ec2-small.conf index 6564a59c2cf6..f5904d5ea4ba 100644 --- a/release/tools/ec2-small.conf +++ b/release/tools/ec2-small.conf @@ -25,18 +25,21 @@ vm_extra_filter_base_packages() { # Packages to install into the image we're creating. In addition to packages # present on all EC2 AMIs, we install: # * ec2-scripts, which provides a range of EC2ification startup scripts, -# * firstboot-freebsd-update, to install security updates at first boot, +# * firstboot-pkg-upgrade, to install security updates at first boot, # * firstboot-pkgs, to install packages at first boot, and # * isc-dhcp44-client, used for IPv6 network setup. export VM_EXTRA_PACKAGES="${VM_EXTRA_PACKAGES} ec2-scripts \ - firstboot-freebsd-update firstboot-pkgs isc-dhcp44-client" + firstboot-pkg-upgrade firstboot-pkgs isc-dhcp44-client" # Services to enable in rc.conf(5). export VM_RC_LIST="${VM_RC_LIST} ec2_configinit ec2_ephemeral_swap \ - ec2_fetchkey ec2_loghostkey firstboot_freebsd_update firstboot_pkgs \ + ec2_fetchkey ec2_loghostkey firstboot_pkg_upgrade firstboot_pkgs \ growfs sshd" vm_extra_pre_umount() { + # Limit firstboot_pkg_upgrade to the base system. + echo 'firstboot_pkg_upgrade_repos="FreeBSD-base"' >> ${DESTDIR}/etc/rc.conf + # Any EC2 ephemeral disks seen when the system first boots will # be "new" disks; there is no "previous boot" when they might have # been seen and used already. From nobody Thu May 14 22:38:43 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 4gGlc85TB3z5vwjf for ; Thu, 14 May 2026 22:38:48 +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 "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gGlc83TK8z3d5n for ; Thu, 14 May 2026 22:38:48 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778798328; 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=p/xYAuUwwM1U2OtI7Hk7YVORpKOXkkj1BAxp+lINC0A=; b=RKNYdiv4OcpKHelzTuR63sRVzbwNsPm/5thULp1W+KVz0VJi9gUKhfyGV4JC76fIn4Rl9m g17/seElBY4dNurCKUzY+xoFKHODe1g62zDrGZTXwucG75onSQjRQOzWsgG3/6R230jVNT EX6JAWUCBnDP3LNX4wFsNMf1n4jMzrH8qxJDrluST5Iy8aGIEuzcmDBTDLO+md1wHgn9RP bTD+bKwev2u0KG4IhLagYBGdtcIhSuHTtKysorlXgfbAn+z/WADNYJx+gG6hMusfrNMOGY rMR0LPCfmcXiZ2ATMJXd50EcXiM/4/vEVTIQ1YkEdFosgDmNxWZI+5l9AWlU9g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778798328; a=rsa-sha256; cv=none; b=vHR6IHrkyyIixOt1DvZnFPeNbGVkeBpHqrDvu8uw98LztpdusjZiQd+h49zrmevntC3U8k ill0iAPmgjn53aNt7mX5/1ScbB6ONhxo++9MwNn/Khnit/uQD6uBqBhNy5/vT4do5vgt1A UyvY7UnTd2Fz0XjHKWcWcO6kxapkn1nWhWEepGhsKTjY+mEbCs7RJbZ6vEoIwPVziQs+dx vM8H431FclDCS/bKolmzk3q2rQx9yqWajw7Y42SAMNMwnhE9nqWCAEnRGMgxsl8et5+0Wh loKC0MJLpDOVvyWczs4ga2Gy9A6ph1d3YyTrFBlrkUh+9Sw6j0uIVhOAiyNeCA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778798328; 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=p/xYAuUwwM1U2OtI7Hk7YVORpKOXkkj1BAxp+lINC0A=; b=B5dZTDpHPyySLctc3DD60LAjexV5WbT4FBRPwB7tkUdggfwN9Ku3bfwBpJM1Xr3WLDJC0F P+FEaVJwq66LTRd6n41yH5aSaWLHxGyN2SmDycvEefFLeaZDbZl0q4+2YpaulASGU2n+93 VAfyW01/PNerKcS9MAGB/ue868UIJZoG1tlj/Yg15yUxCD72Yz5og8qLKkjJEr7VYO+6k2 WfavJt8+NAr5H+OPqrMgjAcUt7mExxnby584PXCNf3fMh67HXKP/fY+0LwLi2jZKYeGtCf 1FQZbYiac0l992YFx5N18HIHJ2OGuwtMxy4jFwEeBefruFcpUwivDQEVg6zmHA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gGlc82zgkzwds for ; Thu, 14 May 2026 22:38:48 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 4455f by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 14 May 2026 22:38:43 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Alexander Ziaee From: Colin Percival Subject: git: 0bb2b2a45f3c - stable/15 - Cloud releases: Switch to firstboot_pkg_upgrade 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: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org List-Id: 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: cperciva X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 0bb2b2a45f3c0c147d7c55e010be45e55af8df87 Auto-Submitted: auto-generated Date: Thu, 14 May 2026 22:38:43 +0000 Message-Id: <6a064ef3.4455f.62432907@gitrepo.freebsd.org> The branch stable/15 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=0bb2b2a45f3c0c147d7c55e010be45e55af8df87 commit 0bb2b2a45f3c0c147d7c55e010be45e55af8df87 Author: Alexander Ziaee AuthorDate: 2026-05-14 21:05:07 +0000 Commit: Colin Percival CommitDate: 2026-05-14 22:38:12 +0000 Cloud releases: Switch to firstboot_pkg_upgrade Cloud images are deployed with base system packages. Introduce a firstboot package auto updater to patch the base system on first boot. MFC after: 1 hour MFC to: stable/15 Reviewed by: cperciva Sponsored by: Google Cloud Differential Revision: https://reviews.freebsd.org/D56890 (cherry picked from commit 464a351267dc0d1843b919dd72ad1c70c24815ce) --- release/tools/azure.conf | 5 +++-- release/tools/ec2-base.conf | 9 ++++++--- release/tools/gce.conf | 5 +++-- 3 files changed, 12 insertions(+), 7 deletions(-) diff --git a/release/tools/azure.conf b/release/tools/azure.conf index 7a4f0b5027cf..9a5c12424bd3 100644 --- a/release/tools/azure.conf +++ b/release/tools/azure.conf @@ -6,10 +6,10 @@ export VMSIZE=30g # Set to a list of packages to install. -export VM_EXTRA_PACKAGES="azure-agent python python3 firstboot-freebsd-update firstboot-pkgs" +export VM_EXTRA_PACKAGES="azure-agent python python3 firstboot-pkg-upgrade firstboot-pkgs" # Set to a list of third-party software to enable in rc.conf(5). -export VM_RC_LIST="ntpd sshd waagent firstboot_freebsd_update firstboot_pkgs" +export VM_RC_LIST="ntpd sshd waagent firstboot_pkg_upgrade firstboot_pkgs" # No swap space; waagent will allocate swap space on the resource disk. # See ResourceDisk.EnableSwap and ResourceDisk.SwapSizeMB in waagent.conf @@ -43,6 +43,7 @@ vm_extra_pre_umount() { cat << EOF >> ${DESTDIR}/etc/rc.conf ifconfig_hn0="SYNCDHCP" ntpd_sync_on_start="YES" +firstboot_pkg_upgrade_repos="FreeBSD-base" EOF cat << EOF >> ${DESTDIR}/boot/loader.conf diff --git a/release/tools/ec2-base.conf b/release/tools/ec2-base.conf index ffe2646240a5..24b2feb5f0d7 100644 --- a/release/tools/ec2-base.conf +++ b/release/tools/ec2-base.conf @@ -7,15 +7,15 @@ # * amazon-ssm-agent (not enabled by default, but some users need to use # it on systems not connected to the internet), # * ec2-scripts, which provides a range of EC2ification startup scripts, -# * firstboot-freebsd-update, to install security updates at first boot, +# * firstboot-pkg-upgrade, to install security updates at first boot, # * firstboot-pkgs, to install packages at first boot, and # * isc-dhcp44-client, used for IPv6 network setup. export VM_EXTRA_PACKAGES="${VM_EXTRA_PACKAGES} amazon-ssm-agent ec2-scripts \ - firstboot-freebsd-update firstboot-pkgs isc-dhcp44-client" + firstboot-pkg-upgrade firstboot-pkgs isc-dhcp44-client" # Services to enable in rc.conf(5). export VM_RC_LIST="${VM_RC_LIST} ec2_configinit ec2_ephemeral_swap \ - ec2_fetchkey ec2_loghostkey firstboot_freebsd_update firstboot_pkgs \ + ec2_fetchkey ec2_loghostkey firstboot_pkg_upgrade firstboot_pkgs \ growfs sshd" vm_extra_pre_umount() { @@ -24,6 +24,9 @@ vm_extra_pre_umount() { # via EC2 user-data. echo 'firstboot_pkgs_list="devel/py-awscli"' >> ${DESTDIR}/etc/rc.conf + # Limit firstboot_pkg_upgrade to the base system. + echo 'firstboot_pkg_upgrade_repos="FreeBSD-base"' >> ${DESTDIR}/etc/rc.conf + # Any EC2 ephemeral disks seen when the system first boots will # be "new" disks; there is no "previous boot" when they might have # been seen and used already. diff --git a/release/tools/gce.conf b/release/tools/gce.conf index 7298aabf3956..938672ac92e0 100644 --- a/release/tools/gce.conf +++ b/release/tools/gce.conf @@ -6,14 +6,14 @@ export VMSIZE=20g # Set to a list of packages to install. -export VM_EXTRA_PACKAGES="${VM_EXTRA_PACKAGES} firstboot-freebsd-update \ +export VM_EXTRA_PACKAGES="${VM_EXTRA_PACKAGES} firstboot-pkg-upgrade \ firstboot-pkgs google-cloud-sdk panicmail sudo \ sysutils/py-google-compute-engine lang/python \ lang/python3" # Set to a list of third-party software to enable in rc.conf(5). export VM_RC_LIST="ntpd sshd growfs \ - firstboot_pkgs firstboot_freebsd_update google_startup \ + firstboot_pkgs firstboot_pkg_upgrade google_startup \ google_accounts_daemon google_clock_skew_daemon \ google_instance_setup google_network_daemon" @@ -47,6 +47,7 @@ ifconfig_DEFAULT="SYNCDHCP mtu 1460" ntpd_sync_on_start="YES" # need to fill in something here #firstboot_pkgs_list="" +firstboot_pkg_upgrade_repos="FreeBSD-base" panicmail_autosubmit="YES" EOF From nobody Thu May 14 23:34:40 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 4gGmrd0fh9z5w2m1 for ; Thu, 14 May 2026 23:34:41 +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 "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gGmrc5Bvxz3pdr for ; Thu, 14 May 2026 23:34:40 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778801680; 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=RYljEDdkQp9FuqLYtqXf0EqLtOVKZhUx3lxWmQq6HGM=; b=EeJBtspEyZJvn+TdtnpQMLBl09e50qGTxsXbbdcvkLxrpfz9VteFjpzcSJfcIeENoUyO/H UIz+nwsuqhvVZiY0QQ5DL9ui2RK1EtfudpJgolAoa14JylL1+gi9HZIh2lKj94NpQ76iPo gyTuzVIUenJ2NS+pdBRbd3kqrAED/3J2gqKix7BNjrSZCIDM9v5hl2n1U/Abbe64X+PrlX cGu3K3dpAGQtdo6XyUpt2OQqNOke1U7jjF2oRdgZniL5ruGEsgwMxAZp3lPatABXmdiYHM QQRJW53es4qHP4k7qvf+Cz2bX6COxPBsL1yEE4nf2Zqqhc2xiQcnzNvXwmKoeg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778801680; a=rsa-sha256; cv=none; b=ANSIQKW4NgeSHnkMPhkHMksncRCMpii+tXwlgMDzIh7AZvkzQRQMiqhHn3wv8tgQH/K0SM PhJjF/phgvGMJqtVuAw98VwZrwcAdMD8FoXALofqGG8egyX8rS9PjCNEro4cEJMD/+bAbs rVSnO+3BePVAtLq5J68ijm43VVno/lEl5X6YtDGVEy4hbxmuq7RAYMwT28XvXhL4Ar8uBG gl2Yj7PWsiRhww5k1XJfan9+uMSsO2OmkhF+BjroJ9+Ifiibtw0BxgQI2L4O+DZs2/NA1f Irih1ckZffAbzez1E9NizRZ6ppTa0Ji/Ah3SN+UYBal7+ogxYuJv+GL4QtfocA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778801680; 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=RYljEDdkQp9FuqLYtqXf0EqLtOVKZhUx3lxWmQq6HGM=; b=ZlIQmqFwo2xT6bdLMSxioHUX2NJevWi+KTZ5AXdiDpscT1OMGMh4M33QdiwGOLEDUcsE7+ KwLBgaS4jDVVNr9i1jm+CL+ahslVGt5TzmuM5IZ9O/HKMAOcFayCCWYwqYUkBAdTdJsC3p djq80+mk8Jx3IXbPOXrGN/z8eIwEw7skvtGYnrNYTieR79EklxSGu4aCEtZoLAQAEVHjHb DW9ElHroAljcdhdsq8lMIzaH5Hn2/+kkhA+s+E9BSSAe0rGnyFIB9gO65DjA2QS1p+pbcv Y2I9cS6mMeM5phe9HvXS6o2P5tTO//nqy4VbRcFB1fHCM0trkXUAuGi8WFwqZA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gGmrc4XH2zy95 for ; Thu, 14 May 2026 23:34:40 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1a5a0 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 14 May 2026 23:34:40 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Alexander Ziaee Subject: git: 635743c6ec35 - stable/15 - freebsd-base.7: Document adding a local repo 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: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org List-Id: 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: ziaee X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 635743c6ec35f11434339f79222fb0a259ed8bfb Auto-Submitted: auto-generated Date: Thu, 14 May 2026 23:34:40 +0000 Message-Id: <6a065c10.1a5a0.6c2263d6@gitrepo.freebsd.org> The branch stable/15 has been updated by ziaee: URL: https://cgit.FreeBSD.org/src/commit/?id=635743c6ec35f11434339f79222fb0a259ed8bfb commit 635743c6ec35f11434339f79222fb0a259ed8bfb Author: Alexander Ziaee AuthorDate: 2026-05-06 21:23:52 +0000 Commit: Alexander Ziaee CommitDate: 2026-05-14 23:34:06 +0000 freebsd-base.7: Document adding a local repo MFC after: 1 day Discussed with: bcr, ivy, kevans, ngie Differential Revision: https://reviews.freebsd.org/D56608 (cherry picked from commit c4af3f13a4e9932968d92872aaf22312a6e79e4e) --- share/man/man7/freebsd-base.7 | 23 ++++++++++++++++++++++- 1 file changed, 22 insertions(+), 1 deletion(-) diff --git a/share/man/man7/freebsd-base.7 b/share/man/man7/freebsd-base.7 index 51de679ea9d1..d1857b2dbbec 100644 --- a/share/man/man7/freebsd-base.7 +++ b/share/man/man7/freebsd-base.7 @@ -14,7 +14,7 @@ .\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF .\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. .\" -.Dd April 14, 2026 +.Dd April 23, 2026 .Dt FREEBSD-BASE 7 .Os .Sh NAME @@ -217,6 +217,27 @@ for a different target than the host system): pkg -r /ppcdev -oABI=FreeBSD:16:powerpc64le \e install FreeBSD-set-devel .Ed +.Ss Adding a locally built repository for snapshots +Disable the predefined repository, +and add a local repo for locally built base system packages: +.Bd -literal -offset indent +cat << EOF > /usr/local/etc/pkg/repos/FreeBSD.conf +FreeBSD-base: { enabled: no } +FreeBSD-local: { + url: "file:///usr/obj/usr/src/repo/${ABI}/latest", + enabled: yes +} +EOF +.Ed +.Pp +The packages are created by the +.Xr build 7 +system at +.Pa ${REPODIR}/${PKG_ABI}/ , +which defaults to the example directory. +.Pp +.Sy Note : +The repo must have a different name than the predefined repository. .Ss Unregister a currently running system Systems managed through .Xr pkg 8 From nobody Fri May 15 00:00:53 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 4gGnQt3nFvz5w4hG for ; Fri, 15 May 2026 00:00:54 +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 "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gGnQt0Lp4z3t78 for ; Fri, 15 May 2026 00:00:54 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778803254; 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=ptEF0e/tcQC1ujudPG7KiZLdIY1R4vz6xM8cJc/WYeE=; b=lrvrOJlEi9tAihbKXwSuu5L7Wibiq8kRcW0iVjZLHzSo7fB2zeD/E11Gm6zlJJbfXpscuo q4ehmsm4u3vrOh0DVvyXbbmeLayDPCbSpzmkOOg9h7vANtPId90uUqu32iOuOP1Q4IPtB9 C7zgLTrEDpGr0byn62qDgSu4jTZClxyg3viz5Xcz1gtAK2t21wdOmCjxuKOHkWw6tWHlfo +gZa4c8qrzfda+buFcYHsMFNtnWizuPoywTbG30kpAZveubGFHYBooCMGYoexnDXl6PZg3 +Hz2xRKob0nOf2TOWvaGXu//ydsu1p8d5CPd2oHcBI9fXbRSXfidSRYZ2IR76g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778803254; a=rsa-sha256; cv=none; b=QBcJPoQQrBBM//sLTshWUh92QtktS5DyA1Ex/fMldlzzdc1L2FDKvR0CE6/DN1+xbxBE8/ qnVATbcKzWKRoWG+g436ekbIZPoAn8UMdoS5TtRQJJFJAdj5QUBFhOFrACacocEVGkJKBe nSbZWQAAp6mBnWi3V7uEPRJkNi5alhBxbyzBZoIcFcy9vCtPvZ2jrL5QZVm+XV28iV3O4m 0A4XhZuuEWidt3o5SbzJRauY4P1fFz/0ko+/8+kSfrnP9LbB0hchiru/voAtRWu1n99hBE LKfKhbLE7K+b1+0i8MaHxm6HOE6gdxUw/gpE9HapTc+g0KiHVosmrwUdG6raig== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778803254; 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=ptEF0e/tcQC1ujudPG7KiZLdIY1R4vz6xM8cJc/WYeE=; b=opsqeXx5U2rW06FD0y2E+gVJ6jA9Pefs98CcVZMmjoX+1lmYjI1Oyv0BJI3sQLWuXYmBzY GR5GHmJcuWZtX6xxDU0qURGIu1L0qqbrU2+TfXlNluKUyFSLbsP0fMdvHxz1NegYxHEDId Saif5uLVuOSyRJfps7psfrkXJwgEqZfO8dOjLBFcpRzJ4EwcD5RZD8we7oydVtroVf/3cm otwwtdjiLP1OJqG4qKkvHXn4QmWtEm+sZojt39vPpV8eTzhu4aTStkkU3giV2EEZEBvuRS ZEyaX4LbI2qEmsBeTsT2rjlhgOtYEQ3L6mQg91NJD1/1hDEBMQA7yvqaTmZ4MQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gGnQs72fFzysf for ; Fri, 15 May 2026 00:00:53 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1e955 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 15 May 2026 00:00:53 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Alexander Ziaee From: Colin Percival Subject: git: a02091d590aa - releng/15.1 - freebsd-base.7: Document adding a local repo 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: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org List-Id: 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: cperciva X-Git-Repository: src X-Git-Refname: refs/heads/releng/15.1 X-Git-Reftype: branch X-Git-Commit: a02091d590aaf35000a6c6dafdfe076d33f2b291 Auto-Submitted: auto-generated Date: Fri, 15 May 2026 00:00:53 +0000 Message-Id: <6a066235.1e955.7baa8d6a@gitrepo.freebsd.org> The branch releng/15.1 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=a02091d590aaf35000a6c6dafdfe076d33f2b291 commit a02091d590aaf35000a6c6dafdfe076d33f2b291 Author: Alexander Ziaee AuthorDate: 2026-05-06 21:23:52 +0000 Commit: Colin Percival CommitDate: 2026-05-14 23:58:52 +0000 freebsd-base.7: Document adding a local repo Approved by: re (cperciva) MFC after: 1 day Discussed with: bcr, ivy, kevans, ngie Differential Revision: https://reviews.freebsd.org/D56608 (cherry picked from commit c4af3f13a4e9932968d92872aaf22312a6e79e4e) (cherry picked from commit 635743c6ec35f11434339f79222fb0a259ed8bfb) --- share/man/man7/freebsd-base.7 | 23 ++++++++++++++++++++++- 1 file changed, 22 insertions(+), 1 deletion(-) diff --git a/share/man/man7/freebsd-base.7 b/share/man/man7/freebsd-base.7 index 51de679ea9d1..d1857b2dbbec 100644 --- a/share/man/man7/freebsd-base.7 +++ b/share/man/man7/freebsd-base.7 @@ -14,7 +14,7 @@ .\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF .\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. .\" -.Dd April 14, 2026 +.Dd April 23, 2026 .Dt FREEBSD-BASE 7 .Os .Sh NAME @@ -217,6 +217,27 @@ for a different target than the host system): pkg -r /ppcdev -oABI=FreeBSD:16:powerpc64le \e install FreeBSD-set-devel .Ed +.Ss Adding a locally built repository for snapshots +Disable the predefined repository, +and add a local repo for locally built base system packages: +.Bd -literal -offset indent +cat << EOF > /usr/local/etc/pkg/repos/FreeBSD.conf +FreeBSD-base: { enabled: no } +FreeBSD-local: { + url: "file:///usr/obj/usr/src/repo/${ABI}/latest", + enabled: yes +} +EOF +.Ed +.Pp +The packages are created by the +.Xr build 7 +system at +.Pa ${REPODIR}/${PKG_ABI}/ , +which defaults to the example directory. +.Pp +.Sy Note : +The repo must have a different name than the predefined repository. .Ss Unregister a currently running system Systems managed through .Xr pkg 8 From nobody Fri May 15 00:00:55 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 4gGnQv4VyCz5w4jp for ; Fri, 15 May 2026 00:00:55 +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 "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gGnQv0t2qz3tDF for ; Fri, 15 May 2026 00:00:55 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778803255; 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=sqJU6uECUD78tEk7JvCTw97N+63yuNSxZEbLOW9+ZOE=; b=QSVY5iil7VpZf5f9iF7k/Jy+x8WEp36PXjv8nK4ZeeTPQ4fpmehOf9FfDfHigZL94WE0lm 3AgrMbGVPpJElbe6e8A1t3fdhrEMs6rl+TEILj9nTi1meNCT4MdLawMPoAJ9PAkhT8wxBu NS10wo3HXFwqmI56sCVLsxlvtawPfmMoW4MW51cC+crCIg2zf7pgWdHo+PH8LfFy/aazc2 qmMHGmPeA2VmfeFyOdsetOGV+5xP6L3zzwdB/y3OShM2cshEnT2MjpjxeTLfsz3/eA5lc5 Kmi8ll285NR5dUeqLL9g8vb7mR9Jr/2vJN7xH7ixY88JQ8gsSBv0quHIySiVGA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778803255; a=rsa-sha256; cv=none; b=ZGQn7URllNREmZHOu5Wc7ad8TBWEpu+pHjNdT9b6gwr8TzSdgVP6CJUjKmSULAPdyKVI3D S8j6EZ6VO/RSsyB2NwzYxqaX+L5BDiaOQMop4Ug80EYjDiv6GEzL2OuVUKI9UpJ1aP0I6p q0CA32o4bHHiwyVdg41Y/6EWLRNUPL7ZaCznzsZs+oCrY+2yECq/dnxyQawY1wMTtQFTkX 5vfqP9rg2T7YZnggF+KAqPnmtXupB85+IdTQoyz+QYdHbzqD2thtJM3bpbXvtaMQxd1zQ6 vslymKRyKcfOFJEzF7yJd0fB8Q3ahPDwolvrp1GbHFK7YNvCbxAAGEmsyUAmXQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778803255; 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=sqJU6uECUD78tEk7JvCTw97N+63yuNSxZEbLOW9+ZOE=; b=IzhhplGPbb6X7xQPWIANyMy+BSGHAsPslvc5FsW9UXxo832PKJgL3HDtPSfd5wTg7NroCi N8YNcb8fRaQey8UfQ5SV+F+CCN5FUsQ10DSQy3LEHWGYJVgJSXSk396pMyrUV0EYbDzL0J /Jo/VAYNJ8IRhxZbuaDp57GLThLCOvC91ao2N7BMKCXP1amfWfktm+ZBo6a8h8mzL7qEcQ C5ONvPSrW8rHUdV+EVdaTTQ5b545IepoCpMvTHFMYmF5qZIoukNnKQ4l+B/5xgDcWluith BiSMmG1D+dWThEUMa2qTZqVWyS+kd30pEhhtWWyIA2OEV4ygLakEYbbHM9uonQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gGnQv0MKvzyqH for ; Fri, 15 May 2026 00:00:55 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1e48b by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 15 May 2026 00:00:55 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Colin Percival Subject: git: ac2daab55062 - releng/15.1 - 15.1: Update to BETA3 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: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org List-Id: 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: cperciva X-Git-Repository: src X-Git-Refname: refs/heads/releng/15.1 X-Git-Reftype: branch X-Git-Commit: ac2daab5506280a2fa271c476a7f51ca8d9f13c0 Auto-Submitted: auto-generated Date: Fri, 15 May 2026 00:00:55 +0000 Message-Id: <6a066237.1e48b.306a0b1f@gitrepo.freebsd.org> The branch releng/15.1 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=ac2daab5506280a2fa271c476a7f51ca8d9f13c0 commit ac2daab5506280a2fa271c476a7f51ca8d9f13c0 Author: Colin Percival AuthorDate: 2026-05-15 00:00:36 +0000 Commit: Colin Percival CommitDate: 2026-05-15 00:00:36 +0000 15.1: Update to BETA3 Approved by: re (implicit) Sponsored by: OpenSats Initiative --- sys/conf/newvers.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/conf/newvers.sh b/sys/conf/newvers.sh index cbf4cab89dc5..39986494bbf6 100644 --- a/sys/conf/newvers.sh +++ b/sys/conf/newvers.sh @@ -51,7 +51,7 @@ TYPE="FreeBSD" REVISION="15.1" -BRANCH="BETA2" +BRANCH="BETA3" if [ -n "${BRANCH_OVERRIDE}" ]; then BRANCH=${BRANCH_OVERRIDE} fi From nobody Fri May 15 00:00:52 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 4gGnQz0rC9z5w4js for ; Fri, 15 May 2026 00:00:59 +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 "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gGnQy4zlLz3tRb for ; Fri, 15 May 2026 00:00:58 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778803258; 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=VqhXZ1EFvVZb+F8ZstLjUkv6te2Es62zfMFHbjzKAIY=; b=RzL0u6rb+O/0hr9fJLEL6/8eVjLQsnGNbGNg7Tc0Qw4YJflNefj9Au0amXrkIIjmtAYY5e 8arRD2pcEUcT3oLeB3XlSEN0mTD24Swtx3Dif5XSKeQB26yhd7mDlnwW2u0h5t9+oX+BFH Ox1l3ZuQsHEY8DcMuvy7Omw/Sx5mma2mXfexepRdk9zH9+4bs8ILmM+PvtvIJa0ZYr4yPo obhIc+AdyTiDERc3KM7HRcsuYNzvLn2wNwWsA0u5RgmWQuZkD2+6s/wkaKY4SfNoObjHQA +WjLbCHZ32FHNQI6wHzCkxlcIhHV7YUNISY02DnIlh7e1cQpGD+o3I3HJMfJxA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778803258; a=rsa-sha256; cv=none; b=g20eh0BB/15lVafQAwl/1KYFeKPsIRkF0DcuqXwCyXNiZXbUn4yWk+hGifFMJMq82MhNBa 9rqo1rGWTNlh/jaY7S77ZLOKE3cX/n5T2601o6w+DojJenl0U5r7bc67rZDGUzFc6Wm7qe NCHCSwFl5nEbnOhW12nV/ogRfeEmZtMccm17ARfh4ceyEmI+7XUZp+xx0V/oGtqE0JM1gi y9tGr3CNd47P8HIEA/ZXRbgjLBsaDK41ZEKTpPmvs+qw+hcnV6BCkB+QOVm2zziyd4nygt mh0xL3S0w85isluoSvtCywqeGk4Wji8kCoQbWypgTZjvjvqJZQ82q871ErBq9g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778803258; 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=VqhXZ1EFvVZb+F8ZstLjUkv6te2Es62zfMFHbjzKAIY=; b=qnh1+doUgJUVOIijvt+NPPdyh3kzFQscytv+N/zUQYyNGrWLGzaZZsG0PieHs+Nn6khVeu QEOXfmAiLHACthaRwAwuC6R5ttjneuQ9rhPRQCLeStQyQdd20cad/hBESaC7kVAVEx0Edp SYD8k6mg28MfWxPiD4mInobBV0U+lz+niam805KkogMlTpv6y1yomrmtDe525L5qxbKJzO BkrK/JmMKIgKtaWySuE9OlO7l7z0UxkYtn4SG0rzVtpmybRQbAQ0CX46T8bTndC/7NRyoY 2CD5kK+C47FlbXxPG6BoEzfgRm1gi1nT5owzHqMksYphRPda3XI3t7JoStY0qw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gGnQy1LRGzysk for ; Fri, 15 May 2026 00:00:58 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1d57e by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 15 May 2026 00:00:52 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Martin Matuska From: Colin Percival Subject: git: 409247a6cbd1 - releng/15.1 - zfs: merge openzfs/zfs@6330a45b0 (zfs-2.4-release) into stable/15 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: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org List-Id: 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: cperciva X-Git-Repository: src X-Git-Refname: refs/heads/releng/15.1 X-Git-Reftype: branch X-Git-Commit: 409247a6cbd11e3510025e025f3b82184c3de17c Auto-Submitted: auto-generated Date: Fri, 15 May 2026 00:00:52 +0000 Message-Id: <6a066234.1d57e.6807ba65@gitrepo.freebsd.org> The branch releng/15.1 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=409247a6cbd11e3510025e025f3b82184c3de17c commit 409247a6cbd11e3510025e025f3b82184c3de17c Author: Martin Matuska AuthorDate: 2026-05-13 19:53:01 +0000 Commit: Colin Percival CommitDate: 2026-05-14 23:58:46 +0000 zfs: merge openzfs/zfs@6330a45b0 (zfs-2.4-release) into stable/15 OpenZFS 2.4.2 Notable upstream pull request merges: #18208 6f14581e1 Cleanup allocation class selection #18235 7590972f7 Prevent range tree corruption race by updating dnode_sync() #18255 b06caaeec range_tree: use zfs_panic_recover() for partial-overlap remove #18258 33961142a Fix deadlock on dmu_tx_assign() from vdev_rebuild() #18262 02ed09106 Fix check for .cfi_negate_ra_state on aarch64 #18263 9f92266b7 Fix redundant declaration of dsl_pool_t #18276 3862aadf7 Fix vdev_rebuild_range() tx commit #18290 a94b137aa FreeBSD: Improve dmesg kernel message prefix #18294 938c8c98b draid: fix data corruption after disk clear #18310 b40cd9191 Fix s_active leak in zfsvfs_hold() when z_unmounted is true #18380 9b8ccbd2c draid: fix import failure after disks replacements #18399 4bb759274 Add support for POSIX_FADV_DONTNEED #18403 aba3ed30a fix memleak in spa_errlog.c #18405 e9a8c6e08 draid: allow seq resilver reads from degraded vdevs #18414 da44040bb draid: fix cksum errors after rebuild with degraded disks #18421 e7524594a Fix read corruption after block clone after truncate #18440 b8addf922 dmu_direct: avoid UAF in dmu_write_direct_done() #18473 76fd64ac9 Fix rare cksum errors after rebuild #18482 fc87e269e Initialize vr_last_txg for rebuild #18489 38501e182 Fix long POSIX_FADV_DONTNEED for single block files Approved by: re (cperciva) Obtained from: OpenZFS OpenZFS commit: 6330a45b06d20125de679aae5f63ba14082671ef OpenZFS tag: zfs-2.4.2 (cherry picked from commit a40f24ec28554c2387e766a47d2d4cb910d95865) --- .../openzfs/.github/workflows/checkstyle.yaml | 7 +- sys/contrib/openzfs/.github/workflows/codeql.yml | 2 +- .../.github/workflows/scripts/generate-ci-type.py | 33 +- .../.github/workflows/scripts/merge_summary.awk | 38 ++ .../.github/workflows/scripts/qemu-1-setup.sh | 43 +- .../.github/workflows/scripts/qemu-2-start.sh | 81 ++- .../.github/workflows/scripts/qemu-3-deps-vm.sh | 22 +- .../.github/workflows/scripts/qemu-4-build-vm.sh | 11 +- .../.github/workflows/scripts/qemu-6-tests.sh | 4 +- .../.github/workflows/scripts/qemu-7-prepare.sh | 47 +- .../.github/workflows/scripts/qemu-8-summary.sh | 8 +- .../workflows/scripts/qemu-9-summary-page.sh | 4 +- sys/contrib/openzfs/.github/workflows/smatch.yml | 4 +- sys/contrib/openzfs/.github/workflows/zfs-arm.yml | 40 ++ .../.github/workflows/zfs-qemu-packages.yml | 25 +- sys/contrib/openzfs/.github/workflows/zfs-qemu.yml | 46 +- sys/contrib/openzfs/.github/workflows/zloop.yml | 7 +- sys/contrib/openzfs/META | 4 +- sys/contrib/openzfs/Makefile.am | 1 + sys/contrib/openzfs/README.md | 42 +- sys/contrib/openzfs/autogen.sh | 1 + sys/contrib/openzfs/cmd/Makefile.am | 1 + sys/contrib/openzfs/cmd/raidz_test/Makefile.am | 1 + sys/contrib/openzfs/cmd/zdb/Makefile.am | 1 + sys/contrib/openzfs/cmd/zed/Makefile.am | 1 + sys/contrib/openzfs/cmd/zed/zed.d/Makefile.am | 1 + sys/contrib/openzfs/cmd/zed/zed_event.c | 2 +- sys/contrib/openzfs/cmd/zfs/Makefile.am | 1 + sys/contrib/openzfs/cmd/zfs/zfs_main.c | 2 +- sys/contrib/openzfs/cmd/zinject/Makefile.am | 1 + sys/contrib/openzfs/cmd/zpool/Makefile.am | 1 + sys/contrib/openzfs/cmd/zpool_influxdb/Makefile.am | 1 + sys/contrib/openzfs/cmd/zstream/Makefile.am | 1 + sys/contrib/openzfs/config/CppCheck.am | 1 + sys/contrib/openzfs/config/Rules.am | 1 + sys/contrib/openzfs/config/Shellcheck.am | 1 + sys/contrib/openzfs/config/Substfiles.am | 1 + sys/contrib/openzfs/config/always-arch.m4 | 1 + .../openzfs/config/always-compiler-options.m4 | 1 + sys/contrib/openzfs/config/always-cppcheck.m4 | 1 + sys/contrib/openzfs/config/always-parallel.m4 | 1 + sys/contrib/openzfs/config/always-python.m4 | 1 + sys/contrib/openzfs/config/always-pyzfs.m4 | 1 + sys/contrib/openzfs/config/always-sed.m4 | 1 + sys/contrib/openzfs/config/always-shellcheck.m4 | 1 + sys/contrib/openzfs/config/always-system.m4 | 1 + sys/contrib/openzfs/config/ax_compare_version.m4 | 1 + sys/contrib/openzfs/config/ax_count_cpus.m4 | 1 + sys/contrib/openzfs/config/ax_python_devel.m4 | 1 + sys/contrib/openzfs/config/ax_restore_flags.m4 | 1 + sys/contrib/openzfs/config/ax_save_flags.m4 | 1 + sys/contrib/openzfs/config/deb.am | 21 +- sys/contrib/openzfs/config/find_system_library.m4 | 1 + sys/contrib/openzfs/config/gettext.m4 | 1 + sys/contrib/openzfs/config/host-cpu-c-abi.m4 | 1 + sys/contrib/openzfs/config/iconv.m4 | 1 + .../openzfs/config/kernel-access-ok-type.m4 | 1 + sys/contrib/openzfs/config/kernel-acl.m4 | 32 + sys/contrib/openzfs/config/kernel-add-disk.m4 | 1 + sys/contrib/openzfs/config/kernel-assign_str.m4 | 1 + sys/contrib/openzfs/config/kernel-automount.m4 | 1 + sys/contrib/openzfs/config/kernel-bio.m4 | 1 + sys/contrib/openzfs/config/kernel-bio_max_segs.m4 | 1 + sys/contrib/openzfs/config/kernel-blk-queue.m4 | 27 + sys/contrib/openzfs/config/kernel-blkdev.m4 | 1 + .../config/kernel-block-device-operations.m4 | 1 + .../openzfs/config/kernel-commit-metadata.m4 | 1 + .../openzfs/config/kernel-config-defined.m4 | 1 + .../config/kernel-copy-from-user-inatomic.m4 | 29 - .../openzfs/config/kernel-cpu_has_feature.m4 | 1 + .../openzfs/config/kernel-declare-event-class.m4 | 1 + sys/contrib/openzfs/config/kernel-dentry-alias.m4 | 32 + .../openzfs/config/kernel-dentry-operations.m4 | 1 + .../openzfs/config/kernel-discard-granularity.m4 | 1 + sys/contrib/openzfs/config/kernel-drop-inode.m4 | 1 + sys/contrib/openzfs/config/kernel-file.m4 | 1 + sys/contrib/openzfs/config/kernel-filelock.m4 | 23 + .../openzfs/config/kernel-filemap-splice-read.m4 | 1 + .../openzfs/config/kernel-flush_dcache_page.m4 | 1 + sys/contrib/openzfs/config/kernel-fmode-t.m4 | 1 + .../openzfs/config/kernel-follow-down-one.m4 | 1 + sys/contrib/openzfs/config/kernel-fpu.m4 | 1 + sys/contrib/openzfs/config/kernel-free-inode.m4 | 1 + sys/contrib/openzfs/config/kernel-fs-context.m4 | 36 ++ sys/contrib/openzfs/config/kernel-fst-mount.m4 | 30 - sys/contrib/openzfs/config/kernel-fsync-bdev.m4 | 1 + .../openzfs/config/kernel-generic_fadvise.m4 | 1 + .../openzfs/config/kernel-generic_fillattr.m4 | 1 + .../openzfs/config/kernel-generic_io_acct.m4 | 1 + sys/contrib/openzfs/config/kernel-genhd-flags.m4 | 1 + sys/contrib/openzfs/config/kernel-get-disk-ro.m4 | 1 + sys/contrib/openzfs/config/kernel-iattr-vfsid.m4 | 1 + sys/contrib/openzfs/config/kernel-idmap_mnt_api.m4 | 1 + sys/contrib/openzfs/config/kernel-inode-create.m4 | 1 + sys/contrib/openzfs/config/kernel-inode-getattr.m4 | 1 + sys/contrib/openzfs/config/kernel-inode-lookup.m4 | 1 + .../openzfs/config/kernel-inode-permission.m4 | 1 + sys/contrib/openzfs/config/kernel-inode-setattr.m4 | 1 + sys/contrib/openzfs/config/kernel-inode-state.m4 | 1 + sys/contrib/openzfs/config/kernel-inode-times.m4 | 1 + .../openzfs/config/kernel-insert-inode-locked.m4 | 1 + .../openzfs/config/kernel-is_owner_or_cap.m4 | 1 + sys/contrib/openzfs/config/kernel-kasan-enabled.m4 | 1 + .../openzfs/config/kernel-kmap-atomic-args.m4 | 1 + .../openzfs/config/kernel-kmap-local-page.m4 | 1 + sys/contrib/openzfs/config/kernel-kmem.m4 | 1 + sys/contrib/openzfs/config/kernel-kthread.m4 | 1 + sys/contrib/openzfs/config/kernel-kuid-helpers.m4 | 1 + sys/contrib/openzfs/config/kernel-kuidgid.m4 | 1 + .../openzfs/config/kernel-make-request-fn.m4 | 1 + sys/contrib/openzfs/config/kernel-misc-minor.m4 | 1 + sys/contrib/openzfs/config/kernel-mkdir.m4 | 1 + sys/contrib/openzfs/config/kernel-mknod.m4 | 1 + sys/contrib/openzfs/config/kernel-mm-page-flags.m4 | 1 + sys/contrib/openzfs/config/kernel-mm-pagemap.m4 | 1 + sys/contrib/openzfs/config/kernel-namespace.m4 | 1 + sys/contrib/openzfs/config/kernel-objtool.m4 | 1 + .../config/kernel-pagemap-folio_wait_bit.m4 | 1 + .../config/kernel-pagemap-readahead-page.m4 | 1 + sys/contrib/openzfs/config/kernel-pde-data.m4 | 1 + sys/contrib/openzfs/config/kernel-percpu.m4 | 1 + .../openzfs/config/kernel-pin-user-pages.m4 | 1 + .../openzfs/config/kernel-proc-operations.m4 | 1 + sys/contrib/openzfs/config/kernel-reclaim_state.m4 | 1 + .../openzfs/config/kernel-register_sysctl_table.m4 | 1 + sys/contrib/openzfs/config/kernel-rename.m4 | 1 + .../openzfs/config/kernel-revalidate-disk-size.m4 | 1 + sys/contrib/openzfs/config/kernel-sb-dying.m4 | 1 + sys/contrib/openzfs/config/kernel-sb-wb-err.m4 | 1 + sys/contrib/openzfs/config/kernel-sched.m4 | 1 + .../openzfs/config/kernel-security-inode-init.m4 | 1 + sys/contrib/openzfs/config/kernel-set-nlink.m4 | 1 + .../openzfs/config/kernel-setattr-prepare.m4 | 1 + sys/contrib/openzfs/config/kernel-sget-args.m4 | 1 + sys/contrib/openzfs/config/kernel-show-options.m4 | 1 + sys/contrib/openzfs/config/kernel-shrink.m4 | 1 + sys/contrib/openzfs/config/kernel-siginfo.m4 | 1 + sys/contrib/openzfs/config/kernel-stdarg.m4 | 1 + sys/contrib/openzfs/config/kernel-strlcpy.m4 | 1 + sys/contrib/openzfs/config/kernel-symlink.m4 | 1 + sys/contrib/openzfs/config/kernel-sysfs.m4 | 1 + sys/contrib/openzfs/config/kernel-timer.m4 | 1 + sys/contrib/openzfs/config/kernel-tmpfile.m4 | 1 + .../openzfs/config/kernel-totalhigh_pages.m4 | 1 + .../openzfs/config/kernel-totalram-pages-func.m4 | 1 + .../openzfs/config/kernel-truncate-setsize.m4 | 1 + sys/contrib/openzfs/config/kernel-types.m4 | 1 + sys/contrib/openzfs/config/kernel-usleep_range.m4 | 1 + .../openzfs/config/kernel-vfs-file_range.m4 | 1 + .../config/kernel-vfs-filemap_dirty_folio.m4 | 1 + sys/contrib/openzfs/config/kernel-vfs-fsync.m4 | 1 + sys/contrib/openzfs/config/kernel-vfs-iov_iter.m4 | 1 + .../openzfs/config/kernel-vfs-migrate_folio.m4 | 1 + .../openzfs/config/kernel-vfs-migratepage.m4 | 1 + .../openzfs/config/kernel-vfs-read_folio.m4 | 1 + sys/contrib/openzfs/config/kernel-vfs-readpages.m4 | 1 + .../openzfs/config/kernel-vfs-set_page_dirty.m4 | 1 + sys/contrib/openzfs/config/kernel-vfs-writepage.m4 | 1 + sys/contrib/openzfs/config/kernel-writeback.m4 | 1 + sys/contrib/openzfs/config/kernel-xattr-handler.m4 | 1 + sys/contrib/openzfs/config/kernel-zero_page.m4 | 1 + sys/contrib/openzfs/config/kernel.m4 | 22 +- sys/contrib/openzfs/config/lib-ld.m4 | 1 + sys/contrib/openzfs/config/lib-link.m4 | 1 + sys/contrib/openzfs/config/lib-prefix.m4 | 1 + sys/contrib/openzfs/config/mount-helper.m4 | 1 + sys/contrib/openzfs/config/nls.m4 | 1 + sys/contrib/openzfs/config/pkg.m4 | 1 + sys/contrib/openzfs/config/po.m4 | 1 + sys/contrib/openzfs/config/progtest.m4 | 1 + sys/contrib/openzfs/config/rpm.am | 1 + sys/contrib/openzfs/config/tgz.am | 1 + sys/contrib/openzfs/config/toolchain-cfi.m4 | 33 + sys/contrib/openzfs/config/toolchain-simd.m4 | 1 + sys/contrib/openzfs/config/user-aio.h.m4 | 1 + sys/contrib/openzfs/config/user-backtrace.m4 | 1 + sys/contrib/openzfs/config/user-clock_gettime.m4 | 1 + sys/contrib/openzfs/config/user-dracut.m4 | 1 + sys/contrib/openzfs/config/user-gettext.m4 | 1 + sys/contrib/openzfs/config/user-libaio.m4 | 1 + sys/contrib/openzfs/config/user-libatomic.m4 | 1 + sys/contrib/openzfs/config/user-libblkid.m4 | 1 + sys/contrib/openzfs/config/user-libcrypto.m4 | 1 + sys/contrib/openzfs/config/user-libexec.m4 | 1 + sys/contrib/openzfs/config/user-libfetch.m4 | 1 + sys/contrib/openzfs/config/user-libtirpc.m4 | 1 + sys/contrib/openzfs/config/user-libudev.m4 | 1 + sys/contrib/openzfs/config/user-libunwind.m4 | 1 + sys/contrib/openzfs/config/user-libuuid.m4 | 1 + sys/contrib/openzfs/config/user-makedev.m4 | 1 + sys/contrib/openzfs/config/user-mount-setattr.m4 | 27 + sys/contrib/openzfs/config/user-pam.m4 | 1 + sys/contrib/openzfs/config/user-runstatedir.m4 | 1 + sys/contrib/openzfs/config/user-statx.m4 | 2 + sys/contrib/openzfs/config/user-systemd.m4 | 1 + sys/contrib/openzfs/config/user-sysvinit.m4 | 1 + sys/contrib/openzfs/config/user-udev.m4 | 1 + sys/contrib/openzfs/config/user-zlib.m4 | 1 + sys/contrib/openzfs/config/user.m4 | 2 + sys/contrib/openzfs/config/zfs-build.m4 | 4 +- sys/contrib/openzfs/config/zfs-meta.m4 | 1 + sys/contrib/openzfs/configure.ac | 2 +- sys/contrib/openzfs/contrib/Makefile.am | 1 + .../openzfs/contrib/bash_completion.d/Makefile.am | 1 + sys/contrib/openzfs/contrib/bpftrace/Makefile.am | 1 + sys/contrib/openzfs/contrib/debian/Makefile.am | 1 + sys/contrib/openzfs/contrib/dracut/Makefile.am | 1 + sys/contrib/openzfs/contrib/initramfs/Makefile.am | 1 + sys/contrib/openzfs/contrib/initramfs/scripts/zfs | 8 +- .../openzfs/contrib/pam_zfs_key/Makefile.am | 1 + sys/contrib/openzfs/contrib/pyzfs/Makefile.am | 1 + sys/contrib/openzfs/contrib/zcp/Makefile.am | 1 + sys/contrib/openzfs/etc/Makefile.am | 1 + .../system-generators/zfs-mount-generator.c | 5 +- sys/contrib/openzfs/include/Makefile.am | 1 + sys/contrib/openzfs/include/os/freebsd/Makefile.am | 1 + sys/contrib/openzfs/include/os/linux/Makefile.am | 1 + .../include/os/linux/kernel/linux/dcache_compat.h | 2 + .../include/os/linux/kernel/linux/xattr_compat.h | 17 + .../include/os/linux/zfs/sys/zfs_vfsops_os.h | 14 +- sys/contrib/openzfs/include/sys/dbuf.h | 2 + sys/contrib/openzfs/include/sys/dmu.h | 2 + sys/contrib/openzfs/include/sys/dnode.h | 13 + sys/contrib/openzfs/include/sys/spa.h | 1 + sys/contrib/openzfs/include/sys/vdev_raidz_impl.h | 1 + sys/contrib/openzfs/include/sys/vdev_rebuild.h | 4 +- sys/contrib/openzfs/lib/Makefile.am | 1 + sys/contrib/openzfs/lib/libavl/Makefile.am | 1 + sys/contrib/openzfs/lib/libefi/Makefile.am | 1 + sys/contrib/openzfs/lib/libicp/Makefile.am | 1 + sys/contrib/openzfs/lib/libnvpair/Makefile.am | 1 + sys/contrib/openzfs/lib/libspl/Makefile.am | 1 + sys/contrib/openzfs/lib/libspl/include/Makefile.am | 1 + .../openzfs/lib/libspl/os/linux/getmntany.c | 9 +- sys/contrib/openzfs/lib/libuutil/uu_ident.c | 2 +- sys/contrib/openzfs/lib/libzdb/Makefile.am | 1 + sys/contrib/openzfs/lib/libzfs/Makefile.am | 1 + sys/contrib/openzfs/lib/libzfs/libzfs_dataset.c | 49 +- sys/contrib/openzfs/lib/libzfs/libzfs_diff.c | 4 +- sys/contrib/openzfs/lib/libzfs/libzfs_impl.h | 17 + sys/contrib/openzfs/lib/libzfs/libzfs_mount.c | 43 +- sys/contrib/openzfs/lib/libzfs/libzfs_pool.c | 2 +- sys/contrib/openzfs/lib/libzfs/libzfs_sendrecv.c | 2 +- .../openzfs/lib/libzfs/os/freebsd/libzfs_zmount.c | 11 + .../openzfs/lib/libzfs/os/linux/libzfs_mount_os.c | 143 +++++ sys/contrib/openzfs/lib/libzfs_core/Makefile.am | 1 + sys/contrib/openzfs/lib/libzfsbootenv/Makefile.am | 1 + sys/contrib/openzfs/lib/libzpool/Makefile.am | 1 + sys/contrib/openzfs/lib/libzstd/Makefile.am | 1 + sys/contrib/openzfs/lib/libzutil/Makefile.am | 1 + .../lib/libzutil/os/linux/zutil_device_path_os.c | 16 +- sys/contrib/openzfs/man/Makefile.am | 1 + .../icp/asm-aarch64/blake3/b3_aarch64_sse2.S | 4 +- .../icp/asm-aarch64/blake3/b3_aarch64_sse41.S | 4 +- sys/contrib/openzfs/module/nvpair/nvpair.c | 5 +- .../openzfs/module/os/freebsd/spl/spl_cmn_err.c | 10 +- .../openzfs/module/os/freebsd/zfs/zfs_vnops_os.c | 4 +- .../openzfs/module/os/linux/zfs/vdev_disk.c | 4 + .../openzfs/module/os/linux/zfs/zfs_ctldir.c | 35 +- sys/contrib/openzfs/module/os/linux/zfs/zfs_uio.c | 13 +- .../openzfs/module/os/linux/zfs/zfs_vfsops.c | 231 +------ sys/contrib/openzfs/module/os/linux/zfs/zpl_file.c | 44 +- .../openzfs/module/os/linux/zfs/zpl_super.c | 681 ++++++++++++++++++--- sys/contrib/openzfs/module/zfs/dbuf.c | 78 ++- sys/contrib/openzfs/module/zfs/dmu.c | 39 +- sys/contrib/openzfs/module/zfs/dmu_direct.c | 8 +- sys/contrib/openzfs/module/zfs/dmu_objset.c | 2 +- sys/contrib/openzfs/module/zfs/dnode.c | 2 + sys/contrib/openzfs/module/zfs/dnode_sync.c | 105 ++-- sys/contrib/openzfs/module/zfs/dsl_bookmark.c | 18 +- sys/contrib/openzfs/module/zfs/dsl_dir.c | 2 +- sys/contrib/openzfs/module/zfs/range_tree.c | 2 +- sys/contrib/openzfs/module/zfs/spa.c | 2 +- sys/contrib/openzfs/module/zfs/spa_errlog.c | 2 +- sys/contrib/openzfs/module/zfs/spa_misc.c | 48 +- sys/contrib/openzfs/module/zfs/vdev.c | 29 +- sys/contrib/openzfs/module/zfs/vdev_draid.c | 76 ++- sys/contrib/openzfs/module/zfs/vdev_mirror.c | 13 +- sys/contrib/openzfs/module/zfs/vdev_raidz.c | 44 +- sys/contrib/openzfs/module/zfs/vdev_rebuild.c | 56 +- sys/contrib/openzfs/module/zfs/zfs_ioctl.c | 1 + sys/contrib/openzfs/module/zfs/zio.c | 6 +- sys/contrib/openzfs/rpm/Makefile.am | 1 + sys/contrib/openzfs/scripts/Makefile.am | 1 + sys/contrib/openzfs/scripts/spdxcheck.pl | 35 +- sys/contrib/openzfs/scripts/zfs-tests.sh | 16 +- sys/contrib/openzfs/tests/Makefile.am | 1 + sys/contrib/openzfs/tests/runfiles/common.run | 15 +- sys/contrib/openzfs/tests/runfiles/linux.run | 4 + .../openzfs/tests/test-runner/bin/zts-report.py.in | 3 +- sys/contrib/openzfs/tests/zfs-tests/Makefile.am | 1 + sys/contrib/openzfs/tests/zfs-tests/cmd/.gitignore | 2 + .../openzfs/tests/zfs-tests/cmd/Makefile.am | 4 + .../tests/zfs-tests/cmd/clone_after_trunc.c | 117 ++++ sys/contrib/openzfs/tests/zfs-tests/cmd/setlease.c | 126 ++++ .../openzfs/tests/zfs-tests/cmd/threadsappend.c | 8 +- .../openzfs/tests/zfs-tests/include/commands.cfg | 6 +- .../openzfs/tests/zfs-tests/include/libtest.shlib | 15 + .../openzfs/tests/zfs-tests/tests/Makefile.am | 11 + .../block_cloning/block_cloning_after_trunc.ksh | 31 + .../tests/functional/cli_root/zfs_list/cleanup.ksh | 30 + .../tests/functional/cli_root/zfs_list/setup.ksh | 32 + .../cli_root/zfs_list/zfs_list_009_pos.ksh | 69 +++ .../tests/functional/fadvise/fadvise_dontneed.ksh | 70 +++ .../zfs-tests/tests/functional/lease/cleanup.ksh | 26 + .../tests/functional/lease/lease_setlease.ksh | 44 ++ .../zfs-tests/tests/functional/lease/setup.ksh | 27 + .../tests/functional/redundancy/redundancy.kshlib | 71 ++- .../functional/redundancy/redundancy_draid.ksh | 12 +- .../redundancy/redundancy_draid_damaged1.ksh | 7 +- .../redundancy/redundancy_draid_damaged2.ksh | 14 +- .../redundancy/redundancy_draid_degraded1.ksh | 136 ++++ .../redundancy/redundancy_draid_degraded2.ksh | 152 +++++ .../redundancy/redundancy_draid_spare1.ksh | 13 +- .../redundancy/redundancy_draid_spare2.ksh | 8 +- .../redundancy/redundancy_draid_spare3.ksh | 28 +- sys/contrib/openzfs/udev/Makefile.am | 1 + sys/modules/zfs/zfs_config.h | 29 +- sys/modules/zfs/zfs_gitrev.h | 2 +- 319 files changed, 3254 insertions(+), 837 deletions(-) diff --git a/sys/contrib/openzfs/.github/workflows/checkstyle.yaml b/sys/contrib/openzfs/.github/workflows/checkstyle.yaml index a01a4fe8587c..ddcc2b8581fa 100644 --- a/sys/contrib/openzfs/.github/workflows/checkstyle.yaml +++ b/sys/contrib/openzfs/.github/workflows/checkstyle.yaml @@ -56,9 +56,10 @@ jobs: - name: Prepare artifacts if: failure() && steps.CheckABI.outcome == 'failure' run: | - find -name *.abi | tar -cf abi_files.tar -T - - - uses: actions/upload-artifact@v4 + find -name *.abi | tar -cjf abi_files.tar.bz2 -T - + - uses: actions/upload-artifact@v7 if: failure() && steps.CheckABI.outcome == 'failure' with: name: New ABI files (use only if you're sure about interface changes) - path: abi_files.tar + path: abi_files.tar.bz2 + archive: false diff --git a/sys/contrib/openzfs/.github/workflows/codeql.yml b/sys/contrib/openzfs/.github/workflows/codeql.yml index e975d7dd00b9..689fe71fddc3 100644 --- a/sys/contrib/openzfs/.github/workflows/codeql.yml +++ b/sys/contrib/openzfs/.github/workflows/codeql.yml @@ -28,7 +28,7 @@ jobs: echo "MAKEFLAGS=-j$(nproc)" >> $GITHUB_ENV - name: Checkout repository - uses: actions/checkout@v4 + uses: actions/checkout@v6 - name: Initialize CodeQL uses: github/codeql-action/init@v3 diff --git a/sys/contrib/openzfs/.github/workflows/scripts/generate-ci-type.py b/sys/contrib/openzfs/.github/workflows/scripts/generate-ci-type.py index 059d6ad3872b..b1910ab630af 100755 --- a/sys/contrib/openzfs/.github/workflows/scripts/generate-ci-type.py +++ b/sys/contrib/openzfs/.github/workflows/scripts/generate-ci-type.py @@ -3,13 +3,16 @@ """ Determine the CI type based on the change list and commit message. -Prints "quick" if (explicity required by user): +Output format: " " where source is "manual" (from +ZFS-CI-Type commit tag) or "auto" (from file change heuristics). + +Prints "quick manual" if: - the *last* commit message contains 'ZFS-CI-Type: quick' -or if (heuristics): +or "quick auto" if (heuristics): - the files changed are not in the list of specified directories, and - all commit messages do not contain 'ZFS-CI-Type: (full|linux|freebsd)' -Otherwise prints "full". +Otherwise prints "full auto" (or " manual" if explicitly requested). """ import sys @@ -58,9 +61,10 @@ if __name__ == '__main__': head, base = sys.argv[1:3] - def output_type(type, reason): - print(f'{prog}: will run {type} CI: {reason}', file=sys.stderr) - print(type) + def output_type(type, source, reason): + print(f'{prog}: will run {type} CI ({source}): {reason}', + file=sys.stderr) + print(f'{type} {source}') sys.exit(0) # check last (HEAD) commit message @@ -70,7 +74,8 @@ if __name__ == '__main__': for line in last_commit_message_raw.stdout.decode().splitlines(): if line.strip().lower() == 'zfs-ci-type: quick': - output_type('quick', f'requested by HEAD commit {head}') + output_type('quick', 'manual', + f'requested by HEAD commit {head}') # check all commit messages all_commit_message_raw = subprocess.run([ @@ -84,11 +89,14 @@ if __name__ == '__main__': if line.startswith('ZFS-CI-Commit:'): commit_ref = line.lstrip('ZFS-CI-Commit:').rstrip() if line.strip().lower() == 'zfs-ci-type: freebsd': - output_type('freebsd', f'requested by commit {commit_ref}') + output_type('freebsd', 'manual', + f'requested by commit {commit_ref}') if line.strip().lower() == 'zfs-ci-type: linux': - output_type('linux', f'requested by commit {commit_ref}') + output_type('linux', 'manual', + f'requested by commit {commit_ref}') if line.strip().lower() == 'zfs-ci-type: full': - output_type('full', f'requested by commit {commit_ref}') + output_type('full', 'manual', + f'requested by commit {commit_ref}') # check changed files changed_files_raw = subprocess.run([ @@ -104,9 +112,10 @@ if __name__ == '__main__': for r in FULL_RUN_REGEX: if r.match(f): output_type( - 'full', + 'full', 'auto', f'changed file "{f}" matches pattern "{r.pattern}"' ) # catch-all - output_type('quick', 'no changed file matches full CI patterns') + output_type('quick', 'auto', + 'no changed file matches full CI patterns') diff --git a/sys/contrib/openzfs/.github/workflows/scripts/merge_summary.awk b/sys/contrib/openzfs/.github/workflows/scripts/merge_summary.awk index 2b00d00226c9..8a4ce9a2be06 100755 --- a/sys/contrib/openzfs/.github/workflows/scripts/merge_summary.awk +++ b/sys/contrib/openzfs/.github/workflows/scripts/merge_summary.awk @@ -17,6 +17,7 @@ BEGIN { pass=0 fail=0 skip=0 + killed=0 state="" cl=0 el=0 @@ -49,6 +50,37 @@ BEGIN { /PASS/{ if (state=="pass_count") {pass += $2}} /FAIL/{ if (state=="pass_count") {fail += $2}} /SKIP/{ if (state=="pass_count") {skip += $2}} + +# If the test was killed, you'll get a line like: +# +# [2026-04-22T03:34:17.694616] Test (Linux): /usr/share/zfs/zfs-tests/tests/functional/io/setup (run as root) [10:00] [KILLED] +# +# Parse out the test name minus the /usr/share/zfs/zfs-tests/tests/functional/' +# part, and include the optional "(Linux): " line, as you can have the killed +# tests in two categories, like: +# +# KILLED (Linux): io/setup +# KILLED io/setup +# +/KILLED/{ + extra="" + for(i=1; i<=NF; i++) { + # Look for optional "(Linux):" field + if ($i ~ "\\("){ + extra=$i" "} + + # Look for a field with a '/' in it. It is the test name. + if($i ~ "/") { + testname=$i + # Remove /usr/share/zfs/zfs-test/test/functional string + sub(/\/usr\/share\/zfs\/zfs-tests\/tests\/functional\//,"",testname) + testname=extra""testname + killed_tests[killed] = testname + killed++ + break + } + } +} /Running Time/{ state=""; running[i]=$3; @@ -106,4 +138,10 @@ END { asort(unexpected_lines, sorted) for (j in sorted) print sorted[j] + + # We don't want to sort killed tests, as the first test that was killed + # most likely caused the others to be killed. + print "\n\nTests that were killed:" + for (j in killed_tests) + print " KILLED "killed_tests[j] } diff --git a/sys/contrib/openzfs/.github/workflows/scripts/qemu-1-setup.sh b/sys/contrib/openzfs/.github/workflows/scripts/qemu-1-setup.sh index 3d111561272d..5c41a4d6a497 100755 --- a/sys/contrib/openzfs/.github/workflows/scripts/qemu-1-setup.sh +++ b/sys/contrib/openzfs/.github/workflows/scripts/qemu-1-setup.sh @@ -6,6 +6,27 @@ set -eu +# The default runner has a bunch of development tools and other things +# that we do not need. Remove them here to free up a total of 35GB. +# +# First remove packages - this frees up ~10GB +echo "Disk space before purge:" +df -h / +sudo docker image prune --all --force +sudo docker builder prune -a +unneeded="microsoft-edge-stable|azure-cli|google-cloud|google-chrome-stable|"\ +"temurin|llvm|firefox|mysql-server|snapd|android|dotnet|haskell|ghcup|"\ +"powershell|julia|swift|miniconda|chromium" +sudo apt-get -y remove $(dpkg-query -f '${binary:Package}\n' -W | grep -E "'$unneeded'") +sudo apt-get -y autoremove + +# Next, remove unneeded files in /usr. This frees up an additional 25GB. +sudo rm -fr /usr/local/lib/android /usr/share/dotnet /usr/local/.ghcup \ + /usr/share/swift /usr/local/share/powershell /usr/local/julia* \ + /usr/share/miniconda /usr/local/share/chromium +echo "Disk space after:" +df -h / + # The default 'azure.archive.ubuntu.com' mirrors can be really slow. # Prioritize the official Ubuntu mirrors. # @@ -42,7 +63,7 @@ sudo swapoff -a # configurations. On one config you get two 75GB block devices, and on the # other you get a single 150GB block device. Here's what both look like: # -# --- Two 75GB block devices --- +# --- One 150GB block device --- # NAME MAJ:MIN RM SIZE RO TYPE MOUNTPOINTS # sda 8:0 0 150G 0 disk # ├─sda1 8:1 0 149G 0 part / @@ -56,7 +77,7 @@ sudo swapoff -a # lrwxrwxrwx 1 root root 11 Jan 29 18:07 azure_root-part15 -> ../../sda15 # lrwxrwxrwx 1 root root 11 Jan 29 18:07 azure_root-part16 -> ../../sda16 # -# --- One 150GB block device --- +# --- Two 75GB block devices --- # NAME MAJ:MIN RM SIZE RO TYPE MOUNTPOINTS # sda 8:0 0 75G 0 disk # ├─sda1 8:1 0 74G 0 part / @@ -118,18 +139,20 @@ fi sudo mkswap $SWAP sudo swapon $SWAP +echo "Block devices:" +lsblk + # adjust zfs module parameter and create pool -exec 1>/dev/null ARC_MIN=$((1024*1024*256)) ARC_MAX=$((1024*1024*512)) -echo $ARC_MIN | sudo tee /sys/module/zfs/parameters/zfs_arc_min -echo $ARC_MAX | sudo tee /sys/module/zfs/parameters/zfs_arc_max -echo 1 | sudo tee /sys/module/zfs/parameters/zvol_use_blk_mq +echo $ARC_MIN | sudo tee /sys/module/zfs/parameters/zfs_arc_min >/dev/null +echo $ARC_MAX | sudo tee /sys/module/zfs/parameters/zfs_arc_max >/dev/null +echo 1 | sudo tee /sys/module/zfs/parameters/zvol_use_blk_mq >/dev/null sudo zpool create -f -o ashift=12 zpool $DISKS -O relatime=off \ -O atime=off -O xattr=sa -O compression=lz4 -O sync=disabled \ -O redundant_metadata=none -O mountpoint=/mnt/tests +echo "Status:" +zpool status -# no need for some scheduler -for i in /sys/block/s*/queue/scheduler; do - echo "none" | sudo tee $i -done +echo "Last dmesg:" +sudo dmesg | tail -n 10 diff --git a/sys/contrib/openzfs/.github/workflows/scripts/qemu-2-start.sh b/sys/contrib/openzfs/.github/workflows/scripts/qemu-2-start.sh index 9a18ca659c44..e63aece389c0 100755 --- a/sys/contrib/openzfs/.github/workflows/scripts/qemu-2-start.sh +++ b/sys/contrib/openzfs/.github/workflows/scripts/qemu-2-start.sh @@ -78,11 +78,6 @@ case "$OS" in OPTS[0]="--boot" OPTS[1]="uefi=on" ;; - fedora41) - OSNAME="Fedora 41" - OSv="fedora-unknown" - URL="https://download.fedoraproject.org/pub/fedora/linux/releases/41/Cloud/x86_64/images/Fedora-Cloud-Base-Generic-41-1.4.x86_64.qcow2" - ;; fedora42) OSNAME="Fedora 42" OSv="fedora-unknown" @@ -93,6 +88,11 @@ case "$OS" in OSv="fedora-unknown" URL="https://download.fedoraproject.org/pub/fedora/linux/releases/43/Cloud/x86_64/images/Fedora-Cloud-Base-Generic-43-1.6.x86_64.qcow2" ;; + fedora44) + OSNAME="Fedora 44" + OSv="fedora-unknown" + URL="https://download.fedoraproject.org/pub/fedora/linux/releases/44/Cloud/x86_64/images/Fedora-Cloud-Base-Generic-44-1.7.x86_64.qcow2" + ;; freebsd13-5r) FreeBSD="13.5-RELEASE" OSNAME="FreeBSD $FreeBSD" @@ -101,13 +101,20 @@ case "$OS" in KSRC="$FREEBSD_REL/../amd64/$FreeBSD/src.txz" NIC="rtl8139" ;; - freebsd14-3r) - FreeBSD="14.3-RELEASE" + freebsd14-4r) + FreeBSD="14.4-RELEASE" OSNAME="FreeBSD $FreeBSD" OSv="freebsd14.0" URLxz="$FREEBSD_REL/$FreeBSD/amd64/Latest/FreeBSD-$FreeBSD-amd64-BASIC-CI.raw.xz" KSRC="$FREEBSD_REL/../amd64/$FreeBSD/src.txz" ;; + freebsd15-0r) + FreeBSD="15.0-RELEASE" + OSNAME="FreeBSD $FreeBSD" + OSv="freebsd15.0" + URLxz="$FREEBSD_REL/$FreeBSD/amd64/Latest/FreeBSD-$FreeBSD-amd64-BASIC-CI-ufs.raw.xz" + KSRC="$FREEBSD_REL/../amd64/$FreeBSD/src.txz" + ;; freebsd13-5s) FreeBSD="13.5-STABLE" OSNAME="FreeBSD $FreeBSD" @@ -116,15 +123,15 @@ case "$OS" in KSRC="$FREEBSD_SNAP/../amd64/$FreeBSD/src.txz" NIC="rtl8139" ;; - freebsd14-3s) - FreeBSD="14.3-STABLE" + freebsd14-4s) + FreeBSD="14.4-STABLE" OSNAME="FreeBSD $FreeBSD" OSv="freebsd14.0" URLxz="$FREEBSD_SNAP/$FreeBSD/amd64/Latest/FreeBSD-$FreeBSD-amd64-BASIC-CI-ufs.raw.xz" KSRC="$FREEBSD_SNAP/../amd64/$FreeBSD/src.txz" ;; - freebsd15-0s) - FreeBSD="15.0-STABLE" + freebsd15-1s) + FreeBSD="15.1-PRERELEASE" OSNAME="FreeBSD $FreeBSD" OSv="freebsd14.0" URLxz="$FREEBSD_SNAP/$FreeBSD/amd64/Latest/FreeBSD-$FreeBSD-amd64-BASIC-CI-ufs.raw.xz" @@ -193,17 +200,49 @@ DISK="/dev/zvol/zpool/openzfs" sudo zfs create -ps -b 64k -V 80g zpool/openzfs while true; do test -b $DISK && break; sleep 1; done -# we are downloading via axel, curl and wget are mostly slower and -# require more return value checking +# We first try to download with 'axel', which is faster than curl, but fallback +# to curl if that doesn't work. It is hoped that the curl fallback will get +# around the occasional "ERROR 502: Bad Gateway" errors. IMG="/mnt/tests/cloud-image" -if [ ! -z "$URLxz" ]; then - echo "Loading $URLxz ..." - time axel -q -o "$IMG" "$URLxz" - echo "Loading $KSRC ..." - time axel -q -o ~/src.txz $KSRC -else - echo "Loading $URL ..." - time axel -q -o "$IMG" "$URL" +for cmd in 'axel -q -o' 'curl --fail -LSs -o' ; do + if [ ! -z "$URLxz" ]; then + echo "Loading $URLxz with $cmd..." + time eval "$cmd $IMG $URLxz" || true + + if [ ! -s ~/src.txz ] ; then + echo "Loading $KSRC with $cmd..." + time eval "$cmd ~/src.txz $KSRC" || true + fi + else + echo "Loading $URL with $cmd..." + time eval "$cmd $IMG $URL" || true + fi + + if [ -s "$IMG" ] ; then + # Successful download + break + fi +done + +# SPECIAL CASE +# FreeBSD sometimes has broken links in their "current/" URL. Go back up a +# level and look for other images that might work. For example: +# +# https://download.freebsd.org/snapshots/CI-IMAGES/16.0-CURRENT/amd64/: +# +# 20251110/ +# 20251209/ +# 20260420/ +# current/ +# +# In this case let's say the raw.xz link in current/ is bad, so look though the +# other snapshot links for the newest existing raw.xz file. +if [ ! -z "$URLxz" ] && [ ! -s "$IMG" ] ; then + URLxz=$(wget --accept "*.raw.xz" --spider -np --recursive --no-verbose \ + $(dirname $(dirname $URLxz)) 2>&1 | awk '/200 OK/{print $(NF-2)}' | \ + sort -n | tail -n 1) + echo "Couldn't download FreeBSD raw.xz. Trying fallback snapshot $URLxz" + curl --fail -LSs -o $IMG $URLxz fi echo "Importing VM image to zvol..." diff --git a/sys/contrib/openzfs/.github/workflows/scripts/qemu-3-deps-vm.sh b/sys/contrib/openzfs/.github/workflows/scripts/qemu-3-deps-vm.sh index c8e1a015abd9..6a83ef45fd26 100755 --- a/sys/contrib/openzfs/.github/workflows/scripts/qemu-3-deps-vm.sh +++ b/sys/contrib/openzfs/.github/workflows/scripts/qemu-3-deps-vm.sh @@ -3,8 +3,11 @@ ###################################################################### # 3) install dependencies for compiling and loading # -# $1: OS name (like 'fedora41') -# $2: (optional) Experimental Fedora kernel version, like "6.14" to +# qemu-3-deps-vm.sh [--poweroff] OS_NAME [FEDORA_VERSION] +# +# --poweroff: Power off the VM after installing dependencies +# OS_NAME: OS name (like 'fedora41') +# FEDORA_VERSION: (optional) Experimental Fedora kernel version, like "6.14" to # install instead of Fedora defaults. ###################################################################### @@ -153,6 +156,12 @@ function install_fedora_experimental_kernel { sudo dnf -y copr disable @kernel-vanilla/mainline } +POWEROFF="" +if [ "$1" == "--poweroff" ] ; then + POWEROFF=1 + shift +fi + # Install dependencies case "$1" in almalinux8) @@ -212,6 +221,11 @@ case "$1" in sudo apt-get install -yq linux-tools-common libtirpc-dev \ linux-modules-extra-$(uname -r) sudo apt-get install -yq dh-sequence-dkms + + # Need 'build-essential' explicitly for ARM builder + # https://github.com/actions/runner-images/issues/9946 + sudo apt-get install -yq build-essential + echo "##[endgroup]" echo "##[group]Delete Ubuntu OpenZFS modules" for i in $(find /lib/modules -name zfs -type d); do sudo rm -rvf $i; done @@ -306,5 +320,7 @@ esac # reset cloud-init configuration and poweroff sudo cloud-init clean --logs -sleep 2 && sudo poweroff & +if [ "$POWEROFF" == "1" ] ; then + sleep 2 && sudo poweroff & +fi exit 0 diff --git a/sys/contrib/openzfs/.github/workflows/scripts/qemu-4-build-vm.sh b/sys/contrib/openzfs/.github/workflows/scripts/qemu-4-build-vm.sh index 38255cf39966..bbfa2ec85b8f 100755 --- a/sys/contrib/openzfs/.github/workflows/scripts/qemu-4-build-vm.sh +++ b/sys/contrib/openzfs/.github/workflows/scripts/qemu-4-build-vm.sh @@ -350,7 +350,16 @@ fi # save some sysinfo uname -a > /var/tmp/uname.txt -cd $HOME/zfs +# Check if we're running this script from within a VM or on the runner itself. +# Most of the time we will be running in a VM, but the ARM builder actually +# runs this script on the runner. If we happen to be running on the ARM +# runner, we will start in the ZFS source directory. If we're running on a VM +# then we'll just start in our home directory, and will need to 'cd' into our +# source directory. +if [ ! -e META ] ; then + cd $HOME/zfs +fi + export PATH="$PATH:/sbin:/usr/sbin:/usr/local/sbin" extra="" diff --git a/sys/contrib/openzfs/.github/workflows/scripts/qemu-6-tests.sh b/sys/contrib/openzfs/.github/workflows/scripts/qemu-6-tests.sh index 8dad30fe4a5a..c261cbfca06d 100755 --- a/sys/contrib/openzfs/.github/workflows/scripts/qemu-6-tests.sh +++ b/sys/contrib/openzfs/.github/workflows/scripts/qemu-6-tests.sh @@ -222,9 +222,9 @@ TAGS=$NUM/$DEN sudo dmesg -c > dmesg-prerun.txt mount > mount.txt df -h > df-prerun.txt -$TDIR/zfs-tests.sh -vKO -s 3GB -T $TAGS +RV=0 +$TDIR/zfs-tests.sh -vKO -s 3GB -T $TAGS || RV=$? -RV=$? df -h > df-postrun.txt echo $RV > tests-exitcode.txt sync diff --git a/sys/contrib/openzfs/.github/workflows/scripts/qemu-7-prepare.sh b/sys/contrib/openzfs/.github/workflows/scripts/qemu-7-prepare.sh index 98a5c24c2521..51ae82567c2c 100755 --- a/sys/contrib/openzfs/.github/workflows/scripts/qemu-7-prepare.sh +++ b/sys/contrib/openzfs/.github/workflows/scripts/qemu-7-prepare.sh @@ -13,16 +13,29 @@ source env.txt mkdir -p $RESPATH +TARNAME=qemu-$OS + # check if building the module has failed if [ -z ${VMs:-} ]; then cd $RESPATH echo ":exclamation: ZFS module didn't build successfully :exclamation:" \ | tee summary.txt | tee /tmp/summary.txt cp /var/tmp/*.txt . - tar cf /tmp/qemu-$OS.tar -C $RESPATH -h . || true + + # rename /var/tmp/test_results to /var/tmp/qemu-$OS + mv $RESPATH $(dirname $RESPATH)/$TARNAME + tar cjf /tmp/$TARNAME.tar.bz2 -C $(dirname $RESPATH) -h $TARNAME || true + # move it back to /var/tmp/test_results (needed for next script) + mv $(dirname $RESPATH)/$TARNAME $RESPATH + exit 0 fi +if ! grep -q vm /etc/hosts ; then + echo "No vm* hostnames, VMs probably didn't startup" + exit 0 +fi + # build was okay BASE="$HOME/work/zfs/zfs" MERGE="$BASE/.github/workflows/scripts/merge_summary.awk" @@ -38,6 +51,11 @@ cd $RESPATH # prepare result files for summary for ((i=1; i<=VMs; i++)); do + + # no results, VM either didn't start or was unreachable, create + # the missing directory which is expected by subsequent steps + test -d vm$i || mkdir -p vm$i + file="vm$i/build-stderr.txt" test -s $file && mv -f $file build-stderr.txt @@ -48,12 +66,14 @@ for ((i=1; i<=VMs; i++)); do test -s $file && mv -f $file uname.txt file="vm$i/tests-exitcode.txt" - if [ ! -s $file ]; then - # XXX - add some tests for kernel panic's here - # tail -n 80 vm$i/console.txt | grep XYZ - echo 1 > $file + if [ ! -s "$file" ]; then + # Print in bold red + echo -e "\033[1;31mVM$i didn't finish ZTS and may have crashed!\033[0m" >> extra + + # ENOENT=2 + echo 2 > "$file" fi - rv=$(cat vm$i/tests-exitcode.txt) + rv=$(cat "$file") test $rv != 0 && touch /tmp/have_failed_tests file="vm$i/current/log" @@ -76,6 +96,14 @@ done if [ -s summary ]; then $MERGE summary | grep -v '^/' > summary.txt $MERGE summary | $BASE/scripts/zfs-tests-color.sh > /tmp/summary.txt + + # Add in additional 'extra' text at the end, if file is present. + if [ -s extra ] ; then + echo "" >> /tmp/summary.txt + cat extra >> /tmp/summary.txt + rm -f extra + fi + rm -f summary else touch summary.txt /tmp/summary.txt @@ -121,4 +149,9 @@ if [ ! -s uname.txt ]; then fi # artifact ready now -tar cf /tmp/qemu-$OS.tar -C $RESPATH -h . || true +# +# rename /var/tmp/test_results to /var/tmp/qemu-$OS +mv $RESPATH $(dirname $RESPATH)/$TARNAME +tar cjf /tmp/$TARNAME.tar.bz2 -C $(dirname $RESPATH) -h $TARNAME || true +# move it back to /var/tmp/test_results (needed for next script) +mv $(dirname $RESPATH)/$TARNAME $RESPATH diff --git a/sys/contrib/openzfs/.github/workflows/scripts/qemu-8-summary.sh b/sys/contrib/openzfs/.github/workflows/scripts/qemu-8-summary.sh index 00a4bf1ae325..39b3d124c794 100755 --- a/sys/contrib/openzfs/.github/workflows/scripts/qemu-8-summary.sh +++ b/sys/contrib/openzfs/.github/workflows/scripts/qemu-8-summary.sh @@ -37,9 +37,11 @@ function showfile_tail() { echo "##[endgroup]" } -# overview -cat /tmp/summary.txt -echo "" +# overview if available +if [ -f /tmp/summary.txt -a -s /tmp/summary.txt ]; then + cat /tmp/summary.txt + echo "" +fi if [ -f /tmp/have_failed_tests -a -s /tmp/failed.txt ]; then echo "Debuginfo of failed tests:" diff --git a/sys/contrib/openzfs/.github/workflows/scripts/qemu-9-summary-page.sh b/sys/contrib/openzfs/.github/workflows/scripts/qemu-9-summary-page.sh index 737dda01b565..1200f4de2b94 100755 --- a/sys/contrib/openzfs/.github/workflows/scripts/qemu-9-summary-page.sh +++ b/sys/contrib/openzfs/.github/workflows/scripts/qemu-9-summary-page.sh @@ -33,7 +33,9 @@ function send2github() { # first call, generate all summaries if [ ! -f out-1.md ]; then logfile="1" - for tarfile in Logs-functional-*/qemu-*.tar; do + # The bz2 files are put into directories with the same name, like: + # "qemu-debian12.tar.bz2/qemu-debian12.tar.bz2" + for tarfile in qemu-*.tar.bz2/qemu-*.tar.bz2; do rm -rf vm* *.txt if [ ! -s "$tarfile" ]; then output "\n## Functional Tests: unknown\n" diff --git a/sys/contrib/openzfs/.github/workflows/smatch.yml b/sys/contrib/openzfs/.github/workflows/smatch.yml index ac6454244f93..305a1f0179bd 100644 --- a/sys/contrib/openzfs/.github/workflows/smatch.yml +++ b/sys/contrib/openzfs/.github/workflows/smatch.yml @@ -13,7 +13,7 @@ jobs: runs-on: ubuntu-24.04 steps: - name: Checkout smatch - uses: actions/checkout@v4 + uses: actions/checkout@v6 with: repository: error27/smatch ref: master @@ -26,7 +26,7 @@ jobs: cd $GITHUB_WORKSPACE/smatch make -j$(nproc) - name: Checkout OpenZFS - uses: actions/checkout@v4 + uses: actions/checkout@v6 with: ref: ${{ github.event.pull_request.head.sha }} *** 7802 LINES SKIPPED *** From nobody Fri May 15 00:04:04 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 4gGnVX27srz6cPpv for ; Fri, 15 May 2026 00:04:04 +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 "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gGnVX1MgNz3vkN for ; Fri, 15 May 2026 00:04:04 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778803444; 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=+/bFV12+g+IPpgTYCPd/kP0huWhbdZiPHJfqE+eU2zo=; b=kKtRhDW+sQUdIuXT4W52C3Yv4+z6qud3FR/tbTJxUTQ2NEAT9g356nTC4n/rTS9UnUVb22 gWkmqIJnBIA/WTtiSkxgWL3YbzT71qNhIfiZO/IT+jtbKTymFubO4H4Mhx9o3K0QSNdllR FxvB4aVNYojJInk77SS2bbFdHV5mTxTQA4yq46mQOj8fioPDpFDl9LdUIn2mR98Erhlc+I IIMnITUz5grrcdmRy59y6X5uU2/ZUVdaqtpIZlLCJvS7UwGuBgfXtfG8+FJUHwnlbwC9rb VuxRXvVpkdcsh6/SWSt2uzCcEibWkosnskEpGDPmLdPPTfHfsHoIjMTC3s9Mgw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778803444; a=rsa-sha256; cv=none; b=O17Gnh5p7Q7nVU939jIOgaLu6mZzv1VfyemjYrEy9TJsPK27jxPipyEZZbmsQq1ff3uHGr QFDt/bzW8Mp2yrsogQWiIKoLB8gd/iroDDogQqZKJc7YI39AV8YZRhF4+sSAEn1duO78Pl tiMtyi6JG+Y+EzOJS03gUe8d+mCJpJyGILFiQ7rNcDfgmj7TlbvqZd/SPUjtvTDoycgrFN h/rqUcfbcVKpIxx2jp6TMgC7upN8jGPalsU5w/V9RNodgHxJBsqSFKjPWu/9oL5G9NMQc1 I1PAjfh/9w7D0rn+A60iIi1Y7+rHzYSNqsSCSdsi6gB9OQusiWrSsv72TuDd4A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778803444; 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=+/bFV12+g+IPpgTYCPd/kP0huWhbdZiPHJfqE+eU2zo=; b=y0XxNDUrKAy0OzsHeeeCr9qixvFRsR9Z/cJp32T4+zfgNhsAoxlIxprXqWqqF/v2tKRzon bn7rrZbgEq4yK1CJ/6OxG6S+uJ1rQELNKwPjW8Oe9ugPjZQ4EBjtThCXkRmsnq+NMuSgpN K5MATJgxsPcPbg32cSEfZ6kucWN3mJ7qQBAr5VHiNHBWlQtkIYRIlY/+EO2eNw10ACGEAF SXHSQKPA8YUiavOrGvQp0K146yG9V+W4jmqyj6dMRU9QNKKiEjTc9ikWOw5E5nam+YeJtp hK4joEkg6USWyZMo04jDJYR2wrqt7771h9Dp/wwSU0lBNCzpv1hGdntnbZbkFA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gGnVX0hZTz10DR for ; Fri, 15 May 2026 00:04:04 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1d7fc by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 15 May 2026 00:04:04 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Alexander Ziaee From: Colin Percival Subject: git: 10c4498f93d2 - releng/15.1 - Cloud releases: Switch to firstboot_pkg_upgrade 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: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org List-Id: 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: cperciva X-Git-Repository: src X-Git-Refname: refs/heads/releng/15.1 X-Git-Reftype: branch X-Git-Commit: 10c4498f93d29b1f2b672299c5bf8c0ee6ee3774 Auto-Submitted: auto-generated Date: Fri, 15 May 2026 00:04:04 +0000 Message-Id: <6a0662f4.1d7fc.2d11ba2f@gitrepo.freebsd.org> The branch releng/15.1 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=10c4498f93d29b1f2b672299c5bf8c0ee6ee3774 commit 10c4498f93d29b1f2b672299c5bf8c0ee6ee3774 Author: Alexander Ziaee AuthorDate: 2026-05-14 21:05:07 +0000 Commit: Colin Percival CommitDate: 2026-05-15 00:03:35 +0000 Cloud releases: Switch to firstboot_pkg_upgrade Cloud images are deployed with base system packages. Introduce a firstboot package auto updater to patch the base system on first boot. Approved by: re (cperciva) MFC after: 1 hour MFC to: stable/15 Reviewed by: cperciva Sponsored by: Google Cloud Differential Revision: https://reviews.freebsd.org/D56890 (cherry picked from commit 464a351267dc0d1843b919dd72ad1c70c24815ce) (cherry picked from commit 0bb2b2a45f3c0c147d7c55e010be45e55af8df87) --- release/tools/azure.conf | 5 +++-- release/tools/ec2-base.conf | 9 ++++++--- release/tools/gce.conf | 5 +++-- 3 files changed, 12 insertions(+), 7 deletions(-) diff --git a/release/tools/azure.conf b/release/tools/azure.conf index 7a4f0b5027cf..9a5c12424bd3 100644 --- a/release/tools/azure.conf +++ b/release/tools/azure.conf @@ -6,10 +6,10 @@ export VMSIZE=30g # Set to a list of packages to install. -export VM_EXTRA_PACKAGES="azure-agent python python3 firstboot-freebsd-update firstboot-pkgs" +export VM_EXTRA_PACKAGES="azure-agent python python3 firstboot-pkg-upgrade firstboot-pkgs" # Set to a list of third-party software to enable in rc.conf(5). -export VM_RC_LIST="ntpd sshd waagent firstboot_freebsd_update firstboot_pkgs" +export VM_RC_LIST="ntpd sshd waagent firstboot_pkg_upgrade firstboot_pkgs" # No swap space; waagent will allocate swap space on the resource disk. # See ResourceDisk.EnableSwap and ResourceDisk.SwapSizeMB in waagent.conf @@ -43,6 +43,7 @@ vm_extra_pre_umount() { cat << EOF >> ${DESTDIR}/etc/rc.conf ifconfig_hn0="SYNCDHCP" ntpd_sync_on_start="YES" +firstboot_pkg_upgrade_repos="FreeBSD-base" EOF cat << EOF >> ${DESTDIR}/boot/loader.conf diff --git a/release/tools/ec2-base.conf b/release/tools/ec2-base.conf index ffe2646240a5..24b2feb5f0d7 100644 --- a/release/tools/ec2-base.conf +++ b/release/tools/ec2-base.conf @@ -7,15 +7,15 @@ # * amazon-ssm-agent (not enabled by default, but some users need to use # it on systems not connected to the internet), # * ec2-scripts, which provides a range of EC2ification startup scripts, -# * firstboot-freebsd-update, to install security updates at first boot, +# * firstboot-pkg-upgrade, to install security updates at first boot, # * firstboot-pkgs, to install packages at first boot, and # * isc-dhcp44-client, used for IPv6 network setup. export VM_EXTRA_PACKAGES="${VM_EXTRA_PACKAGES} amazon-ssm-agent ec2-scripts \ - firstboot-freebsd-update firstboot-pkgs isc-dhcp44-client" + firstboot-pkg-upgrade firstboot-pkgs isc-dhcp44-client" # Services to enable in rc.conf(5). export VM_RC_LIST="${VM_RC_LIST} ec2_configinit ec2_ephemeral_swap \ - ec2_fetchkey ec2_loghostkey firstboot_freebsd_update firstboot_pkgs \ + ec2_fetchkey ec2_loghostkey firstboot_pkg_upgrade firstboot_pkgs \ growfs sshd" vm_extra_pre_umount() { @@ -24,6 +24,9 @@ vm_extra_pre_umount() { # via EC2 user-data. echo 'firstboot_pkgs_list="devel/py-awscli"' >> ${DESTDIR}/etc/rc.conf + # Limit firstboot_pkg_upgrade to the base system. + echo 'firstboot_pkg_upgrade_repos="FreeBSD-base"' >> ${DESTDIR}/etc/rc.conf + # Any EC2 ephemeral disks seen when the system first boots will # be "new" disks; there is no "previous boot" when they might have # been seen and used already. diff --git a/release/tools/gce.conf b/release/tools/gce.conf index 7298aabf3956..938672ac92e0 100644 --- a/release/tools/gce.conf +++ b/release/tools/gce.conf @@ -6,14 +6,14 @@ export VMSIZE=20g # Set to a list of packages to install. -export VM_EXTRA_PACKAGES="${VM_EXTRA_PACKAGES} firstboot-freebsd-update \ +export VM_EXTRA_PACKAGES="${VM_EXTRA_PACKAGES} firstboot-pkg-upgrade \ firstboot-pkgs google-cloud-sdk panicmail sudo \ sysutils/py-google-compute-engine lang/python \ lang/python3" # Set to a list of third-party software to enable in rc.conf(5). export VM_RC_LIST="ntpd sshd growfs \ - firstboot_pkgs firstboot_freebsd_update google_startup \ + firstboot_pkgs firstboot_pkg_upgrade google_startup \ google_accounts_daemon google_clock_skew_daemon \ google_instance_setup google_network_daemon" @@ -47,6 +47,7 @@ ifconfig_DEFAULT="SYNCDHCP mtu 1460" ntpd_sync_on_start="YES" # need to fill in something here #firstboot_pkgs_list="" +firstboot_pkg_upgrade_repos="FreeBSD-base" panicmail_autosubmit="YES" EOF From nobody Fri May 15 00:04:05 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 4gGnVY3rV8z5w4yy for ; Fri, 15 May 2026 00:04:05 +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 "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gGnVY1sPMz3vJH for ; Fri, 15 May 2026 00:04:05 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778803445; 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=Ms2W2S1GM1Zi4ELEwgHo1Dhx9mT0+nNluoI6TUqwxz8=; b=UeLt9ciXUy6bLgVhlXG0tHfm8hZkjUgVBxaEj14GC1pf//SwBn+dUwlOHBF0XBtsSSQ65O JSmxMCmOM0kauBG+7mVHz1N8hkkpKU+1LnRm51Tdyga3QfSh+7xZcjAH1KxRKkSnDPf1eL 0epyzXrQKhhwyqwitGC4lObpemgX9CdnvWslIr2p8QUFybMRR9cYZifkerixJ52xekDWnJ yOIJdUCl4T3do4pbgkj5T674v5292iwtCoIxpXYP5JVQ8emQiARtLOcCHJhfnRpc44YKeF gpeFPvjKIhwTuIa+f3G7hoFg8qIqGd8dKKCOnLPULeVtfAJdl6SWaf303DPpOA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778803445; a=rsa-sha256; cv=none; b=PvBlJiZwsjWVE2Wwqi41XpnDkoQ3Fws4anXzTB86VgJPbILmrGcclrjJ1OaQv75FIrQKjA liaAFjJpptIfRpkGonhVhBGtZC2iUcbtcyobpfgUGHDaGfmwjRZhBazfken2KCY+PUnbq1 41Cj3rUuUpxF3xdON9R4hPItVjy5U7ZuZ+HuwKt0KXrVMuA9MZLlkJjYRojvIVvFlroMXJ gD5DI9jaB3Jy7xLdcEGctk0fhR3cKrVvAZd9HMeYz3/oBeSorzqPjfKw6HLa/hno1aORBZ ias3EHjKXSz+wf1Y4SGByNkpI23G5Qm8lpJ6zqIR1g6F2OUWR3Wx0uc6GZm1kg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778803445; 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=Ms2W2S1GM1Zi4ELEwgHo1Dhx9mT0+nNluoI6TUqwxz8=; b=vEF/670aMAXgXCbpcAHNMMSmKq6TqNmNIJrkQQN7oyl1eysjNMulqJXLl7rg9NiYsjKu/G 7VdWpwoTM86Sh/lgYBgarpGoyvHuT5rsRwneXpioKxVMNQH4w5avJwwOQoLFIYjxRA5+g6 +wg8sivJpxHbdeub3Gj7pu3Zu8pODaTX4Hi5h2NHbQo73PbRmNyC2FVlwxF2lnrCzcVh+F OBNPMZccbygMkVMi255FtVM99JUXR4IuV5JAVz58oIWXoMMTvi58I44gbd7475Nqi0ekLs KdCovQQvU94TN4jvnp77dIoDP9g9n19mIw4b09u1yFUn/shZsKBVoPqrzIQxwA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gGnVY1Plnz10Bm for ; Fri, 15 May 2026 00:04:05 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1e491 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 15 May 2026 00:04:05 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Colin Percival Subject: git: 73ec43ab702f - releng/15.1 - Cloud releases: More firstboot_pkg_upgrade 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: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org List-Id: 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: cperciva X-Git-Repository: src X-Git-Refname: refs/heads/releng/15.1 X-Git-Reftype: branch X-Git-Commit: 73ec43ab702fb06bf870af161919ad9423cddd19 Auto-Submitted: auto-generated Date: Fri, 15 May 2026 00:04:05 +0000 Message-Id: <6a0662f5.1e491.2b84b0ca@gitrepo.freebsd.org> The branch releng/15.1 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=73ec43ab702fb06bf870af161919ad9423cddd19 commit 73ec43ab702fb06bf870af161919ad9423cddd19 Author: Colin Percival AuthorDate: 2026-05-14 21:14:09 +0000 Commit: Colin Percival CommitDate: 2026-05-15 00:03:49 +0000 Cloud releases: More firstboot_pkg_upgrade Update a couple more cloudware images which I forgot about earlier. Approved by: re (cperciva) Reviewed by: ziaee Fixes: 464a351267dc ("Cloud releases: Switch to firstboot_pkg_upgrade") Differential Revision: https://reviews.freebsd.org/D57006 (cherry picked from commit 4080419d9a2d88d44d20baaf3ea01934561819c1) (cherry picked from commit 1ae97c95d025277fb542936b0a2686180dd4a7b7) --- release/tools/basic-cloudinit.conf | 7 ++++--- release/tools/ec2-small.conf | 9 ++++++--- 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/release/tools/basic-cloudinit.conf b/release/tools/basic-cloudinit.conf index 98e11f0bb08b..621165ea1669 100644 --- a/release/tools/basic-cloudinit.conf +++ b/release/tools/basic-cloudinit.conf @@ -8,16 +8,17 @@ export CONFIG_DRIVE=YES export CONFIG_DRIVE_SIZE=1M # Packages to install into the image we're creating. -# * firstboot-freebsd-update, to install security updates at first boot. -export VM_EXTRA_PACKAGES="${VM_EXTRA_PACKAGES} firstboot-freebsd-update" +# * firstboot-pkg-upgrade, to install security updates at first boot. +export VM_EXTRA_PACKAGES="${VM_EXTRA_PACKAGES} firstboot-pkg-upgrade" # Set to a list of third-party software to enable in rc.conf(5). -export VM_RC_LIST="${VM_RC_LIST} firstboot_freebsd_update growfs sshd nuageinit" +export VM_RC_LIST="${VM_RC_LIST} firstboot_pkg_upgrade growfs sshd nuageinit" vm_extra_pre_umount() { cat << EOF >> ${DESTDIR}/etc/rc.conf dumpdev="AUTO" ifconfig_DEFAULT="SYNCDHCP accept_rtadv" +firstboot_pkg_upgrade_repos="FreeBSD-base" # RSA host keys are obsolete and also very slow to generate sshd_rsa_enable="NO" EOF diff --git a/release/tools/ec2-small.conf b/release/tools/ec2-small.conf index 6564a59c2cf6..f5904d5ea4ba 100644 --- a/release/tools/ec2-small.conf +++ b/release/tools/ec2-small.conf @@ -25,18 +25,21 @@ vm_extra_filter_base_packages() { # Packages to install into the image we're creating. In addition to packages # present on all EC2 AMIs, we install: # * ec2-scripts, which provides a range of EC2ification startup scripts, -# * firstboot-freebsd-update, to install security updates at first boot, +# * firstboot-pkg-upgrade, to install security updates at first boot, # * firstboot-pkgs, to install packages at first boot, and # * isc-dhcp44-client, used for IPv6 network setup. export VM_EXTRA_PACKAGES="${VM_EXTRA_PACKAGES} ec2-scripts \ - firstboot-freebsd-update firstboot-pkgs isc-dhcp44-client" + firstboot-pkg-upgrade firstboot-pkgs isc-dhcp44-client" # Services to enable in rc.conf(5). export VM_RC_LIST="${VM_RC_LIST} ec2_configinit ec2_ephemeral_swap \ - ec2_fetchkey ec2_loghostkey firstboot_freebsd_update firstboot_pkgs \ + ec2_fetchkey ec2_loghostkey firstboot_pkg_upgrade firstboot_pkgs \ growfs sshd" vm_extra_pre_umount() { + # Limit firstboot_pkg_upgrade to the base system. + echo 'firstboot_pkg_upgrade_repos="FreeBSD-base"' >> ${DESTDIR}/etc/rc.conf + # Any EC2 ephemeral disks seen when the system first boots will # be "new" disks; there is no "previous boot" when they might have # been seen and used already. From nobody Fri May 15 03:37:30 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 4gGtDq0Ls4z6cjSQ; Fri, 15 May 2026 03:37:31 +0000 (UTC) (envelope-from danfe@freebsd.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2610:1c1:1:6074::16:84]) (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 "freefall.freebsd.org", Issuer "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gGtDp6dlKz4GrR; Fri, 15 May 2026 03:37:30 +0000 (UTC) (envelope-from danfe@freebsd.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778816250; 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: in-reply-to:in-reply-to:references:references; bh=/2ftWnyZU0bYSOlqka7YVcTba/Fs5ljHGcldewOGI6Y=; b=vmeNKDsNqFrpLFrXjOwi0hgfCpepIgW2YPwDAxszWj9Bqn0J4jHl4kOiu6CSlwJ22gN1zz jNsiXPpSMBTUBBI5v5eeWg5PmedJ2UHNVvwiyLubCTzIJdh3A7S/6lRmZwHlruJEAUBzzb Hrx1/1IyH84OOtbDFhWZR1SzQbG6Un+vkQKIIYuHiMZ0a2+aQjFDWYw+0VTNN9/qFP520z CVIa31yYNKUKocz49+EEQduAJOxxHNNOaXe5CKdTi41QWhsIu6BeSk/TTUkss/DaJ/qHjV BMOWtQVj7mSrYSxcY/mOzV+6Jktro6Egd/BKF3PoP9i5oempQM55x+O2mpUwTA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778816250; a=rsa-sha256; cv=none; b=gVJvwM+2JWc3KCDjzUeyLcTKg+LOetXYFFAkKCB1km3x8RYLOFmUazWMxfWkunAxw5NE7u ZPNryCLzWrOegEMaeZQNuPY4bFlVrMFQsV9rMJvQEXMm4gFoxxlBhfpBpIrqAZ+ZepV7Mu R1qiqcynXh0ce3zkaZBfFGhQpB96cWQt/xLyN/llqQIK2Y2oSfyuBc2PbMxlS+u9ntvp96 e56AP48KMlsAQ4koPp8bY2tQuBlv/uaYQpdL37GNQARUXnjKWnlLV9c1tB0/ZzxE18DNaS 9z899r5z9U8ZWPL5g/F3IQUTVLLgozij6gHHmwiEkqj5O9NE8xZr2K9xE6f1Pg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778816250; 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: in-reply-to:in-reply-to:references:references; bh=/2ftWnyZU0bYSOlqka7YVcTba/Fs5ljHGcldewOGI6Y=; b=VVMyI8yrnmBfRel1+i7hfO2TfGKanUlREJZ77aswAL73egR0hCo4ends4L1ssvTkIPG0PW YIHiWyXO1fb6zswUDTuaMDJ5mZ5xEBIRqSC8gqk/AARlvmfB+tK8/SNUblBF1k1CGHgiSb h7XUnePjjIFVXvXeavZB818FCeKZDP8Lt4n8g0AWc73WhsJSPMHtducbLn/PV8DMQ2HLZJ ks7SVt61LWyzDs5534o0OrQzxWCgQOAV3tysTEKnVcy6L9e4WmeAScNMVZBG5LZsEIhYco BJBq+YyJG7ckIRAYdvE8+1NGbEqM3DNq9lLAx3zp/6ODgHfzt5/1JY+dgYiZ0w== Received: by freefall.freebsd.org (Postfix, from userid 1033) id C89EA15C97; Fri, 15 May 2026 03:37:30 +0000 (UTC) Date: Fri, 15 May 2026 03:37:30 +0000 From: Alexey Dokuchaev To: Colin Percival Cc: src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-branches@freebsd.org Subject: Re: git: 01d5910b8766 - stable/15 - pkg-stage.sh: Add ext2 and ntfs Message-ID: References: <6a061a2c.25c2f.7465fc96@gitrepo.freebsd.org> 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: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <6a061a2c.25c2f.7465fc96@gitrepo.freebsd.org> On Thu, May 14, 2026 at 06:53:32PM +0000, Colin Percival wrote: > commit 01d5910b8766671afdbd9e274fd62b397aca9e1a > > pkg-stage.sh: Add ext2 and ntfs > > Having these packages available on release media may help users who > need to sneakernet other packages (e.g. firmware) from systems running > Linux or Windows. FreeBSD supports extfs (rw) natively, what's the need for FUSE-ext2? ./danfe From nobody Fri May 15 06:24:07 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 4gGxx53L4Bz6cy6G; Fri, 15 May 2026 06:24:09 +0000 (UTC) (envelope-from cperciva@freebsd.org) Received: from smtp.freebsd.org (smtp.freebsd.org [96.47.72.83]) (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 "smtp.freebsd.org", Issuer "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gGxx52j3Kz3KML; Fri, 15 May 2026 06:24:09 +0000 (UTC) (envelope-from cperciva@freebsd.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778826249; 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: in-reply-to:in-reply-to:references:references:autocrypt:autocrypt; bh=TYM0NFHB4HJIO9iceERJj3Zd1q3SiOvawH3LwonKUNQ=; b=daSwZkicpT6BnHTNospKluegpqBH+4ebDjCEf7L4htRmuG49fXc5+c0Hr45a3Qo9C6eNTA e1Tfh2ElKfmCfBNz7kUuMFWrFgwi0uk/hmhdmWKy18c/QihsRVPWBw+CVF4/I8FmuDpScb t9fCs7tMWckdObud9ZXR5lc7TnZURpvDBr2eMo7D7zmye6Oow69/sIJc6pk8cHIwtb6xFV olyQ2Am2nDQA7vZp4I0dji9wV/bjfuWRlpzwyswHZ6XlnIK4JHZTi6+qfxPnPjLdAYx3a0 yL2JhUE9iMvduyJRDn6KtGy4dc5N0Kxnm6OKimVcktU3SkRQxqxTUe94skm6mQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778826249; a=rsa-sha256; cv=none; b=kTm2rsjyzoPFnTipezD6/RQ2LHEIUGs37T+9W7l5nV2G0IZnROBezDZ9r7ujlYygh0743R qh+clDq1j0KuSPydTbPVvYf2gyHgR9AEMV7OQ3Nx3tIY91R658PCuVTjZgeLakvevzRLpu rWzklpr8XHSdAsMR8FPLlDB0tVxq1fWKZLphAxPwMfxlqw9UkzYrJl3mT3rG1uayQmbZ6p 12VbFvoAXPFRUvr+ZtSx71ODxRVGfW18SXzE/h9v4DdHndnDq/tOZyL9KUhVTXQIPsQfaw xBuTYbhh+2o4WwxutoWoHzzLtExkZVtJwD2M8kkaefqg/lj6LzBFbS7O9NkE/w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778826249; 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: in-reply-to:in-reply-to:references:references:autocrypt:autocrypt; bh=TYM0NFHB4HJIO9iceERJj3Zd1q3SiOvawH3LwonKUNQ=; b=cnYfr9y/VpuhfihqEfei+sT0u+73QAAuLzgKj+zOORaClsS/1k9uZ2L3l6f9jQV/3ZHMNz ZtBeJxQdLuWHVxWR/BnNhW8/rKs1bYfxZOOC9vRbeb5We/mOPaxEMZsyEr6f+rJEzjwBvz GQamerUxUPFqOtMsw0oT1crs4q5D5M7t13A3fpgxPxkkiycLsZF08jD/uyPk8FM7KxaQVq uF2Xc9kngOjo/sedA67uDkNWERZarxuAnBG7q+RH6KukFF6Y55sPy/c3GkSIG0b+R+NKWt 59K0kTuNSF+Z6sePFAtdGrXlZQ1eKCMabGsGZrJ3uEdNx5XAXZ+AU9T7u1tkHg== Received: from [192.168.4.34] (S0106684a76304d01.vf.shawcable.net [70.69.240.84]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) (Authenticated sender: cperciva/mail) by smtp.freebsd.org (Postfix) with ESMTPSA id 4gGxx46JQ5z5dB; Fri, 15 May 2026 06:24:08 +0000 (UTC) (envelope-from cperciva@freebsd.org) Message-ID: Date: Thu, 14 May 2026 23:24:07 -0700 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: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: git: 01d5910b8766 - stable/15 - pkg-stage.sh: Add ext2 and ntfs To: Alexey Dokuchaev Cc: src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-branches@freebsd.org References: <6a061a2c.25c2f.7465fc96@gitrepo.freebsd.org> Content-Language: en-US From: Colin Percival Autocrypt: addr=cperciva@freebsd.org; keydata= xsFNBGWMSrYBEACdWRqDn3B3SKO7IG0/fGHYtfs26f3Q5QeAcasy1fQLniwGQWn5rlILhbCD K/jdNoDm5Zxq20eqyffoDNObCjnHgg4tGANdi+RmDy+7CDpE789H8dss9y7Pt5DlGGAXQQnt hxush3EYS/Ctprd9UUL/lzOOLOU1aNtzB84tNrJBtcJmL7OYHfyTSNFxvedqJrrasejIQOLI t/DQ89BPzz+vsKHz7FJPXh3fsVkzLA00DJYcfkgxyABfJNA7U6yMwd4DVSdx/SsvfIDMVXnu UXCXswo106WPZbYGlZPpq0wW6iibtTerJix+8AeuwXvl9O1p8yESK4ErkIxCnmghTSz+pdzj z/6xBRkdDM9VdZ0r+CzsaNXMpDOzFuKyjaiYBdgCLljbDnXIHFcqXenrZ7Xwkm09g/M4uVSh pIUG2RYa6tsHSQoGCp3f2RZv1znfViKQFbbL83QjtPA20AhseZSYbHp1FPhXyy9J0wkGL16L e99g6gdGeIRE82BZjBjKGDkoyDPq+oDRSFl8NtzmIKy+cfz00nViqcTF4bREXEawFGhlpO0X O9q8mijI9iFB6zaPBiSdJGBL5ML5qLTNCl8Zlf4m1TBvmRTqF/lzMHVXHidDoUhpSh/y3AFZ 1KrYc27ztJQywDJPJPWPbtY8YhFLFs377gfP8WldsZjzp8nvoQARAQABzSVDb2xpbiBQZXJj aXZhbCA8Y3BlcmNpdmFARnJlZUJTRC5vcmc+wsGRBBMBCAA7FiEEglY7hNBiDtwN+4ZBOJfy 4i5lrT8FAmWMSrYCGwMICwkNCAwHCwMFFQoJCAsFFgMCAQACHgUCF4AACgkQOJfy4i5lrT++ ig/9GZKdN2fHSyrANKZX38ivd7IX2wAYouqH9DrQM94W8IciaDLmarN4Pl9mY+aucMwQUSyp uNtKOJwKqhVVaalF9Zw0sRMH4CJuvT7vKCtZ3q1Okb7soRvFte4d+vXhvPxCvBFDA5JzU7Lg DR5eqqcvF1dN1OuCq16pl0zCOSH/Jr5ToE3LM3Av1KBGcZD7ZSzHRWsFjV5AOUJKySuA3GwJ e/jASQcQ0YfCnru8ntLmYg/2SKvZFlfthZiCBnAppMt4n4BUAw3TDvf10HIDtdneejawcbLS gofLCvGqumwbZYAMKWrFzT4+7KQvr0pOw8QD7EbxnB4f9hQ7UiVF8qWsyKU3iv6b5JLhbS59 ooKRccyOvdMLcVJ0ZdpqoxrNv061ZUqLL5RiWjBlc1qjBnDxeg5oyM0rT8WLftdgvyH6RQt0 KWngumBAT5AT2DUYL8Uz1490cqfO9K4yEGZAJB9XRVX1g2IWTOjae+0g9ZII+h91UngFz+Rz aKDeseKBbCGDOFXx1TqKiHl2g255ZnUxKYTlucFtguv4gDGBgEk4G9JaEWBw1IWblcKhxH7L 2vWsUhvwghjIxHdO/RkeIeHvSp4YZxCJ7a3TaJLYAlwYopfTKVzNhcDY5h5syEuoHjyJCxXK SyoJYAVu8Yl2KUhvOtOmL1VZ6xyHnpdMRWKJZ5jOwU0EZYxKtgEQANYfgbtUMVnhjxDHhWLp g5kLHK3YW0TfJKzpXqDB7NiqxHofn4OcbZnVC3MKggcbs9o1/UtsjnlsG8550PfiYkDXvPiO RJwgbGs6MGIDK797C6cnBLQ8xwBa9SL4cl5iQFnhWmt6vwnJ+an/cm5JpYves3wL7jV09qU9 57hkHXEUcl38r4FssZzVcLKPUVTa3Un+QGRTGDGe/f4ctjMaqv0ZCM+l2ixPhf/vqESrfSLv V/+T3dmtUfXjazO3SABvsHwxgGuTTYOlKoPCaebr+BRdqm0xeIShoIlhvTI8y4clchqx/Uxg UG5X2kvU13k3DS3Q8uLE4Et9x1CcZT6WGgBZSR6R0WfD0SDnzufNnRWJ0dEPA2MtJHE7+85R Vi9j/IgZV+y5Ur+bnPkjDG1s2SVciX5v9HQ0oilcBhvx0j5lGE9hhurD9F+fCvkr4KdbCknE 6Y8ce8pCNBUoB/DqibJivOzTk9K9MGB5x0De5TerIrFiaw3/mQC9nGeO9dtE7wvDJetWeoTq 4BEaCzpufNqbkpOaTQILr4V6Gp7M6v97g83TVAwZntz/q8ptwuKQPZ2JaSFLZn7oWUpYXA5s +SIODFHLn6iMoYpBQskHQjnj4lEPJadl4qj+ZKA89iDAKsniyoFXsbJe2CPbMS1yzBxKZq6K D/jpt7BOnuHr/JrXABEBAAHCwXYEGAEIACAWIQSCVjuE0GIO3A37hkE4l/LiLmWtPwUCZYxK tgIbDAAKCRA4l/LiLmWtP3jmEACQrh9gWe8F1Tkw3m6VoHKwLc5he4tX3WpQa//soPO6iGG3 S3WPruQ46NrAaAojoOcKI9UONDO5rxG0ZTX53S+lu2EO47jbcLwOCjaEpjKpDRt9ZXBQE8Xl mtBE9Bp3W9gpjB1nE3KNM1mJYgsK0QdRpwwfh4pVgGpOj8j23I6MCK+v99zEBnpgCn2GX8W/ kctRXHqWwndHysOJtRP/zrl7dDaABF1f9efUl0LL3TD3GJ9VDz+DNOin/uK2a1hiJo8QzTRk PpfUQ2ebzDsrd1i/pOWkMSkdH+rEu4AGrXWtaBwrMyrGkL6Icb6yO+P9/z0W2wlgBf3P1YRt JPgQt/Dj3yvA/UnaV/QmuVQPjl13o24UnJGsZM8XGnNdfWBKkC1Q6VXC4QT+dyBHYH9MuE9d 6oGl8pFM1+cTfEfbM62/rRoPkF1yHMsI/903VxEvuUIKfhEZAVLFyHldooNxuchntHQP9y8J 8Ou9bWYQP7MnEn+kwSwrZkjurfPkan+xQvp6dDYnj3V0GwA5pprBMaB928VIDVOv+1PNQI3t Cvk5VPv/skq+TJRMHW7bFSt8PRa91cUf1FOLIz9APDiJOzXkwxUEHGV3zPSaUhs1JYjyBeGT wDAvtLUdjOnRhEUOwlnIrztmvyciutjJoVzKEEjj5WXnHk9L9kQ1bpAjkjTONw== In-Reply-To: Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit On 5/14/26 20:37, Alexey Dokuchaev wrote: > On Thu, May 14, 2026 at 06:53:32PM +0000, Colin Percival wrote: >> commit 01d5910b8766671afdbd9e274fd62b397aca9e1a >> >> pkg-stage.sh: Add ext2 and ntfs >> >> Having these packages available on release media may help users who >> need to sneakernet other packages (e.g. firmware) from systems running >> Linux or Windows. > > FreeBSD supports extfs (rw) natively, what's the need for FUSE-ext2? The "ext2" fusefs port also handles ext3 and ext4. Poorly named port, I suppose... -- Colin Percival FreeBSD Release Engineering Lead & EC2 platform maintainer Founder, Tarsnap | www.tarsnap.com | Online backups for the truly paranoid From nobody Fri May 15 14:43:11 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 4gH9136N8Jz6dPvy for ; Fri, 15 May 2026 14:43:19 +0000 (UTC) (envelope-from marklmi@yahoo.com) Received: from sonic305-20.consmr.mail.gq1.yahoo.com (sonic305-20.consmr.mail.gq1.yahoo.com [98.137.64.83]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 4gH9132V6Qz454c for ; Fri, 15 May 2026 14:43:19 +0000 (UTC) (envelope-from marklmi@yahoo.com) Authentication-Results: mx1.freebsd.org; none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=yahoo.com; s=s2048; t=1778856195; bh=SVdL1+XbaUKSsknQ39a/z3JnhV9UR6LyXuDygsFv3Qw=; h=Date:Subject:To:Cc:References:From:In-Reply-To:From:Subject:Reply-To; b=ug9tAl1kYqG68AXbsV9jqqcEU7Jiyc5HKA2yy11GiiTn7d/LpkEBTbmluhQRy2kpKyFNDwHXremmPH+dai+M5uwZw2x7rfmhiOGQzj5HY3IZbg2RzQ1LxvKHK/MtC/u7QT1Iuuuftpe0gxKYb15jyccF18nq/Mp5jsbVLTonT8nVUEBUtKN79W0orRxAquFR4EkJNXnQY9eWbTS02j1nPLCDzG2u0v1LRQpaE4XS3wARjPpE/AdeM8v+ezd6TtfEMsHM6q3duApNjvKHladCzfkEonYyuyCGg7mw39ITgT+Tf4Rok9Gn7aA3hkU8LmFjyyCm5lXvfpuHnxYUE9zJww== X-SONIC-DKIM-SIGN: v=1; a=rsa-sha256; c=relaxed/relaxed; d=yahoo.com; s=s2048; t=1778856195; bh=52F9qMZ2x7SbhzV2Ss8Xw1wCmFgP9SbIy1SSVfP1UO5=; h=X-Sonic-MF:Date:Subject:To:From:From:Subject; b=s0aN1GkRvhRoT831mhD5icy/Q4wQ3vlpcBoqqZfhdfDHxpMXO7zBj6jOaUR4Gxq8CyFThHtRxkiRrqA1AhK6tTLMhlUO2BMTnd6pZo7310T+ZnrmGZdLqSslVFiHYlyLtdzcHQo8b4dbsq7aaHXokuMOYu/QkZvTGSxsC4JOPIE0Uk3Abbtm1HQN3qu6J50smU+xRXiB58vAeX8end16tkG2LKan7KTbz1jNznGYFGMng742QwppcoFXIBV/oe6r0wHZUO3swp7sffIz6k/wf8AB80zTjhWlDYzWLmahGFBhDryF+rDxverP2LVPGtGOo3pkveD/NMbC3pDhU9UPhA== X-YMail-OSG: ArpasIYVM1mS6HuIaIX3vihYdNIoWpIWelJDMg7Un8SW.4suaumZvATuGUMOThX nhmhisn9z79UoQQbZdC6ClzGjatTeRk644geR2AC0v7OEzsRHTpJaoR9NioGkim8jjMx3k71yXzw 6HuSagadEsIO4RMclN4YRjBwV70AAPXbIWFSV_LZExpsHt65Y_NSjIjAQz7n0bht.Na3Re9ImSoY xhh8BUjsdbxFoDkSmou1JegNcpanvYZM8WLYV0Kek0p4b9hS183ur364xmQrli.tkORFjXgZBy.y OHzh0GYfm1brgPN3dHWVuROHzZl.2d1wKERUC_OEY6f5yytxA6.1c3LwyLwXQ1X5IvR9UbZWYSgc IpclSVGGG5LY4dPg8diawRlN.3.pcfExWvGreWJV4dlIGZtCckuDhCrmhOYqo.CKtMd3oCROQpos Tboln40DT.f8V4fe8xOE.UB0oxdC25Fr7neVaSovdVVNgfa953pS25PdS2K7qF7nYb33yrjdJskA mxOWB2pyxaouXhRfogbiJjlDMsnMk7ZyDhTajx0jIUpttn2OeVt1fcBPOm.RhLaQfLm_3i49kxAI mQHCgSwq_oqUmTsp77QZyu1gBhhbNJVoq1pmvCxAfFYliJGkJ6W_Ws8PQKYsEICXXqJMngQ_NTE6 d2_rJBZYTzLWm8oB8M9Qt9Fhbif2v0on8cggTqaQHwmm.NoCZD0NOeUY.mT0AO1b63W2DavTgdpf q0psuWZQboT4OK1SOABvatanloES10HbfR0zwNoL3ABxqe8lRWNW5pII7DxMAJykonugU55VthV7 539FnMvA6yVA_I9.WhnU3pt1wVUgoGRpG07uFbo67K9DxZXbz9MSU0MvkREaDG_dMUEE9XTAfiyV S7.y_AzPOKT1sZzyt1xs9Acwyc4z6RIEFBcZDPRVSwwqEYk7EVTnVfWz70LE0CNTkeVq9_nLKf54 WCXjekEuRgqZpDzFya6pldvXZ0SuyF706xUQd9_WxvtIng0p4Z2Fb1u5jXQdQ.16BHnrm04G0erS dX7fFskzSsq0Cc5Eg4KONb_9W42kmNz9.NIYTCWvEBg9yMKY4_DmIbgO0LK4qq5FhHCXYOPc15ig pEa3Eqfd3pyd_BhLMzY76oZJI32h7tbmdl8RroBFIp5M1YWvdgTxIZKQuzIz_Il5pwvuRVVwHwPw EzkMBNCF2xqWRfjXVVR1EKmRkkw.xpioVJxowoaQmQGM97N4cjgM7PD9KlCO_CeZegVzDgeKmH2K kxHGEv3sHRypXC9jHSeCEN0KgY7mgiMPCgbuumVuKheHPz9V9C7jRayqDUgfjxZL8Z7DBlsUGjdq HOvXBETYw.rh0HkTB2mGQvctZYfO9H8NyQqwj4AkAzrEtdzlw7UefWpnd1IW2qNLHYBL.mpKxdm1 8PbGag2v4RDFNzUXmZGqmUGAoteUS13k6kufL_uyblIEWCjUIQbeEbQ3GpQ9RgcjR3Mm97YMGxAZ Kgiijd0YNUrWGJPW1oM2UZrJykkB_njG4CKwNz1o.ObhrvWPwV9bybsc9q3gEUlDbXtR2TrlatSg tJPGdGzNrDIlrV2FPcXxH8Ie_6Rt7Xls.6NQGlIVztxGDasEDUMmYshx5dmsoFkHOMWt6NxTJMhp kSIW.ehXl4K7zvyAh3DSU956nB35b1Wf5SYAkMjT5iO.e3h9RpdV.rNp5BAxR7H9fdkmwiGPS9fs MyiNwwhlZwPD828aKsNHx7dA65iBJPwU7buR8TSkIQnTuVI2Jjg.FEYbYCP8qbsoPAFhX8VsH7hh jgXmC_I4d2Xi085gGmuv9s3TTJBqKomYvuzJqAzASibRNRaHwhJHCxP5ViwQJ_RhBpQv851y_zju Ox8zjY1DhajDOFKzvGqPnUJE4qU7wDT9.YScmQUYoq5BE81wWVmr42nM3RvsNNln3V5DcntP7OFb hsJiEV.WsUsS6S8CH4mmQbEEUTqPc4gU7zkL8nbX.5VGBofenHxaaHEnHkLpqW2zgzbD5ZDzvLaq LJNYqEyxHSvb9TKBmsBmHoogCSp6c3agoZM7FSfw9Qm1LyTc_eJ1wpu1UHgWo0BrjuaAWe43mDst CVCmhhRnIBB69PMLtG4p9bWF94RXdSfx_o6n1kNSbyW_dQ2epaPAzqApJ4crkYWvYsidiJow7Ms6 2geuQS5nsBr5EQilxi3tY6QW431Tp3BBxTYBXwiynTEqvV0xOsp20fg4h5pOc5.d0xOCQE5PNYgo zgLyiwRDrvid2hd9gpthLd3he8TnVlVqykeNBDt3XlEfOUSUG8B9EWt96gTMR6REnL7gbR2hnOpn JRMM0IUW46VWZMBHSMPIGRkG4ghT.hpDUCHhH6QbY6bS2nx3OmzOr9hirTbA958ZG7EJYEWS3TvW dew-- X-Sonic-MF: X-Sonic-ID: 8f7dd9dd-89de-4d50-82bb-a05c3c017852 Received: from sonic.gate.mail.ne1.yahoo.com by sonic305.consmr.mail.gq1.yahoo.com with HTTP; Fri, 15 May 2026 14:43:15 +0000 Received: by hermes--production-gq1-7bb7df5c46-hjhbv (Yahoo Inc. Hermes SMTP Server) with ESMTPA ID 16a7498e0c8376a548bf837f8d842d05; Fri, 15 May 2026 14:43:12 +0000 (UTC) Message-ID: <3fda2a13-fdde-42bb-8c18-a9482b7ee321@yahoo.com> Date: Fri, 15 May 2026 07:43:11 -0700 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: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: git: 01d5910b8766 - stable/15 - pkg-stage.sh: Add ext2 and ntfs To: Colin Percival , Alexey Dokuchaev Cc: dev-commits-src-all@freebsd.org, dev-commits-src-branches@freebsd.org References: <6a061a2c.25c2f.7465fc96@gitrepo.freebsd.org> Content-Language: en-US From: Mark Millard In-Reply-To: Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Mailer: WebService/1.1.25725 mail.backend.jedi.jws.acl:role.jedi.acl.token.atz.jws.hermes.yahoo X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:36647, ipnet:98.137.64.0/20, country:US] X-Rspamd-Queue-Id: 4gH9132V6Qz454c X-Spamd-Bar: ---- X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated On 5/14/26 23:24, Colin Percival wrote: > On 5/14/26 20:37, Alexey Dokuchaev wrote: >> On Thu, May 14, 2026 at 06:53:32PM +0000, Colin Percival wrote: >>> commit 01d5910b8766671afdbd9e274fd62b397aca9e1a >>> >>>    pkg-stage.sh: Add ext2 and ntfs >>> >>>    Having these packages available on release media may help users who >>>    need to sneakernet other packages (e.g. firmware) from systems >>> running >>>    Linux or Windows. >> >> FreeBSD supports extfs (rw) natively, what's the need for FUSE-ext2? > > The "ext2" fusefs port also handles ext3 and ext4.  Poorly named port, I > suppose... > https://wiki.freebsd.org/Ext2fs reports about ext2fs.ko : QUOTE This page serves to keep some notes related to FreeBSD's kernel implementation that supports the original ext2 and sufficient features to support newer versions of the popular filesystem. . . . In FreeBSD ext2, ext3 and ext4 are not different filesystems: ext2 is the base filesystem and some features from ext3 and ext4 are supported. All features in FreeBSD's implementation follow UFS semantics and this can sometimes impose important differences. All supported FreeBSD versions support ext2/3/4 read and write with most of the features, except for journaling. FreeBSD 13-current supports Big Endian Platforms, including PowerPC, through byteswapping. FreeBSD 12.1 and later have support for DTrace to enable debugging in production. FreeBSD 12+ includes initial support for writing ext4 filesystems (thanks to Fedor Uporov). FreeBSD 10.1-12 used by default reallocblk. This comes from UFS and helps preventing defragmentation issues. Linux doesn't have an exact equivalent but Ext4 does delayed allocation which is similar in concept. In freeBSD 12 the feature was disabled by default as it proved to be unstable. FreeBSD 9.x+ fully supports the async mode, which is the default on Linux. Unlike Linux, the default is to use the sync mode which will make your filesystem more reliable at the cost of some performance. . . . Known issues We don't support the inline_data feature: it is doable, just no one has done it. We support Extended Attributes, but we don't have the calls to support ACLs in a similar way to other BSD filesystems (namely UFS). We lack support for journaling which is inconvenient but is not necessarily a problem if you are OK with running in sync mode. Furthermore, at least in the Linux implementation, journaling is known to reduce performance. We don't support the SSD trim command: the code to merge this feature from UFS is relatively simple but while on Linux this is a mount option, in FreeBSD's UFS this is set in tunefs. For convenience we always choose to keep the same semantics as in UFS, so it's unsupported (for now). Starting from ext2fsprogs v1.43, Linux distributions are activated the 64 bit feature even when partitions are smaller than 16T. This feature caused problems for some Linux bootloaders and utilities. This is supported in FreeBSD as of FreeBSD 12+. END QUOTE (Not mentioned is lack of encryption, if other things I read are correct.) -- === Mark Millard marklmi at yahoo.com From nobody Fri May 15 14:59:15 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 4gH9Mb17xDz6dQcM for ; Fri, 15 May 2026 14:59:23 +0000 (UTC) (envelope-from marklmi@yahoo.com) Received: from sonic306-20.consmr.mail.gq1.yahoo.com (sonic306-20.consmr.mail.gq1.yahoo.com [98.137.68.83]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 4gH9MY2qCcz47PW for ; Fri, 15 May 2026 14:59:21 +0000 (UTC) (envelope-from marklmi@yahoo.com) Authentication-Results: mx1.freebsd.org; dkim=pass header.d=yahoo.com header.s=s2048 header.b=WA+6gXZY; dmarc=pass (policy=reject) header.from=yahoo.com; spf=pass (mx1.freebsd.org: domain of marklmi@yahoo.com designates 98.137.68.83 as permitted sender) smtp.mailfrom=marklmi@yahoo.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=yahoo.com; s=s2048; t=1778857158; bh=sIu+cDyHnG2DTUkqZpbg+ApcUux6E5wIM/BJt+QzqmI=; h=Date:Subject:From:To:Cc:References:In-Reply-To:From:Subject:Reply-To; b=WA+6gXZYcAHPbOjJJtTz8HSFtIlQ2l1NVDxqkrcFYsS4THNIjTqJ6qgdMfdpDnewELXdBGJbzLdDwv8T0OtKMZQ25zio/IjlBXAUlZ6+R5V0e321p8f/stEuU/ji8hfYtvOaBmTEQ7itGv+bXMGFSFBOW4yfZCbSgcvbjs7JBqcF3mjJbGieF+4VbrrS9XE3fjbQB3i0hBclhQq/FccBOznqHEW4WdROqTxz3vG3av+CRc6P64wouuh4/W84h+qPInpNET3MN9jNsG/8egTR+I2A6wNNkGd2CJvPgE/Z4xDHeaxLtrdHNFYURuN48diXqzOHHAo38xGlFQWQIRqOkQ== X-SONIC-DKIM-SIGN: v=1; a=rsa-sha256; c=relaxed/relaxed; d=yahoo.com; s=s2048; t=1778857158; bh=rNNcF4U+dAGhwspcl4bI3sOdL7X3vIFSzgrTCL8Rssm=; h=X-Sonic-MF:Date:Subject:From:To:From:Subject; b=BDwK0uupl51nt35qhDI0wrLNwvOjSWoSN5NkP87GDoVxavzAbxTFOMzXa/lib2GalfaOMEo4BnK4XYgaUqJKGZ8UEPjiAO3FjAL+6dObN1nZhnuf0LiYRmcecR5ndE4hoauActNH60vtt4AZggQdgEWgWrfkLOXfsAqYyT2Cb/gRVMT1srlb4DPjiGpBOIg94cl3moRDqHCIx6qOqX6LzmhadsZrDkU0py3YmybinXsYGyPaaenc4BcdpfTSgXgFr+KXJe13yJz7Ilx5WOfx12/akzggFihvKhS4lvrgGgm/ZdySy0gMhIh5OCcWh8Sn+XPy02goiOLWVxJfgugh0Q== X-YMail-OSG: kW__g4sVM1leiUQ5S2wrG49V8.F0bnKQpeaNyVEwshDwjYfrH9bVcOCQtg.u84z HMpjdyMA.m7RGeUYnS0CimSUehDSpWjX_zW3TZC.VcJpO9dlzj64e3MZ0S0RxeIVogP21M3c5e6. o75EiEBoeFo6mAfIn1zBsm0BFHpOQo5S_3js8b82pW8a8MFZRevEcPn1Eb2FTcVv3Mq1bZznpKDw Hudkyrmk.tMMbSy7s3TgPLeChJXQvHdykZalKGV2kRkvSq6JGTgRWUAqTw9hDlWLmkv64sBmqU7d XqPlKoYU3e2V1qJ45LlaOr4u2HsRScJd9QUT_3JLDwDoJBlBWELdITvuEj5D2zXvpS7biIiHCG0s 5p0EzE__9yh1lYh3Vi0WSOfbiI8M7dlzreP6mlzpP1tfwEbKHQK88q9TKp2KHppQF6dfN81oLLmv dTF2syK2.QnSfOiE8uuxdgFzg.AdrJj_.ipEKgirEnVv4VJGVxRu_BCaGtz1AsrusdqiWqqh60tW jWroxt0KoqeYMB71c.vGbLat4qgOPXnnHgGgEbVnJ0kobR6NpLR_xPuLAJQBb_7lWZTgwO60qwlw EmugMwSZEVeMTzg931_mlaCKJchiL.GvpGiHyIwqEnbFtHz1.pFpmid1hKympI3YBU0ad4ad7ZUO D_0qqARKR._arRWMnfFIQtnG4LGTwCW5RzC.aDoDNpPqKp5_S5eYvzjQnPsMmAkQQPLkBdelLLRE MEeu7YstgObZDu0vgjOo.6HkbxgqKuV0qtZ8crZjJNgnn1d1IBKTsFWbAo.Qo04J9b93dasbRMo7 lrz21YeWhw8Xjo_04yFAyfn8o5183NooxmpxDAQ6kREixL4Zhvg4gmjbGn.3Xb6DMGOBpwi8G64j ZtfI_bRaXbo5BK9iTdNeIS2ap4_F_k4vwiFcukd15UtsUdRJHa3P5YjTjmOuH6H78zzs0mGnFsRl zysQ8rLmfnvuYcaksEiFE_O0ciqlvsRWWmA8Z8nyQS3rUFYnLSl6Dl3P9Ks5txDP23qccueNothv gP5GRlqmrKsMx0izLYgenawTzy4hJ_63Q0tvZSYPV3mGk4DNG4JJqyGoai2q4YiqNZtGI9PwaqGf Ej.eSmM1ll1aTplgjNtCuSOpNmPJkLbS32SlJ5Xl1NuepLwMKDAK3ltyIcFN7sGRjkpWRdujZYv5 RlI17V5LYwc7MnVOdzpvcs5koQDbWiQ7dIF3RcmTA2tS_D0fNCIn_10.D0u4xcueq8ftIjjmp_18 .VBm1geagmrkUb4RNHo.IMdxlKZc8L0z7aaHaENzeAnJFR2fAXwgaIvdQyrMCCLN7MxN6x3wc6Mg gB5MlTJL57U.wpAOrOajf0dIEm0kVJbxyjs4Oxf4blmT9viP0G7CzvNS8Hk2vf5vMx1qcrwZJAYk N7qZ9ojLlowB5dm_IDYqvc0lyjtlZEKiVP6ER1_y5z8KqW0lyeWrcIzCvZGs.ImPqlMsfazaSjCD zHMeD6ptURXimxhDA9oWqoycWg1LRBJ64TCliTatZItparzg7mQWbHnr8CmC2GM0yH.1RBQhz6zX FaEGinS8B77aCsTRhx6pwibhPmhsAZPiHEqPWJ0N6fpNlQZn5xzvLKdzZSet4jFONGdznApDDL9k nzgBk949uM9fnOe6F1z1.fquYDP69p5idh4UW.bxtA2Y5LlSTQAspYI5NBJZue.RPYSbTbebi9Ef KoNbb5zkmofvF8nhBdsbK07cGwL9wnXr_dC59rxoVe.ZdHNPfa.MIxsTIkFazD7BxYkH3Sim.sJv DmLcBK4PqcZlqwScfzzoIIyo8a.kxwUU.A9QazSppBixK_JZEd8CzplYjBI04EK_ZKRlv8A_Akzz GpV3jWDqt.3Z_ENPeJcCJ_e4f8vAzRkt3.e3T5DZ5CyaZnmULE9jj5JQ1GbYm.A95dUHa4e1YMzk aCVRjuOtXUkTCmpOCmTENIilBh_jHexCn2x7JoO3_1BMMKK9E8PC3LPOfmfLhlT.1HudXY17k.hS BrYSrhjr5zUYQxn7XlzoX3BNveux7gconXIdaXwkzzorpjm0Kplmqy9bnw2jypunRQ_v7Og1Yaon Sjx3wY_PffPzjqhI9oNifeaQ6rEd2co3PTjvHhelOUEHq1R7tz61t_pvOcOQfmjiOPmAE_J_rbIu lfIXjcN5_JPCu54LSLXlNHDMj2GTt7uze5KmG5PhhtH.RcKMF.KvqkDSCCe3elV11TWjWna2dvst JNhjXgk1Qq8SWdd7fIGhdUWFWRqTlecU7y2FnCqeoF.l7Mor6Ag.QF3Czb1v5RANEW8BwWNLotEv FPw6ltp0oRI9uaMG3V7BuaWDaXBbffeI8m1Uss1JA.eB1t.cj2twiuNcZh5IjdWSMK.JehrZvcJ4 8 X-Sonic-MF: X-Sonic-ID: c56c0e88-6d94-4cce-a534-6a0f9d08b3a2 Received: from sonic.gate.mail.ne1.yahoo.com by sonic306.consmr.mail.gq1.yahoo.com with HTTP; Fri, 15 May 2026 14:59:18 +0000 Received: by hermes--production-gq1-7bb7df5c46-2m55j (Yahoo Inc. Hermes SMTP Server) with ESMTPA ID 00a762060c41b058e1cd0317f8a5c345; Fri, 15 May 2026 14:59:16 +0000 (UTC) Message-ID: <896706d9-d149-4b3a-8f25-596c9cd5f3ac@yahoo.com> Date: Fri, 15 May 2026 07:59:15 -0700 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: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: git: 01d5910b8766 - stable/15 - pkg-stage.sh: Add ext2 and ntfs From: Mark Millard To: Colin Percival , Alexey Dokuchaev Cc: dev-commits-src-all@freebsd.org, dev-commits-src-branches@freebsd.org References: <6a061a2c.25c2f.7465fc96@gitrepo.freebsd.org> <3fda2a13-fdde-42bb-8c18-a9482b7ee321@yahoo.com> Content-Language: en-US In-Reply-To: <3fda2a13-fdde-42bb-8c18-a9482b7ee321@yahoo.com> Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Mailer: WebService/1.1.25725 mail.backend.jedi.jws.acl:role.jedi.acl.token.atz.jws.hermes.yahoo X-Spamd-Result: default: False [-3.99 / 15.00]; NEURAL_HAM_MEDIUM(-1.00)[-1.000]; NEURAL_HAM_LONG(-1.00)[-1.000]; NEURAL_HAM_SHORT(-0.99)[-0.994]; DMARC_POLICY_ALLOW(-0.50)[yahoo.com,reject]; R_DKIM_ALLOW(-0.20)[yahoo.com:s=s2048]; R_SPF_ALLOW(-0.20)[+ptr:yahoo.com]; MIME_GOOD(-0.10)[text/plain]; RCVD_TLS_LAST(0.00)[]; FROM_HAS_DN(0.00)[]; ARC_NA(0.00)[]; TO_DN_SOME(0.00)[]; MIME_TRACE(0.00)[0:+]; DWL_DNSWL_NONE(0.00)[yahoo.com:dkim]; FREEMAIL_FROM(0.00)[yahoo.com]; DKIM_TRACE(0.00)[yahoo.com:+]; ASN(0.00)[asn:36647, ipnet:98.137.64.0/20, country:US]; FREEMAIL_ENVFROM(0.00)[yahoo.com]; TO_MATCH_ENVRCPT_SOME(0.00)[]; RCVD_COUNT_TWO(0.00)[2]; FROM_EQ_ENVFROM(0.00)[]; RCPT_COUNT_THREE(0.00)[4]; MLMMJ_DEST(0.00)[dev-commits-src-branches@freebsd.org]; RWL_MAILSPIKE_POSSIBLE(0.00)[98.137.68.83:from]; MID_RHS_MATCH_FROM(0.00)[]; RCVD_VIA_SMTP_AUTH(0.00)[]; RCVD_IN_DNSWL_NONE(0.00)[98.137.68.83:from] X-Spamd-Bar: --- X-Rspamd-Queue-Id: 4gH9MY2qCcz47PW On 5/15/26 07:43, Mark Millard wrote: > On 5/14/26 23:24, Colin Percival wrote: >> On 5/14/26 20:37, Alexey Dokuchaev wrote: >>> On Thu, May 14, 2026 at 06:53:32PM +0000, Colin Percival wrote: >>>> commit 01d5910b8766671afdbd9e274fd62b397aca9e1a >>>> >>>>    pkg-stage.sh: Add ext2 and ntfs >>>> >>>>    Having these packages available on release media may help users who >>>>    need to sneakernet other packages (e.g. firmware) from systems >>>> running >>>>    Linux or Windows. >>> >>> FreeBSD supports extfs (rw) natively, what's the need for FUSE-ext2? >> >> The "ext2" fusefs port also handles ext3 and ext4.  Poorly named port, I >> suppose... >> > > https://wiki.freebsd.org/Ext2fs reports about ext2fs.ko : > > QUOTE > This page serves to keep some notes related to FreeBSD's kernel > implementation that supports the original ext2 and sufficient features > to support newer versions of the popular filesystem. > . . . > In FreeBSD ext2, ext3 and ext4 are not different filesystems: ext2 is > the base filesystem and some features from ext3 and ext4 are supported. > All features in FreeBSD's implementation follow UFS semantics and this > can sometimes impose important differences. > > All supported FreeBSD versions support ext2/3/4 read and write with most > of the features, except for journaling. > FreeBSD 13-current supports Big Endian Platforms, including PowerPC, > through byteswapping. > FreeBSD 12.1 and later have support for DTrace to enable debugging in > production. > FreeBSD 12+ includes initial support for writing ext4 filesystems > (thanks to Fedor Uporov). > FreeBSD 10.1-12 used by default reallocblk. This comes from UFS and > helps preventing defragmentation issues. Linux doesn't have an exact > equivalent but Ext4 does delayed allocation which is similar in concept. > In freeBSD 12 the feature was disabled by default as it proved to be > unstable. > FreeBSD 9.x+ fully supports the async mode, which is the default on > Linux. Unlike Linux, the default is to use the sync mode which will make > your filesystem more reliable at the cost of some performance. > . . . > Known issues > > We don't support the inline_data feature: it is doable, just no one has > done it. > We support Extended Attributes, but we don't have the calls to support > ACLs in a similar way to other BSD filesystems (namely UFS). > We lack support for journaling which is inconvenient but is not > necessarily a problem if you are OK with running in sync mode. > Furthermore, at least in the Linux implementation, journaling is known > to reduce performance. > We don't support the SSD trim command: the code to merge this feature > from UFS is relatively simple but while on Linux this is a mount option, > in FreeBSD's UFS this is set in tunefs. For convenience we always choose > to keep the same semantics as in UFS, so it's unsupported (for now). > Starting from ext2fsprogs v1.43, Linux distributions are activated the > 64 bit feature even when partitions are smaller than 16T. This feature > caused problems for some Linux bootloaders and utilities. This is > supported in FreeBSD as of FreeBSD 12+. > END QUOTE > > (Not mentioned is lack of encryption, if other things I read are correct.) > > > It looks like: https://forums.ghostbsd.org/d/694-hi-new-here-and-to-bsd documents more detailed tradeoffs between FreeBSD's ext2fs and fuse-ext2, as of early this year. I've not found such for sysutils/fusefs-lkl for ext4. -- === Mark Millard marklmi at yahoo.com From nobody Sat May 16 16:44:41 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 4gHqfd3Y1bz6cgl4 for ; Sat, 16 May 2026 16:44:41 +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 "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gHqfd2v2Fz3wch for ; Sat, 16 May 2026 16:44:41 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778949881; 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=8y1LwbebhMA85JfRh2QuH1XnA09Z80eNKEjQQdhRqf8=; b=ALDsJd1S7kSJe3X4FqUCMaaCZcfJ8UbJWajA/RWaTskxyI8k/1mRef64S4FlNcpT9mVszz SCKg9EVxu6VXxbD4quEMkHC+I7KJHAmoQUyXYFjlWmNOLfCNk5OCnIzHyU3RdAXKMLfMdy 7jgu8InHo5Nbbl2XHpk6rgNCt3Kal3BtMoPY2GlfbUlF+AdqkmeCJ6cU5FmTLo+9QStxf9 4OtaDXS9VE2PpGQEANS+GJwC5KaVkjM3C4hORB1ctTIx9/5zEUlMgrN4JcYz322sZXNxTE xc8xY6WAHI7WrbCWcRpeKV5+LaWifD14ksnZyb6Es0T2Frj1uHYCk+FKybjQCA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778949881; a=rsa-sha256; cv=none; b=Y7uQaHb13Cr/RK/DS58o79ukL1tGaBhCYz1xzNSactS6JoRkOWjwe3Q0qjKv/JcCnYx5Hl wDDAoHqGZVmm0/QMiRTT60RcY/n4jVFo/tPZILEIepNHpS+GoyVeD2++4VADCAiMPSCwa/ 8xRawPegHseNkNah91iuSLyoVpc3Inm4Icq2mTlNgRE3EHGXPQGH8hW+Ceag1zK776Y4zy bMUyEwiveBSgHzNKU6HMEPJIrgIdAfTz7gkBHwza8beeewyAkrSxteySFaatpCDow5bUbc zx1nNgQcxFZdNxhuMvo0jmgW27G+E04IeS2LY2WpCXXlPWft9tgERzu1edVVyw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778949881; 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=8y1LwbebhMA85JfRh2QuH1XnA09Z80eNKEjQQdhRqf8=; b=NCQV75+E6fOnYlh9Rzu3209zwJP06+8xkwGOuphGY3gqe40j5uzKq7LuFY9y/hnnX0wDyk 53ksNs5yzq1TcrEbVNv19KsxNqhHAFZk0WGWBhWPq04MdzLhNL3Gt3hXc0y35MgzaicaNE PdBtN5u9S2DvDABUgPKkm/r1F0uHr+3ousM4mGZLQVZUHVjXkRQUknFNuMRk52A1Na/5Tn QkLHUErCdsLyppBMv6Hc2R6Vxa/9rC1jc+2fE3edqjlsahxh+71V3pCVO0AqeXMipd5c6f xhnszwXd6Nr/Am1pf0lzXyFgtGFVdcMkpW13HCcnonyrmTZZ+dhWGTyVNQG3cw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gHqfd1yb3z12k4 for ; Sat, 16 May 2026 16:44:41 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 18969 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sat, 16 May 2026 16:44:41 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Kristof Provost Subject: git: 9d0b771caa49 - stable/15 - pfctl: relax interface name requirement 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: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org List-Id: 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: kp X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 9d0b771caa49eb77176d8f8cece8d1232dffe7f2 Auto-Submitted: auto-generated Date: Sat, 16 May 2026 16:44:41 +0000 Message-Id: <6a089ef9.18969.685b873a@gitrepo.freebsd.org> The branch stable/15 has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=9d0b771caa49eb77176d8f8cece8d1232dffe7f2 commit 9d0b771caa49eb77176d8f8cece8d1232dffe7f2 Author: Kristof Provost AuthorDate: 2026-05-07 09:58:17 +0000 Commit: Kristof Provost CommitDate: 2026-05-16 16:44:00 +0000 pfctl: relax interface name requirement The FreeBSD network stack, for better or worse, does not impose any requirements on interface names. As such it's valid for an interface name to start with a number (or indeed, be something like '⭐'). Allow this in pfctl, and add a test case for the specific case of interface names starting with a number. Note that we don't support UTF-8 names fully, so those may still fail. PR: 295064 MFC after: 1 week Sponsored by: Rubicon Communications, LLC ("Netgate") (cherry picked from commit 4e7c1ff95a5187faee524055f22c4cf4134d1147) --- sbin/pfctl/parse.y | 2 +- tests/sys/netpfil/pf/names.sh | 40 ++++++++++++++++++++++++++++++++++++++++ 2 files changed, 41 insertions(+), 1 deletion(-) diff --git a/sbin/pfctl/parse.y b/sbin/pfctl/parse.y index c733a9496a59..aea30cb33481 100644 --- a/sbin/pfctl/parse.y +++ b/sbin/pfctl/parse.y @@ -3764,7 +3764,7 @@ dynaddr : '(' STRING ')' { char *p, *op; op = $2; - if (!isalpha(op[0])) { + if (op[0] == '\0') { yyerror("invalid interface name '%s'", op); free(op); YYERROR; diff --git a/tests/sys/netpfil/pf/names.sh b/tests/sys/netpfil/pf/names.sh index e47b0917cfec..c6f2a06c15f9 100644 --- a/tests/sys/netpfil/pf/names.sh +++ b/tests/sys/netpfil/pf/names.sh @@ -95,8 +95,48 @@ group_cleanup() pft_cleanup } +atf_test_case "start_number" "cleanup" +start_number_head() +{ + atf_set descr 'Test interface names starting with a number' + atf_set require.user root +} + +start_number_body() +{ + pft_init + + epair=$(vnet_mkepair) + ifconfig ${epair}a 192.0.2.1/24 up + + vnet_mkjail alcatraz ${epair}b + jexec alcatraz ifconfig ${epair}b 192.0.2.2/24 up + jexec alcatraz ifconfig ${epair}b name 4ever + jexec alcatraz pfctl -e + + jexec alcatraz ifconfig + + pft_set_rules alcatraz \ + "block" \ + "pass in from any to (4ever)" + + atf_check -o ignore ping -c 3 192.0.2.2 + + # Negative test, if the interface doesn't exist we don't pass packets + pft_set_rules alcatraz \ + "block" \ + "pass in from any to (5ever)" + atf_check -s exit:2 -o ignore ping -c 1 -t 1 192.0.2.2 +} + +start_number_cleanup() +{ + pft_cleanup +} + atf_init_test_cases() { atf_add_test_case "names" atf_add_test_case "group" + atf_add_test_case "start_number" } From nobody Sat May 16 16:44:49 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 4gHqfn4TrXz6cgNT for ; Sat, 16 May 2026 16:44: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 "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gHqfn2CqYz3wpK for ; Sat, 16 May 2026 16:44:49 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778949889; 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=bqtVtaw0cqspcxMHvkN+uEWCk8QtwXWRDi3FxJU7ZCU=; b=XAgFqUOgg6+/iNwC5m3VvWCR79M1bfbYS2Bu5POsVmxZo50wBsoTvCLL+qe6JYPApaPSwZ eOV8yDKLr8Kn9dDF10RKOnyzpiNiR0Jvy93MLvh+AysbXuhCPzNh0iIaSdFx5AHavnZiH2 j+OJ90yghTCF4ThFNJxDiHC5DIrklQ3tqA3R7azAD63grzQBNMyeBXSLW4bJHcrV8edAYD /hf4ikv0ngVbPXTwWHnJ3IpHbgwb2IaVeODzS634HUdSHW3wVGgGHkExn1mgjM4J3jTmRs FzQPpUdFbzlsa2geMeuXxFCj6VLjn0VIPucuNV1ETaPDZXI/FX3A+Q1SsLuvSA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778949889; a=rsa-sha256; cv=none; b=N6TGp4+VSfT3ojQNUaE7RZZAlG6R2Z0vSSxpI007RpYvbsMizCIpcD0O1mtBhFCtlafffO GNr+zo+BrYbZKD+cM+WgNtDTNoVJlK++c9MG580RthM+iRqQpkKm6pKoMR5rFdfEeneIHl /unbC7dPdGO6rtVe4gV/amWorXH1pH2l2cB3hGpFnZA3mZnCWvdQY97DRX56Q1LC+2l6cY 5w5dckXLhfBHRZO66m90I8uNN0jYqt3986sKsY8myB00UYsPftrk7pRPi7apjb4EKtZNJH QGtqR6M/Vn+4+AhmP9Wgl3+yuZzR99tb/u4MuNHK8DFU0eqTAagk+3HSpWKgug== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778949889; 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=bqtVtaw0cqspcxMHvkN+uEWCk8QtwXWRDi3FxJU7ZCU=; b=GlZr0RSIyobMW+AqPgc0J/CsPDENRjn+yEvoUOd2zncj2iUe/W6buW9IeHsor+SOd3+dKT EMV5F3ucdbFR0JeaWRcrzhEGeKfLICfwatjW50DVbrocL7bQafY/K4FZh5mt6esoE6xDrY sT0FgbV5WQK/C4HA3dylKAtTt83A50zTC4KLHwA9NCTHM/YK91fdEGJJj6Js1cH5b5pJ61 iruc2ZWDaep+fwY7tjiS8nXFLbNq/MC19ZLKka94WMY75mQFGXetL9eAKzvh/QfcvVj07T l4HrjbrHLa5k0x1aJzxZVfgN+GmYvOGb01DKFGF3baUo3G1bq+7Z6xqN/T6L4g== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gHqfn1BkNz12Cd for ; Sat, 16 May 2026 16:44:49 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 19089 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sat, 16 May 2026 16:44:49 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Kristof Provost Subject: git: e5536b061033 - stable/14 - pfctl: relax interface name requirement 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: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org List-Id: 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: kp X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: e5536b061033bdc56cee7c1d42ab4fc17f5b8051 Auto-Submitted: auto-generated Date: Sat, 16 May 2026 16:44:49 +0000 Message-Id: <6a089f01.19089.5fbc9155@gitrepo.freebsd.org> The branch stable/14 has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=e5536b061033bdc56cee7c1d42ab4fc17f5b8051 commit e5536b061033bdc56cee7c1d42ab4fc17f5b8051 Author: Kristof Provost AuthorDate: 2026-05-07 09:58:17 +0000 Commit: Kristof Provost CommitDate: 2026-05-14 19:04:19 +0000 pfctl: relax interface name requirement The FreeBSD network stack, for better or worse, does not impose any requirements on interface names. As such it's valid for an interface name to start with a number (or indeed, be something like '⭐'). Allow this in pfctl, and add a test case for the specific case of interface names starting with a number. Note that we don't support UTF-8 names fully, so those may still fail. PR: 295064 MFC after: 1 week Sponsored by: Rubicon Communications, LLC ("Netgate") (cherry picked from commit 4e7c1ff95a5187faee524055f22c4cf4134d1147) --- sbin/pfctl/parse.y | 2 +- tests/sys/netpfil/pf/names.sh | 40 ++++++++++++++++++++++++++++++++++++++++ 2 files changed, 41 insertions(+), 1 deletion(-) diff --git a/sbin/pfctl/parse.y b/sbin/pfctl/parse.y index 58245ca642e0..df17486a5d45 100644 --- a/sbin/pfctl/parse.y +++ b/sbin/pfctl/parse.y @@ -3728,7 +3728,7 @@ dynaddr : '(' STRING ')' { char *p, *op; op = $2; - if (!isalpha(op[0])) { + if (op[0] == '\0') { yyerror("invalid interface name '%s'", op); free(op); YYERROR; diff --git a/tests/sys/netpfil/pf/names.sh b/tests/sys/netpfil/pf/names.sh index e47b0917cfec..c6f2a06c15f9 100644 --- a/tests/sys/netpfil/pf/names.sh +++ b/tests/sys/netpfil/pf/names.sh @@ -95,8 +95,48 @@ group_cleanup() pft_cleanup } +atf_test_case "start_number" "cleanup" +start_number_head() +{ + atf_set descr 'Test interface names starting with a number' + atf_set require.user root +} + +start_number_body() +{ + pft_init + + epair=$(vnet_mkepair) + ifconfig ${epair}a 192.0.2.1/24 up + + vnet_mkjail alcatraz ${epair}b + jexec alcatraz ifconfig ${epair}b 192.0.2.2/24 up + jexec alcatraz ifconfig ${epair}b name 4ever + jexec alcatraz pfctl -e + + jexec alcatraz ifconfig + + pft_set_rules alcatraz \ + "block" \ + "pass in from any to (4ever)" + + atf_check -o ignore ping -c 3 192.0.2.2 + + # Negative test, if the interface doesn't exist we don't pass packets + pft_set_rules alcatraz \ + "block" \ + "pass in from any to (5ever)" + atf_check -s exit:2 -o ignore ping -c 1 -t 1 192.0.2.2 +} + +start_number_cleanup() +{ + pft_cleanup +} + atf_init_test_cases() { atf_add_test_case "names" atf_add_test_case "group" + atf_add_test_case "start_number" } From nobody Sat May 16 21:22:06 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 4gHxpk29dXz6d5Kh for ; Sat, 16 May 2026 21:22: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 "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gHxpk1Kvjz3mx9 for ; Sat, 16 May 2026 21:22:06 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778966526; 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=CDYKfU7+72Tx2niolu346e6Is+s7i7xwwXzsc4KREnY=; b=CjvtTLuY3Yo5mKj+OIjztjhoRQwcAwuE3nu/92DxTvSUXVLNjknBIDqlHsnGbockFcUxhS G3EUd98okDLJpD9Az0dAqroY/sqZ4NZMBIPAX387OKZbYJJeuzMuzbXvQdxkpSr0RYTYa3 /Yv8AdYNLx3/2cV6tXyrGZWdBJT8/eaSsq9SLAgpDbb3AXQcltsf4j9l8BkWbKR3SCUVKs knSCTjIirmwDm+ZXknFgMW776TX8AJQ1yAhgKFzFJlqrknBkKhGRLw2TPCGGjJcCCCYHpN sjhEeb6EWa+d8QTF0/HFAYhfDevMnmEo/xRxMW4UPYG+UnZGjhlLFXd9VMLjIg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778966526; a=rsa-sha256; cv=none; b=aixEuRKbKF7SyL0xLwJTOGl3xIjkvEQE+qCOPc8lEGAEgfY5Y07H/0G1x29w7aM6IOlmnM a/AV6pSvhxuoN8avw5xj6mwPC4wU8ndFV0haQsTrwVY5EFQQGcGQlnDa+edELriWkxNeXk 79o5OiGZW34cmzbtKNdr5+pppYgI+jANfawdlVFYH1pIXUAMmanriwT2Ivsravq5E0uS/b sgXaPMTOaltQ+yF4Gqw3DUWeb0LK+4g8AlKwQgYquGDKuUIPE/6xmCXljUr0UZVq1lBa+M jR1StI1b8IgXT1FNHAhCeAn3rMpSy86xVMe/wI528l9GMW+D87a+HO767LkoxA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778966526; 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=CDYKfU7+72Tx2niolu346e6Is+s7i7xwwXzsc4KREnY=; b=ebJJ03JfO3wkG93KKxKjie3WDGtFcJhc4nLZgCa27B7Tm1RC2LoJfICyj3jIbLLSH51mFK O4DXmv77X6mF5iVCPpqAR88y94sMZf6+2uCCvFzZBXxme9jBnbR29018+lOeGVi0cfWcZQ /2AQVW4T4P4d2pwWlimU2631pssEtEedQBJAAVlgrLTzWki9C2hTqB/wPoI52RSUA3B0Sl sYZlNv7MqLLRQx74XF9FGBniuq0U6fAJiBAay5Dem+r3/G3SiHq6jPX8dky8kP99O6rRYt Pjl9UX4Ez0yyckbNodYQYmvZ8SqMnL2Z9HghA4jeAoBqm+PnZFcR0pfQKka2ZQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gHxpk0rkZz1B3J for ; Sat, 16 May 2026 21:22:06 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3f315 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sat, 16 May 2026 21:22:06 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Pouria Mousavizadeh Tehrani Subject: git: 2c6617658f0c - stable/15 - rtnetlink: Align RTA_MULTIPATH length validation in nlattr_get 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: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org List-Id: 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: pouria X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 2c6617658f0cabb1e83a47da02882454e4210bd9 Auto-Submitted: auto-generated Date: Sat, 16 May 2026 21:22:06 +0000 Message-Id: <6a08dffe.3f315.34bbd51a@gitrepo.freebsd.org> The branch stable/15 has been updated by pouria: URL: https://cgit.FreeBSD.org/src/commit/?id=2c6617658f0cabb1e83a47da02882454e4210bd9 commit 2c6617658f0cabb1e83a47da02882454e4210bd9 Author: Pouria Mousavizadeh Tehrani AuthorDate: 2026-05-12 11:34:28 +0000 Commit: Pouria Mousavizadeh Tehrani CommitDate: 2026-05-16 21:21:50 +0000 rtnetlink: Align RTA_MULTIPATH length validation in nlattr_get Fix length validation of RTA_MULTIPATH attributes in nlattr_get_multipath() by making sure the user request is align. PR: 295102 Reported by: Robert Morris Reviewed by: markj Fixes: 7e5bf68495cc ("netlink: add netlink support") MFC after: 3 days Differential Revision: https://reviews.freebsd.org/D56963 (cherry picked from commit 4329663a861ef74796b79b6b0872cfe10d31c591) --- sys/netlink/route/rt.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/netlink/route/rt.c b/sys/netlink/route/rt.c index 4d7f676d2aec..7641417a8e77 100644 --- a/sys/netlink/route/rt.c +++ b/sys/netlink/route/rt.c @@ -452,8 +452,9 @@ nlattr_get_multipath(struct nlattr *nla, struct nl_pstate *npt, for (rtnh = (struct rtnexthop *)(nla + 1); data_len > 0; ) { struct rta_mpath_nh *mpnh; + len = NL_ITEM_ALIGN(rtnh->rtnh_len); if (__predict_false(rtnh->rtnh_len <= sizeof(*rtnh) || - rtnh->rtnh_len > data_len)) { + len < rtnh->rtnh_len || len > data_len)) { NLMSG_REPORT_ERR_MSG(npt, "%s: bad length %u", __func__, rtnh->rtnh_len); return (EINVAL); @@ -467,7 +468,6 @@ nlattr_get_multipath(struct nlattr *nla, struct nl_pstate *npt, mp->num_nhops - 1); return (error); } - len = NL_ITEM_ALIGN(rtnh->rtnh_len); data_len -= len; rtnh = (struct rtnexthop *)((char *)rtnh + len); } From nobody Sat May 16 21:25:48 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 4gHxv060mBz6d5vM for ; Sat, 16 May 2026 21:25:48 +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 "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gHxv05HKgz3nY9 for ; Sat, 16 May 2026 21:25:48 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778966748; 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=MupTa/AJc1W3SYIvCcBMLRKYIu7QXb3LRyrPWSWQn9Y=; b=jiRMntIVLWBAs3H8P8P96RBCvrnpwRKLKwLeioNsws3mMAxcFh/+v2IOl+I5UTEEFsqdsY ikCzVdirgx+ajqpmw40WJrB5lY/j/HtDx6SkDJZg0viFSTfZef5y4u6d/t9SBHnNObP2xJ 6zDCkoWs3WCm1YDxj4flpb/eT0f5IqHuBuC99F5BgikSoEyf2VLMCm+lXeht2GRjPvfjDx RaEzBoO5tlQdPy3TBhyoD7q6Mx4Sq+rwFO89yrmfOe7MWkK88RRlf6gUaTuYuyMwXqIhkZ OeodL1N2j8rRSQJyIjCO9xxrwHMVI+BI13xHMDI/mD/OAEJV1VADN+M2Mf4MJA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778966748; a=rsa-sha256; cv=none; b=ffxC7GCTkPF3jNZqoIbWE2PgApg7HPhDxKBaXdYyRKB4qFNkccw5A/llEeuXlE/D2XKRqQ kdzjg93JHnB7r/+t/guFGBugIIRyG4WS4MOp9if1Yv2jXXocfcQE1IdzJguvsZafnGU6qA Dqx7pihgbi14vWERktOelI9NSY2UstXK5RPzUDon4C8YrBXQof6zRyg6Kv7kvm9ORKrIQd GqHYysUYyTYc6q7LcqSENKVBeWl2COG+9xIMBGaLuqlWg7PDX7M8APNZNkMjy1+uPMQdUZ lkQq4Cc6xJUzYPwg72u3giAcV3ct6d0io1jm0g0h/7WzkEaWYfbTbpMVJ3bJRA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778966748; 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=MupTa/AJc1W3SYIvCcBMLRKYIu7QXb3LRyrPWSWQn9Y=; b=qtw1rghYSrc0QSOAJwlrl4lzqYzbBdjqo56enUBHDT4jpHl7Ugz9mmuFON8r3lyLnOdBWT J9+DxWALg11SQvgymSo4JiXxD4gsh2/tMrrYhhmTfF6dpGSmkGqy/HrFv520lyhQZzxxJD UlzF3QNlbOJ3xUzUzXQmPQvf4EglDRW1F9eqpqSBhQkTzt8U9mkXqYgVsmijt8+IvvR/4G JWDohint4/VVVvLMvK/EDuCq5heARAiiVAgA5+yJ04cRfpjL1RBsf/PjrVp2LTWyqQTEiH UJ36OnWYY6V95T2J/tV0fgUNLhgxCqKfDLfJ9ls619olN9S7d4bnFvc2aNqxKw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gHxv04qqnz1B42 for ; Sat, 16 May 2026 21:25:48 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3f89d by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sat, 16 May 2026 21:25:48 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Pouria Mousavizadeh Tehrani Subject: git: 3e2308d57080 - stable/15 - rtnetlink: Check for allocation failure in nlattr_get_multipath() 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: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org List-Id: 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: pouria X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 3e2308d57080a2345e3db1139683368b504ee0bd Auto-Submitted: auto-generated Date: Sat, 16 May 2026 21:25:48 +0000 Message-Id: <6a08e0dc.3f89d.3a118d23@gitrepo.freebsd.org> The branch stable/15 has been updated by pouria: URL: https://cgit.FreeBSD.org/src/commit/?id=3e2308d57080a2345e3db1139683368b504ee0bd commit 3e2308d57080a2345e3db1139683368b504ee0bd Author: Pouria Mousavizadeh Tehrani AuthorDate: 2026-05-11 19:53:21 +0000 Commit: Pouria Mousavizadeh Tehrani CommitDate: 2026-05-16 21:24:19 +0000 rtnetlink: Check for allocation failure in nlattr_get_multipath() Check for alloction failure on `npt_alloc()` for RTA_MULTIPATH attributes in `nlattr_get_multipath()`. Reported by: Joshua Rogers of AISLE Research Team Reviewed by: markj MFC after: 3 days Differential Revision: https://reviews.freebsd.org/D56954 (cherry picked from commit 188631e43a1a5d2985156141c2e244a925670683) --- sys/netlink/route/rt.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/sys/netlink/route/rt.c b/sys/netlink/route/rt.c index 7641417a8e77..a76e00d34502 100644 --- a/sys/netlink/route/rt.c +++ b/sys/netlink/route/rt.c @@ -447,6 +447,10 @@ nlattr_get_multipath(struct nlattr *nla, struct nl_pstate *npt, max_nhops = data_len / sizeof(struct rtnexthop); mp = npt_alloc(npt, (max_nhops + 2) * sizeof(struct rta_mpath_nh)); + if (mp == NULL) { + NLMSG_REPORT_ERR_MSG(npt, "%s: too many RTA_MULTIPATH", __func__); + return (ENOMEM); + } mp->num_nhops = 0; for (rtnh = (struct rtnexthop *)(nla + 1); data_len > 0; ) { From nobody Sat May 16 21:33:02 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 4gHy3L62XRz6d6d8 for ; Sat, 16 May 2026 21:33:02 +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 "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gHy3L5B6Jz3p8h for ; Sat, 16 May 2026 21:33:02 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778967182; 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=SoRard80J+gNIx+OIGQBUzEBKiyqyP2pebtC9sqycdc=; b=SHR18u5lkFBMQhuasbD414Fkpupy7a/c705sSq6C15zXs/OLyKM5/Xf5hB1ZftrEyRccru WztTR4XxE1C4s1Tu8VX+Vnb7Qt0x62RNst72+iRxqNdEUav+IcRvfHhYVsef8/Inkc+/QZ p+F1T6rUfJJHeBLsCzGArVWRRL26q+GBEy6EXMMPj35qksNzWeHXgcyDfs7AeurPFLsmGh 4w3ybMMO05Wav0EX9bmsKKwkD1xDhyHKjarQN7AgPpaE7/VUnPOCm18mWvpqNfPcTwvkls KcT0ciZ/0kNB6HLA0gIQtROZWcNY+qlLwLjYmtdFy1IGdOra/HkuqBTnP9QnDA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778967182; a=rsa-sha256; cv=none; b=yGL1t4FVsjW+P31FOCd++XtDZPhY7CUUZxCYGq99cOACR5715NISRWZyK+QY3ZC/pAWhk3 o56V6jWdb0Q9mEuchsxQWRjMTHgBmJqzcsPaXNB682/yOyMX96Yrmx0chQxvzz5iL7x866 o3+pCagIBvVeafSzztnS6cxvtCrEADNh6jm/xF4thb0ppGpzfXyQk7mO6MzDDvQ0rtNy89 oWLLpqLtDrYIVvddvGidpmhHqDeuAjsVWgiInztUdWpiH2Zr3s4rPG1fqIVEoSTD4vH80h mGs1pYZSxjIu0IFrLL635IioH9ly8JhW+rJZxTCWbhXCfUX1iPgDMQELCqW/zA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778967182; 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=SoRard80J+gNIx+OIGQBUzEBKiyqyP2pebtC9sqycdc=; b=apxr30/QZVRPZGlvEXlBSWbb+EW5Mj38eL81pnOr7vnVWJxM/56VbPi0PVwQcEZ2c+d55i BmKgzcmeckvqZRqRbz9VGh7tfGuPcT3h/NMfPYF8DNCJj+h4XXYXUirEf8FCUqkTYSKzVw yAhPk2omgxmh8oyPWfIznCWJyZ9DtxEB9jv+cAxtlzEe+/S5da9m54tQBEPNOIS8k4qNRA Iks9iSArvDX/CmcIl/mlV9qU3X2deI/ZBocIji/IPrzw9AiPIweB/HiwNzYvvZYGXrwGQN dgWxV+sC48Ww4ouUZFUZrCsZQqQ9cTt1LK/t8NkuqADFaQZ44H/d6Iwr00hokA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gHy3L4hNTz1B73 for ; Sat, 16 May 2026 21:33:02 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3e9ef by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sat, 16 May 2026 21:33:02 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Pouria Mousavizadeh Tehrani Subject: git: 44be923a2b6b - stable/14 - rtnetlink: Align RTA_MULTIPATH length validation in nlattr_get 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: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org List-Id: 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: pouria X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 44be923a2b6bacd664b7e87e486cccd6fcc7cbad Auto-Submitted: auto-generated Date: Sat, 16 May 2026 21:33:02 +0000 Message-Id: <6a08e28e.3e9ef.c86f21b@gitrepo.freebsd.org> The branch stable/14 has been updated by pouria: URL: https://cgit.FreeBSD.org/src/commit/?id=44be923a2b6bacd664b7e87e486cccd6fcc7cbad commit 44be923a2b6bacd664b7e87e486cccd6fcc7cbad Author: Pouria Mousavizadeh Tehrani AuthorDate: 2026-05-12 11:34:28 +0000 Commit: Pouria Mousavizadeh Tehrani CommitDate: 2026-05-16 21:28:09 +0000 rtnetlink: Align RTA_MULTIPATH length validation in nlattr_get Fix length validation of RTA_MULTIPATH attributes in nlattr_get_multipath() by making sure the user request is align. PR: 295102 Reported by: Robert Morris Reviewed by: markj Fixes: 7e5bf68495cc ("netlink: add netlink support") MFC after: 3 days Differential Revision: https://reviews.freebsd.org/D56963 (cherry picked from commit 4329663a861ef74796b79b6b0872cfe10d31c591) (cherry picked from commit 2c6617658f0cabb1e83a47da02882454e4210bd9) --- sys/netlink/route/rt.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/netlink/route/rt.c b/sys/netlink/route/rt.c index 7a6ba6ef27c5..8e9203182d76 100644 --- a/sys/netlink/route/rt.c +++ b/sys/netlink/route/rt.c @@ -448,8 +448,9 @@ nlattr_get_multipath(struct nlattr *nla, struct nl_pstate *npt, for (rtnh = (struct rtnexthop *)(nla + 1); data_len > 0; ) { struct rta_mpath_nh *mpnh; + len = NL_ITEM_ALIGN(rtnh->rtnh_len); if (__predict_false(rtnh->rtnh_len <= sizeof(*rtnh) || - rtnh->rtnh_len > data_len)) { + len < rtnh->rtnh_len || len > data_len)) { NLMSG_REPORT_ERR_MSG(npt, "%s: bad length %u", __func__, rtnh->rtnh_len); return (EINVAL); @@ -463,7 +464,6 @@ nlattr_get_multipath(struct nlattr *nla, struct nl_pstate *npt, mp->num_nhops - 1); return (error); } - len = NL_ITEM_ALIGN(rtnh->rtnh_len); data_len -= len; rtnh = (struct rtnexthop *)((char *)rtnh + len); } From nobody Sat May 16 21:33:03 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 4gHy3N1hFFz6d6Zg for ; Sat, 16 May 2026 21:33:04 +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 "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gHy3M6TNqz3pbj for ; Sat, 16 May 2026 21:33:03 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778967183; 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=Q6scHIhUVZthHUmIJBkpn09ZI3l+uevuG0zmT0Yfssg=; b=vFbwUS2DmBubM7tw5/pGy16+JmSBuwZ4uSH3ExWFvyZ1lHJ2A00b37dsYqYP4Ppx73GzVz pmVDuD7JagpF7hKYEKkWor5nk5YP8PH7F+CAbSdJuFrEieO/Hlo2a4jcVxleiPwhg/BKql beKnf6upSII+gYYAj7Yu7QaiP7RtwOje6uyThBApIDcll6YJSfI/QDBFT53nfYpD+ABnvY 6G0H6SEsi4wYaY/Mq4ax7sG22QR3Mi0GSTTiNJYbLRqUKBUuCfWXXaY6ugxE5Gt/0aCHpM fNzDaKTvKfoM99YgdnNudotTfLkyx+e6YStyWUVddyHDw29QgYEwmpI8eUJ2Gg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778967183; a=rsa-sha256; cv=none; b=SvTXKrIKiIpxesdcqYQ0gSQQJo3ocBy6izlQySLVzQQIHZsGPyR9a18oTO8qGgZdIilyxd +3ry1P/w2ik2Q4oDyJEe/aRXspKAqq+yewI8YAvIOCWZ8aAKSUyXbfdrnHgK4NLIXiKnmL y8tclP2tFXuxH1aBbWkj9SiG/zu1oScFQpsoXpvOajAVqM+6SCtbnkVePSif96hVHvLvGC NUjXgtwYqtGv8czF1VGvyUQxdg92kfPr+1LX2P99+isCS4GEnARqRGLOCCcjgl/DqQxlGr 09uUefeb+t1vGEb/kN8odcLCeR3lFefhVg9YeJnmaaI1eC40dk94K3giPsC28g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778967183; 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=Q6scHIhUVZthHUmIJBkpn09ZI3l+uevuG0zmT0Yfssg=; b=JzP9iMGtdPr41iOklaELoj5WJUvTaq/Oi5hF06R76DD6rgsNdCdvH7iFp6Oz9KFWxGuKW1 A7FF5RV8EroyY+mqtzmtmtGsJyqXfpplzNTfDRknrBOKR5cQRslKQu+UD3rT6yUGPg8JnP qJIC+X4AyY8L8z8CJ5gdsp/Vd+smKrbZSFLPfMhnhyTlC7wBs6AI2cbfhWkpMVMFfd9fxm slSwsaklw5Y0v62P4/sAmGALlQfOrWpjobGOLDCj4UnnH/vmUqOlrZ0/MI/3ohcyg/yHiX smIINS3d7Qd8JYr3nxNq9eT7NCgBLsV5rdqov3HLsrGY+cuQUIJaM0fATlJx2A== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gHy3M5XRDz1BD5 for ; Sat, 16 May 2026 21:33:03 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 4011c by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sat, 16 May 2026 21:33:03 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Pouria Mousavizadeh Tehrani Subject: git: c9b5ce2422cc - stable/14 - rtnetlink: Check for allocation failure in nlattr_get_multipath() 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: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org List-Id: 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: pouria X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: c9b5ce2422cc1494a0dffee4c4e5864e39217472 Auto-Submitted: auto-generated Date: Sat, 16 May 2026 21:33:03 +0000 Message-Id: <6a08e28f.4011c.6e6e6a59@gitrepo.freebsd.org> The branch stable/14 has been updated by pouria: URL: https://cgit.FreeBSD.org/src/commit/?id=c9b5ce2422cc1494a0dffee4c4e5864e39217472 commit c9b5ce2422cc1494a0dffee4c4e5864e39217472 Author: Pouria Mousavizadeh Tehrani AuthorDate: 2026-05-11 19:53:21 +0000 Commit: Pouria Mousavizadeh Tehrani CommitDate: 2026-05-16 21:28:30 +0000 rtnetlink: Check for allocation failure in nlattr_get_multipath() Check for alloction failure on `npt_alloc()` for RTA_MULTIPATH attributes in `nlattr_get_multipath()`. Reported by: Joshua Rogers of AISLE Research Team Reviewed by: markj MFC after: 3 days Differential Revision: https://reviews.freebsd.org/D56954 (cherry picked from commit 188631e43a1a5d2985156141c2e244a925670683) (cherry picked from commit 3e2308d57080a2345e3db1139683368b504ee0bd) --- sys/netlink/route/rt.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/sys/netlink/route/rt.c b/sys/netlink/route/rt.c index 8e9203182d76..fac174e01efd 100644 --- a/sys/netlink/route/rt.c +++ b/sys/netlink/route/rt.c @@ -443,6 +443,10 @@ nlattr_get_multipath(struct nlattr *nla, struct nl_pstate *npt, max_nhops = data_len / sizeof(struct rtnexthop); mp = npt_alloc(npt, (max_nhops + 2) * sizeof(struct rta_mpath_nh)); + if (mp == NULL) { + NLMSG_REPORT_ERR_MSG(npt, "%s: too many RTA_MULTIPATH", __func__); + return (ENOMEM); + } mp->num_nhops = 0; for (rtnh = (struct rtnexthop *)(nla + 1); data_len > 0; ) { From nobody Sun May 17 00:29:37 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 4gJ1z52Xpkz6dM0P for ; Sun, 17 May 2026 00:29:37 +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 "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gJ1z51pLbz4DYZ for ; Sun, 17 May 2026 00:29:37 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778977777; 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=q+WhIpwUGHV63I1nxs7UdFc3C+4HhnEIEYUVSADrji8=; b=qX7ra8Mckf+ZQIPEKoChhKHb5vyCqAJijlI0MYseob0kmZnWVzP2cvNNjce4tNivHeA8fs cI7nCJHsZVBV5y3eWImj3M9RFTVlmGldK9J58I1kky6tSQft+l0j4s1zPay1W+dNa53GN0 nW+dCxT3o/0hEWoSODbEOWjYHl0a5UWQDgU9BJwsQHgHZQwzif6eWTYpG+WbDlXcnGO4JK dDH93eDgrdidpGzdHpDllNZ5xrZVTn3Laddw7PBLqS0gNh/UFWMeRJFyNDBJlyL/7otxQC Egdy5pwxjQsXq5/WkJCWXhtrp2zf3s3H3n9ODRciug55kLa2Mwf74umDbsYjSg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778977777; a=rsa-sha256; cv=none; b=q2+BOHx09utKFFbliG1sj+8iwhTUyoyw1nQSyQ9aRm63crWNOHxCcA3wvuzJ3Scbckj52T 24mt/gFbuThNXfVjlyZFyCbWkJCoCR+KtDyb2rfu0U+ehIYdkJtOFH/3DkR+w6dTOKfq5B jAseidkB7kOthWuwVjdTiyP3Tg9/i3Rt1BEkNFg67criH1oNrCUU1qbd2XzGvsGnCJxC1P q9F2jg8cieZX9lOOeRtsOH4yw8GRa6qwEjAjJqxmDmCbBSo3dOQb1DkjpOg3F5RU4wdbRt iKFLwiY5YRyrpQjSyZv0tT79fkjDsYdREg4klNsaHza9YZwcK7/+7sppH5p4Jg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778977777; 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=q+WhIpwUGHV63I1nxs7UdFc3C+4HhnEIEYUVSADrji8=; b=fx5tumjsKOIvsKuAnPi2pDou0YmVbKLyvZiVuX6wS71gus5P/wS8KlLBlUbFYH0eSr71rB q0qJFEvHxg4nR4cX/6EgqRyb6DO/Lb8sGm3QKJPmvnYO2UDEQua4vlR8FwSclTNDvt3OuJ GFR0xnkaUR4TBgHHfv8pGGG4AoU4vhZuqyObpRQBdVqptdE9y45r+vzL8y3O8pD9KjFf1u BSDk9R8SgLkxDDK9w45DCWWP/+gNv+HIjRdJZLOXI57dkRAAbAzmknOwC+AXr3D2fMbFoI +5JpXBqHq0bJjSutAoDyFXhX9+uYBERClCYQUaOo6qHGOMkiOx/3JwlH2hPzoA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gJ1z517qgz27W for ; Sun, 17 May 2026 00:29:37 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 20554 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 17 May 2026 00:29:37 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: c34ca8fb21fa - stable/15 - sys/cdefs.h: move __BEGIN_DECLS/__END_DECLS into a helper sys/_decls.h 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: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org List-Id: 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: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: c34ca8fb21fa0cd01b314a0cb156f52a73bca562 Auto-Submitted: auto-generated Date: Sun, 17 May 2026 00:29:37 +0000 Message-Id: <6a090bf1.20554.1ad69150@gitrepo.freebsd.org> The branch stable/15 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=c34ca8fb21fa0cd01b314a0cb156f52a73bca562 commit c34ca8fb21fa0cd01b314a0cb156f52a73bca562 Author: Konstantin Belousov AuthorDate: 2026-05-08 14:13:35 +0000 Commit: Konstantin Belousov CommitDate: 2026-05-17 00:27:48 +0000 sys/cdefs.h: move __BEGIN_DECLS/__END_DECLS into a helper sys/_decls.h (cherry picked from commit ea72f6d5a8b9386a09e23fbdc933effb007ca899) --- sys/sys/_decls.h | 46 ++++++++++++++++++++++++++++++++++++++++++++++ sys/sys/cdefs.h | 8 +------- tools/build/Makefile | 1 + 3 files changed, 48 insertions(+), 7 deletions(-) diff --git a/sys/sys/_decls.h b/sys/sys/_decls.h new file mode 100644 index 000000000000..2ef61671dd70 --- /dev/null +++ b/sys/sys/_decls.h @@ -0,0 +1,46 @@ +/*- + * SPDX-License-Identifier: BSD-3-Clause + * + * Copyright (c) 1991, 1993 + * The Regents of the University of California. All rights reserved. + * + * This code is derived from software contributed to Berkeley by + * Berkeley Software Design, Inc. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * 3. Neither the name of the University nor the names of its contributors + * may be used to endorse or promote products derived from this software + * without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + */ + +#ifndef _SYS__DECLS_H_ +#define _SYS__DECLS_H_ + +#if defined(__cplusplus) +#define __BEGIN_DECLS extern "C" { +#define __END_DECLS } +#else +#define __BEGIN_DECLS +#define __END_DECLS +#endif + +#endif diff --git a/sys/sys/cdefs.h b/sys/sys/cdefs.h index 132d4809b0ed..916668a52fc0 100644 --- a/sys/sys/cdefs.h +++ b/sys/sys/cdefs.h @@ -61,13 +61,7 @@ #define __has_builtin(x) 0 #endif -#if defined(__cplusplus) -#define __BEGIN_DECLS extern "C" { -#define __END_DECLS } -#else -#define __BEGIN_DECLS -#define __END_DECLS -#endif +#include /* * This code has been put in place to help reduce the addition of diff --git a/tools/build/Makefile b/tools/build/Makefile index e1ccfa21d356..b0506806ba18 100644 --- a/tools/build/Makefile +++ b/tools/build/Makefile @@ -353,6 +353,7 @@ DISKINCS+= ${SRCTOP}/sys/sys/disk/bsd.h .if ${.MAKE.OS} == "FreeBSD" # Needed to build most of the things below, which include sys/cdefs.h either # directly or transitively +SYSINCS+= ${SRCTOP}/sys/sys/_decls.h SYSINCS+= ${SRCTOP}/sys/sys/_visible.h SYSINCS+= ${SRCTOP}/sys/sys/cdefs.h .endif From nobody Sun May 17 00:29:38 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 4gJ1z64RfFz6dM56 for ; Sun, 17 May 2026 00:29:38 +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 "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gJ1z62hmBz4Dfd for ; Sun, 17 May 2026 00:29:38 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778977778; 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=mhTiCpn9WqMD34QKDU+uEzJ0k27fpOhViESH4w5G9XM=; b=rLWcdteMYTAMPjx5+G4Taf4CfuIIb0HZ+IwIHjulTpGKCQIPicqar9Td7ExW2RsJkWc+R2 zECgbuu0xSzBaOHG9IEY4vbuwyUyH+FUtpb5zvghbFhjhAQ/9JOIBIw6bGYCJsTSmkqakl 7yKnyJQHlYExStJPt91IUPmQBs7rDe7snM7QV+4qBw1MLd5uV405RafSJSRKdIMQvc3NsZ EDlCr8JICuwnwNxSC4JVWFVUmLUc8bRG15pEDv6XhNVRdXOQKTVtuxpDqx5hn6y1feZfrO pwlitlm+HoRyOuNa1szDgIE2bxyh1JiSeEWIXn89ucJCzO77L43zlUhkd4Z7zA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778977778; a=rsa-sha256; cv=none; b=FlrFFD3Df3ij4I7Cv3YuIveFj+qjkvYLBvgUvgzG0J+PsjYQzgMoSXQoAS0KnfKauW+vDh CHDyiqahiuROqkXmhwEetxEJ5OcHGuLqGRGtocacXBne7YrwidVxfLjhTR8dL68Fhpk27T fJEb7MZ+8bj/PS1qC5RldNbDV4rsaw+dik11qY2WRhzZYaRUBfIGw9N4tyT5DnBiVrzI+G n8hQBam3RxZxeeW4oeJps7pH8oPv3phzVt5/LLw+18nmhiJb5pTyBrjzMwh8QJTwnNK8S1 6JR1chUBJ/WpoCwOcja8K0RYqSwAwy8vkqa5XbsKP5L4YeGtoliO/O8NB0Nx+Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778977778; 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=mhTiCpn9WqMD34QKDU+uEzJ0k27fpOhViESH4w5G9XM=; b=ieYD6qkGPvXv645MhsGJwmWoCUYRV8wvc6Qqv11bDyxjH90qhkwMlPqO1Yi9OKb0ypfLuy VUmJiFHROg6NtFknSKTLzeOu9aUTrwgkjehkONuoRJzKJOx1lCkksq96qrarwk5lM0WArj Cc9kVyHLUDi+byJah1EknS9aosbfQhmBkw6BHdlLpr3oasH02IbiGVCGCJiCTRYqp3TSC3 gy3pmKNhbo50ASugRL+r70wcgWuG2mhhn6YDdv7XzBv8mnN4EsJP/fCmN+6JPLNzNcXtCT O+AOsqyqMsjpW0inBvA5vDjdzpzU4lxuGmJ0gJDk5i+IS5X7UZBjNh+UR/Pcow== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gJ1z61zPJz2bx for ; Sun, 17 May 2026 00:29:38 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 22f85 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 17 May 2026 00:29:38 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Steve Kargl From: Konstantin Belousov Subject: git: 0093bb670537 - stable/15 - [libm] implementation of rsqrt, rsqrtf, and rsqrtl 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: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org List-Id: 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: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 0093bb670537f19e99fff2d46b4831d7b9d44b4c Auto-Submitted: auto-generated Date: Sun, 17 May 2026 00:29:38 +0000 Message-Id: <6a090bf2.22f85.265ea657@gitrepo.freebsd.org> The branch stable/15 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=0093bb670537f19e99fff2d46b4831d7b9d44b4c commit 0093bb670537f19e99fff2d46b4831d7b9d44b4c Author: Steve Kargl AuthorDate: 2026-05-08 14:06:08 +0000 Commit: Konstantin Belousov CommitDate: 2026-05-17 00:27:48 +0000 [libm] implementation of rsqrt, rsqrtf, and rsqrtl PR: 295089 (cherry picked from commit 3085fc9d97bd83785ba3ba43e0378d7d67987d1f) --- lib/msun/Makefile | 6 +- lib/msun/Symbol.map | 3 + lib/msun/man/sqrt.3 | 53 +++++++++++- lib/msun/src/math.h | 3 + lib/msun/src/math_private.h | 83 ++++++++++++++++++ lib/msun/src/s_rsqrt.c | 153 +++++++++++++++++++++++++++++++++ lib/msun/src/s_rsqrtf.c | 155 +++++++++++++++++++++++++++++++++ lib/msun/src/s_rsqrtl.c | 203 ++++++++++++++++++++++++++++++++++++++++++++ 8 files changed, 654 insertions(+), 5 deletions(-) diff --git a/lib/msun/Makefile b/lib/msun/Makefile index d61f4e9a1659..75917b9b6abe 100644 --- a/lib/msun/Makefile +++ b/lib/msun/Makefile @@ -86,7 +86,7 @@ COMMON_SRCS= b_tgamma.c \ s_lround.c s_lroundf.c s_lroundl.c s_modff.c \ s_nan.c s_nearbyint.c s_nextafter.c s_nextafterf.c \ s_nexttowardf.c s_remquo.c s_remquof.c \ - s_rint.c s_rintf.c s_round.c s_roundf.c \ + s_rint.c s_rintf.c s_round.c s_roundf.c s_rsqrt.c s_rsqrtf.c \ s_scalbln.c s_scalbn.c s_scalbnf.c s_signbit.c \ s_signgam.c s_significand.c s_significandf.c s_sin.c \ s_sincos.c s_sincosf.c s_sinf.c \ @@ -139,7 +139,7 @@ COMMON_SRCS+= b_tgammal.c catrigl.c \ s_fminl.c s_fminimuml.c s_fminimum_magl.c s_fminimum_numl.c \ s_frexpl.c s_logbl.c s_logl.c s_nanl.c \ s_nextafterl.c s_nexttoward.c s_remquol.c s_rintl.c s_roundl.c \ - s_scalbnl.c s_sinl.c s_sincosl.c s_sinpil.c \ + s_scalbnl.c s_sinl.c s_sincosl.c s_sinpil.c s_rsqrtl.c \ s_tanhl.c s_tanl.c s_tanpil.c s_truncl.c w_cabsl.c # Work around this warning from gcc: # lib/msun/ld80/e_powl.c:275:1: error: floating constant exceeds range of @@ -281,7 +281,7 @@ MLINKS+=sincos.3 sincosf.3 sin.3 sincosl.3 MLINKS+=sinh.3 sinhf.3 sinh.3 sinhl.3 MLINKS+=sinpi.3 sinpif.3 sinpi.3 sinpil.3 MLINKS+=sqrt.3 cbrt.3 sqrt.3 cbrtf.3 sqrt.3 cbrtl.3 sqrt.3 sqrtf.3 \ - sqrt.3 sqrtl.3 + sqrt.3 sqrtl.3 sqrt.3 rsqrt.3 sqrt.3 rsqrtf.3 sqrt.3 rsqrtl.3 MLINKS+=tan.3 tanf.3 tan.3 tanl.3 MLINKS+=tanh.3 tanhf.3 tanh.3 tanhl.3 MLINKS+=tanpi.3 tanpif.3 tanpi.3 tanpil.3 diff --git a/lib/msun/Symbol.map b/lib/msun/Symbol.map index 35addfcee3d5..245a72984f72 100644 --- a/lib/msun/Symbol.map +++ b/lib/msun/Symbol.map @@ -338,4 +338,7 @@ FBSD_1.9 { fminimum_num; fminimum_numf; fminimum_numl; + rsqrt; + rsqrtf; + rsqrtl; }; diff --git a/lib/msun/man/sqrt.3 b/lib/msun/man/sqrt.3 index f4a217353af0..6da6407ecc4b 100644 --- a/lib/msun/man/sqrt.3 +++ b/lib/msun/man/sqrt.3 @@ -25,17 +25,20 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd February 15, 2020 +.Dd May 7, 2026 .Dt SQRT 3 .Os .Sh NAME .Nm cbrt , .Nm cbrtf , .Nm cbrtl , +.Nm rsqrt , +.Nm rsqrtf , +.Nm rsqrtl, .Nm sqrt , .Nm sqrtf , .Nm sqrtl -.Nd cube root and square root functions +.Nd cube root, square root, and inverse square root functions .Sh LIBRARY .Lb libm .Sh SYNOPSIS @@ -47,6 +50,12 @@ .Ft long double .Fn cbrtl "long double x" .Ft double +.Fn rsqrt "double x" +.Ft float +.Fn rsqrtf "float x" +.Ft long double +.Fn rsqrtl "long double x" +.Ft double .Fn sqrt "double x" .Ft float .Fn sqrtf "float x" @@ -63,6 +72,15 @@ the cube root of .Fa x . .Pp The +.Fn rsqrt , +.Fn rsqrtf , +and +.Fn rsqrtl +functions compute +the inverse square root of +.Fa x . +.Pp +The .Fn sqrt , .Fn sqrtf , and @@ -77,6 +95,23 @@ The and .Fn cbrtl functions return the requested cube root. +.Pp +The +.Fn rsqrt , +.Fn rsqrtf , +and +.Fn rsqrtl +functions return 1 divided by the square root of +.Fa x +unless an error occurs. +An attempt to take the +.Fn rsqrt +of negative +.Fa x +raises an invalid exception and causes an \*(Na to be returned. +The inverse square root of \*(Pm0 returns \*(Pm\(if and +raises a divide-by-zero exception. +.Pp The .Fn sqrt , .Fn sqrtf , @@ -104,6 +139,13 @@ and .Fn sqrtl functions conform to .St -isoC-99 . +The +.Fn rsqrt , +.Fn rsqrtf , +and +.Fn rsqrtl +functions conform to ISO/IEC 9899:2024 ("ISO C23"). +.\" .St -isoC-24 . .Sh HISTORY The .Fn cbrt @@ -120,3 +162,10 @@ The .Fn cbrtl function appeared in .Fx 9.0 . +The +.Fn rsqrt , +.Fn rsqrtf , +and +.Fn rsqrtl +functions appeared in +.Fx 16.0 . diff --git a/lib/msun/src/math.h b/lib/msun/src/math.h index 853984953a91..7a91ed13da9c 100644 --- a/lib/msun/src/math.h +++ b/lib/msun/src/math.h @@ -538,6 +538,9 @@ long double fmaximum_numl(long double, long double); double fminimum_num(double, double); float fminimum_numf(float, float); long double fminimum_numl(long double, long double); +double rsqrt(double); +float rsqrtf(float); +long double rsqrtl(long double); #endif /* __ISO_C_VISIBLE >= 2023 */ __END_DECLS diff --git a/lib/msun/src/math_private.h b/lib/msun/src/math_private.h index fbd84e246ca7..e9055a9a8c61 100644 --- a/lib/msun/src/math_private.h +++ b/lib/msun/src/math_private.h @@ -471,6 +471,89 @@ do { \ (a) = __tmp; \ } while (0) +/* + * Split x into high and low bits where CC is 0x1p(N/2) + 1 where + * N is rounded up for types with odd precisions. + * + * #define _CC (0x1p12F + 1) // float + * #define _CC (0x1p27 + 1) // double + * #define _CC (0x1p32L + 1) // long double (LD80) + * #define _CC (0x1p57L + 1) // long double (LD128) + */ +#define _SPLIT(x, xh, xl) \ +do { \ + typeof(x) __t1; \ + __t1 = (x) * _CC; \ + xh = __t1 + ((x) - __t1); \ + xl = (x) - xh; \ +} while(0) + +/* + * FAST2SUM requires |x| >= |y|. x and y are full precision. + * Note, _2SUMF(x,y) above destroys x and y. + */ +#define _FAST2SUM(x, y, hi, lo) \ +do { \ + hi = (x) + (y); \ + lo = (y) - (hi - (x)); \ +} while(0) + +/* + * SLOW2SUM does not require |x| >= |y|. Here, x and y are full precision. + * The t1 temporary variable is volatile to prevent compiler optimizations. + * Note, _2SUM(x,y) above destroys x and y. + */ +#define _SLOW2SUM(x, y, hi, lo) \ +do { \ + volatile typeof(x) __t1; \ + typeof(x) __t2; \ + hi = (x) + (y); \ + __t1 = hi - (y); \ + __t2 = hi - __t1; \ + lo = ((x) - __t1) + ((y) - __t2); \ +} while(0) + +/* + * x and y are full precision quantities that have been split into high + * and low parts via the _SPLIT macro. x and y are added to give z as + * high and low parts. + */ +#define _XADD(xh, xl, yh, yl, zh, zl) \ +do { \ + typeof(xh) __s1, __s2, __s3, __s4, __s5, __s6; \ + _SLOW2SUM(xh, yh, __s1, __s2); \ + _SLOW2SUM(xl, yl, __s3, __s4); \ + _FAST2SUM(__s1, __s2 + __s3, __s5, __s6); \ + _FAST2SUM(__s5, __s6 + __s4, zh, zl); \ +} while(0) + +/* + * x and y are full precision quantities. r1 and r2 are full precision + * high and low parts of the multiplication x * y. + */ +#define _MUL(x, y, r1 ,r2) \ +do { \ + typeof(x) __xh, __xl, __yh, __yl; \ + typeof(x) __t1; \ + _SPLIT(x, __xh, __xl); \ + _SPLIT(y, __yh, __yl); \ + r1 = (x) * (y); \ + __t1 = __xh * __yl + (__xh * __yh - r1); \ + r2 = __xl * __yl + (__xl * __yh + __t1); \ +} while(0) + +/* + * x and y are full precision quantities that have been split into high + * and low parts via the _SPLIT macro. x and y are multiplied to give z + * as high and low parts. + */ +#define _XMUL(xh, xl, yh, yl, ph, pl) \ +do { \ + _MUL(xh, yh, ph, pl); \ + pl += xl * yl + xl * yh + xh * yl; \ +} while(0) + + /* * Common routine to process the arguments to nan(), nanf(), and nanl(). */ diff --git a/lib/msun/src/s_rsqrt.c b/lib/msun/src/s_rsqrt.c new file mode 100644 index 000000000000..0a513afe8ed2 --- /dev/null +++ b/lib/msun/src/s_rsqrt.c @@ -0,0 +1,153 @@ +/*- + * Copyright (c) 2026 Steven G. Kargl + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice unmodified, this list of conditions, and the following + * disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR + * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES + * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. + * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT + * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF + * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +/** + * Compute the inverse sqrt of x, i.e., rsqrt(x) = 1 / sqrt(x). + * + * First, filter out special cases: + * + * 1. rsqrt(+-0) = +-inf, and raise FE_DIVBYZERO exception. + * 2. rsqrt(nan) = NaN. + * 3. rsqrt(+inf) returns +0. + * 2. rsqrt(x<0) = NaN, and raises FE_INVALID. + * + * If x is a subnormal, scale x into the normal range by x*0x1pN; while + * recording the exponent of the scale factor N. Split the possibly + * scaled x into f*2^n with f in [0.5,1). Set m=n or m=n-N (subnormal). + * If n is odd, then set f = f/2 and increase n to n+1. Thus, f is + * in [0.25,1) with n even. + * + * An initial estimate of y = rqrt[f](x) is 1 / sqrt[f](x). Exhaustive + * testing of rsqrtf() gave a max ULP of 1.49; while testing 500M x in + * [0,1000] gave a max ULP of 1.24 for rsqrt(). The value of y is then + * used with one iteration of Goldschmidt's algorithm: + * + * z = x * y + * h = y / 2 + * r = 0.5 - h * z + * y = h * r + h + * + * A factor of 2 appears missing in the above, but it is included in the + * exponent m. + */ +#include +#include +#include "math.h" +#include "math_private.h" + +#pragma STDC FENV_ACCESS ON + +#ifdef _CC +#undef _CC +#endif +#define _CC (0x1p27 + 1) + +double +rsqrt(double x) +{ + volatile static const double vzero = 0; + static const double half = 0.5; + int hx, m, rnd; + uint32_t lx, ux; + double h, ph, pl, rh, rl, y, zh, zl; + + EXTRACT_WORDS(hx, lx, x); + ux = (uint32_t)hx & 0x7fffffff; + + /* x = +-0. Raise exception. */ + if ((ux | lx) == 0) + return (1 / x); + + /* x is NaN. */ + if (ux > 0x7ff00000) + return (x + x); + + /* x is +-inf. */ + if (ux == 0x7ff00000) + return (hx & 0x80000000 ? vzero / vzero : 0.); + + /* x < 0. Raise exception. */ + if (hx < 0) + return (vzero / vzero); + + /* + * If x is subnormal, then scale it into the normal range. + * Split x into significand and exponent, x = f * 2^m, with + * f in [0.5,1) and m a biased exponent. + */ + m = 0; + if (hx < 0x00100000) { /* Subnormal */ + x *= 0x1p54; + GET_HIGH_WORD(hx, x); + m = -54; + } + m += (hx >> 20) - 1022; + hx = (hx & 0x000fffff) | 0x3fe00000; + SET_HIGH_WORD(x, hx); + + /* m is odd. Put x into [0.25,5) and increase m. */ + if (m & 1) { + x /= 2; + m += 1; + } + m = -(m >> 1); /* Prepare for 2^(-m/2). */ + + y = 1 / sqrt(x); /* ~52-bit estimate. */ + + h = y / 2; + + /* + * For values of x with a representation of 0x1.ffffffffffffepN + * with N an odd integer, the computed rsqrt() is not correctly + * rounded in round-to-nearest without toggling the rounding mode + * to FE_TOWARDZERO. Note, FE_DOWNWARD also works. However, + * messing with the rounding mode is expensive, so only do it + * when necessary. Example, x = 3.9999999999999991 + * gives y --> hx = 0x3ff00000, lx = 0x00000001 + */ + EXTRACT_WORDS(hx, lx, y); + if ((hx & 0x000fffff) == 0 && lx == 1) { + rnd = fegetround(); + fesetround(FE_TOWARDZERO); + _MUL(x, y, zh, zl); + _XMUL(zh, zl, h, 0, ph, pl); + fesetround(rnd); + } else { + _MUL(x, y, zh, zl); + _XMUL(zh, zl, h, 0, ph, pl); + } + + _XADD(-ph, -pl, half, 0, rh, rl); + y = rh * h + h; + + ux = (m + 1024) << 20; + INSERT_WORDS(x, ux, 0); + return (y *= x); +} + +#if LDBL_MANT_DIG == 53 +__weak_reference(rsqrt, rsqrtl); +#endif diff --git a/lib/msun/src/s_rsqrtf.c b/lib/msun/src/s_rsqrtf.c new file mode 100644 index 000000000000..b71f7baf5657 --- /dev/null +++ b/lib/msun/src/s_rsqrtf.c @@ -0,0 +1,155 @@ +/*- + * Copyright (c) 2026 Steven G. Kargl + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice unmodified, this list of conditions, and the following + * disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR + * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES + * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. + * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT + * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF + * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +/** + * Compute the inverse sqrt of x, i.e., rsqrt(x) = 1 / sqrt(x). + * + * First, filter out special cases: + * + * 1. rsqrt(+-0) = +-inf, and raise FE_DIVBYZERO exception. + * 2. rsqrt(nan) = NaN. + * 3. rsqrt(+inf) returns +0. + * 2. rsqrt(x<0) = NaN, and raises FE_INVALID. + * + * If x is a subnormal, scale x into the normal range by x*0x1pN; while + * recording the exponent of the scale factor N. Split the possibly + * scaled x into f*2^n with f in [0.5,1). Set m=n or m=n-N (subnormal). + * If n is odd, then set f = f/2 and increase n to n+1. Thus, f is + * in [0.25,1) with n even. + * + * An initial estimate of y = rqrt[f](x) is 1 / sqrt[f](x). Exhaustive + * testing of rsqrtf() gave a max ULP of 1.49; while testing 500M x in + * [0,1000] gave a max ULP of 1.24 for rsqrt(). The value of y is then + * used with one iteration of Goldschmidt's algorithm: + * + * z = x * y + * h = y / 2 + * r = 0.5 - h * z + * y = h * r + h + * + * A factor of 2 appears missing in the above, but it is included in the + * exponent m. + */ +#include +#include +#include "math.h" +#include "math_private.h" + +#pragma STDC FENV_ACCESS ON + +#ifdef _CC +#undef _CC +#endif +#define _CC (0x1p12F + 1) + +float +rsqrtf(float x) +{ + volatile static const float vzero = 0; + static const float half = 0.5; + uint32_t ix, ux; + int m, rnd; + float h, ph, pl, rh, rl, y, zh, zl; + + GET_FLOAT_WORD(ix, x); + ux = ix & 0x7fffffff; + + /* x = +-0. Raise exception. */ + if (ux == 0) + return (1 / x); + + /* x is NaN. */ + if (ux > 0x7f800000) + return (x + x); + + /* x is +-inf. */ + if (ux == 0x7f800000) + return (ix & 0x80000000 ? vzero / vzero : 0.F); + + /* x < 0. Raise exception. */ + if (ix & 0x80000000) + return (vzero / vzero); + + /* + * If x is subnormal, then scale it into the normal range. + * Split x into significand and exponent, x = f * 2^m, with + * f in [0.5,1) and m a biased exponent. + */ + m = 0; + if (ux < 0x00800000) { /* Subnormal */ + x *= 0x1p25f; + GET_FLOAT_WORD(ix, x); + m = -25; + } + m += (ix >> 23) - 126; /* Unbiased exponent */ + ix = (ix & 0x007fffff) | 0x3f000000; + SET_FLOAT_WORD(x, ix); /* x is in [0.5,1). */ + + /* m is odd. Put x into [0.25,5) and increase m. */ + if (m & 1) { + x /= 2; + m += 1; + } + m = -(m >> 1); /* Prepare for 2^(-m/2). */ + + /* + * Exhaustive testing of rsqrtf(x) = 1 / sqrtf(x) with x in + * [0x1p-127,0x1p126] shows the this approximation gives a + * 22- to 23-bit estimate of rsqrt(f). This is equivalent to + * a max ulp of ~1.49. + */ + y = 1 / sqrtf(x); + + h = y / 2; + + /* + * For values of x with a representation of 0x1.fffffcpN with + * N an odd integer, the computed rsqrtf() is not correctly + * rounded in round-to-nearest without toggling the rounding + * mode to FE_TOWARDZERO. Note, FE_DOWNWARD also works. + * However, messing with the rounding mode is expensive, so + * only do it when necessary. Example, x = 0x1.fffffcp3 gives + * y --> 0x3f800001. + */ + GET_FLOAT_WORD(ix, y); + if ((ix & 0x000fffff) == 1) { + rnd = fegetround(); + fesetround(FE_TOWARDZERO); + _MUL(x, y, zh, zl); + _XMUL(zh, zl, h, 0, ph, pl); + fesetround(rnd); + } else { + _MUL(x, y, zh, zl); + _XMUL(zh, zl, h, 0, ph, pl); + } + + _XADD(-ph, -pl, half, 0, rh, rl); + y = h * rh + h; + + ix = (uint32_t)(m + 128) << 23; + SET_FLOAT_WORD(x, ix); + return (y *= x); +} diff --git a/lib/msun/src/s_rsqrtl.c b/lib/msun/src/s_rsqrtl.c new file mode 100644 index 000000000000..34d5cdc48173 --- /dev/null +++ b/lib/msun/src/s_rsqrtl.c @@ -0,0 +1,203 @@ +/*- + * Copyright (c) 2026 Steven G. Kargl + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice unmodified, this list of conditions, and the following + * disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR + * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES + * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. + * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT + * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF + * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +/** + * Compute the inverse sqrt of x, i.e., rsqrt(x) = 1 / sqrt(x). + * + * First, filter out special cases: + * + * 1. rsqrt(+-0) = +-inf, and raise FE_DIVBYZERO exception. + * 2. rsqrt(nan) = NaN. + * 3. rsqrt(+inf) returns +0. + * 2. rsqrt(x<0) = NaN, and raises FE_INVALID. + * + * If x is a subnormal, scale x into the normal range by x*0x1pN; while + * recording the exponent of the scale factor N. Split the possibly + * scaled x into f*2^n with f in [0.5,1). Set m=n or m=n-N (subnormal). + * If n is odd, then set f = f/2 and increase n to n+1. Thus, f is + * in [0.25,1) with n even. + * + * An initial estimate of y = rqrt[f](x) is 1 / sqrt[f](x). Exhaustive + * testing of rsqrtf() gave a max ULP of 1.49; while testing 500M x in + * [0,1000] gave a max ULP of 1.24 for rsqrt(). The value of y is then + * used with one iteration of Goldschmidt's algorithm: + * + * z = x * y + * h = y / 2 + * r = 0.5 - h * z + * y = h * r + h + * + * A factor of 2 appears missing in the above, but it is included in the + * exponent m. + */ +#include +#include +#include "math.h" +#include "math_private.h" +#include "fpmath.h" + +#pragma STDC FENV_ACCESS ON + +#if LDBL_MANT_DIG == 64 + +#ifdef _CC +#undef _CC +#endif +#define _CC (0x1p32L + 1) + +long double +rsqrtl(long double x) +{ + volatile static const double vzero = 0; + static const double half = 0.5; + uint32_t ux; + int m, rnd; + long double h, ph, pl, rh, rl, y, zh, zl; + union IEEEl2bits u; + + u.e = x; + ux = (u.bits.manl | u.bits.manh); + + /* x = +-0. Raise exception. */ + if ((u.bits.exp | ux) == 0) + return (1 / x); + + /* x is NaN or x is +-inf. */ + if (u.bits.exp == 0x7fff) + return (ux ? (x + x) : (u.bits.sign ? vzero / vzero : 0)); + + /* x < 0. Raise exception. */ + if (u.bits.sign) + return (vzero / vzero); + + /* + * If x is subnormal, then scale it into the normal range. + * Split x into significand and exponent, x = f * 2^m, with + * f in [0.5,1) and m a biased exponent. + */ + ENTERI(); + + if (u.bits.exp == 0) { /* Subnormal */ + u.e *= 0x1p512; + m = u.bits.exp - 0x41fe; + } else { + m = u.bits.exp - 0x3ffe; + } + u.bits.exp = 0x3ffe; + + /* m is odd. Put x into [0.25,5) and increase m. */ + if (m & 1) { + u.e /= 2; + m += 1; + } + m = -(m >> 1); /* Prepare for 2^(-m/2). */ + + y = 1 / sqrt((double)u.e); /* ~52-bit estimate. */ + y -= y * (u.e * y * y - 1) / 2; /* ~63-bit estimate. */ + + h = y / 2; + + _MUL(u.e, y, zh, zl); + _XMUL(zh, zl, h, 0, ph, pl); + _XADD(-ph, -pl, half, 0, rh, rl); + y = rh * h + h; + + u.e = 1; + u.xbits.expsign = 0x3fff + m + 1; + RETURNI(y * u.e); +} + +#else + +#ifdef _CC +#undef _CC +#endif +#define _CC (0x1p57L + 1) + +long double +rsqrtl(long double x) +{ + volatile static const double vzero = 0; + int hx, m, rnd; + long double y; + + /* x = +-0. Raise exception. */ + if (x == 0) + return (1 / x); + + /* x is NaN. */ + if (isnan(x)) + return (x + x); + + /* x is +-inf. */ + if (isinf(x)) + return (x > 0 ? 0 : vzero / vzero); + + /* x < 0. Raise exception. */ + if (x < 0) + return (vzero / vzero); + + /* + * If x is subnormal, then scale it into the normal range. + * Split x into significand and exponent, x = f * 2^m, with + * f in [0.5,1) and m a biased exponent. + */ + m = 0; + if (!isnormal(x)) { + x *= 0x1p114L; + m = -114; + } + x = frexpl(x, &hx); + m += hx; + + /* m is odd. Put x into [0.25,5) and increase m. */ + if (m & 1) { + x /= 2; + m += 1; + } + m = -(m >> 1); /* Prepare for 2^(-m/2). */ + + y = 1 / sqrt((double)x); /* ~52-bit estimate. */ + y -= y * (x * y * y - 1) / 2; /* ~104-bit estimate. */ + + static const double half = 0.5; + long double h, ph, pl, rh, rl, zh, zl; + + h = y / 2; + + rnd = fegetround(); + fesetround(FE_TOWARDZERO); + _MUL(x, y, zh, zl); + _XMUL(zh, zl, -h, 0, ph, pl); + fesetround(rnd); + + _XADD(ph, pl, half, 0, rh, rl); + y = rh * h + h; + m++; + + RETURNI(ldexpl(y, m)); +} +#endif From nobody Sun May 17 00:29:39 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 4gJ1z74Qwlz6dLry for ; Sun, 17 May 2026 00:29:39 +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 "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gJ1z72qbbz4DvC for ; Sun, 17 May 2026 00:29:39 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778977779; 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=hlN3of1Dz+srJ0e0nOOTHnvPOuZi21W6nwmwWnc7xLA=; b=fSAv/7f6gU2lY3rUk/TV+0JG8BUTE6XL2zfY9fpDNvW2VHgPOXi/TtCF4zO98zw4EQkfKF VXpk1hLoQESAr0vyRuIbGxdsr4qC5RRU/fqOITblKiRK89hK0k87Eekqvf8UHR+RSA9XIK wkcm2cZSDhAVBV85DQb+MVYoxj3hxNJl6J3TTQ+ChWjZX00W5Ym/90BDu8hAxo5vC131L/ ZmMh0pPMh4kkPZkNpdx9AWtRUQTGQJChEnigQt16seXAX5eoEPZ8SYaI+Rh/FlLEe2bUYn HHmJuIIjG8EpQjVBC2URLqCacYY9ZTkgpjWc3fmAtWzPND9TlCoKcW5P1cixFQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778977779; a=rsa-sha256; cv=none; b=uyBuaBDUK4hEZyB7PDKdgegudw8G7VcgMEtVlkY8F6Fkn4tYhrHDjrX4ndEj4kNWeG0Bav G/dFsn8SYd/KBytpeck2VsSgkWJJJZlBhcd41PW55GcSNDm8g3EvCuoDRy56c/t8cxcEJf wyYMheAXdPQ6Gp1msqligrb/eojXRG38VW58DMBMbw+JOU6ckw3H20+Mybo8wPloklfsUQ WwbM02eiNQ+DLLjj/UR+dWZfdEweykHEmTVUwe6v2Cyy+DHbM2r1EG5I+e/ZefHEqscCSp XXdQO81qjBnt7bZtg2IUb2a+RoktTsXQwE4sBpJf5MVDvgbJ4amvxSmrYhKeGg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778977779; 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=hlN3of1Dz+srJ0e0nOOTHnvPOuZi21W6nwmwWnc7xLA=; b=iOps+u4OI1uDoTDyV5HOW1dqFFbQGK1kjKaO22G4j4QuwGaEJ58a/Mf7v5rW6abOxI1ftg ulgq6SFmPB87OVS3qpEyQ2pquiu2cxKlTSJNe1A77XAaI0AtSdgd/JZxveAMlEwnCTjWSt eW/Xy/0gcI/DqE9cNgBeVTiD6/qwbXboFJb2loTAjYEfHEfgtwTylbOyNHZg9OORVyxxyT mDh5NdhQu1kMWlHC2obdN6mAr6DNGjIvnpELFYVrJoddavyrpj4T5SviWPE+H1SaYuRjOq 1MMYHHAUXjHRIyAISVdOHIA+EOx6TP2OtB4exybltK9gEbAX206euUkELZ8HZg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gJ1z72NQzz2by for ; Sun, 17 May 2026 00:29:39 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 21cc0 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 17 May 2026 00:29:39 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: bce6e0e90328 - stable/15 - ptrace: clear TDP_USERWR after transparent attach only on attach 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: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org List-Id: 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: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: bce6e0e903288aa128bdd8ec45005d1416c4c764 Auto-Submitted: auto-generated Date: Sun, 17 May 2026 00:29:39 +0000 Message-Id: <6a090bf3.21cc0.455dca74@gitrepo.freebsd.org> The branch stable/15 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=bce6e0e903288aa128bdd8ec45005d1416c4c764 commit bce6e0e903288aa128bdd8ec45005d1416c4c764 Author: Konstantin Belousov AuthorDate: 2026-05-11 01:12:30 +0000 Commit: Konstantin Belousov CommitDate: 2026-05-17 00:27:48 +0000 ptrace: clear TDP_USERWR after transparent attach only on attach (cherry picked from commit cb31a266167c8bde3488fbdd6bf24c38b6f59977) --- sys/kern/sys_process.c | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/sys/kern/sys_process.c b/sys/kern/sys_process.c index c67996ad7df1..7225a63328b4 100644 --- a/sys/kern/sys_process.c +++ b/sys/kern/sys_process.c @@ -1377,17 +1377,16 @@ kern_ptrace(struct thread *td, int req, pid_t pid, void *addr, int data) * register file or specifying the pc, make the thread * xstopped by waking it up. */ - if ((td2->td_dbgflags & TDB_USERWR) != 0) { - if (pt_attach_transparent) { - thread_lock(td2); - if (TD_ON_SLEEPQ(td2) && - (td2->td_flags & TDF_SINTR) != 0) { - sleepq_abort(td2, EINTR); - } else { - thread_unlock(td2); - } + if ((td2->td_dbgflags & TDB_USERWR) != 0 && + pt_attach_transparent) { + thread_lock(td2); + if (TD_ON_SLEEPQ(td2) && + (td2->td_flags & TDF_SINTR) != 0) { + td2->td_dbgflags &= ~TDB_USERWR; + sleepq_abort(td2, EINTR); + } else { + thread_unlock(td2); } - td2->td_dbgflags &= ~TDB_USERWR; } /* From nobody Sun May 17 02:13:57 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 4gJ4Hb4bhyz6cXLv for ; Sun, 17 May 2026 02:14:03 +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 "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gJ4Hb0gl8z3F0M for ; Sun, 17 May 2026 02:14:03 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778984043; 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=+H2kUvGRf+6jSbv4oVwBsJSchXynh9M2/jEdvKUveUo=; b=ul6llwpOmepyGO+RLQbwVK4xi2IwDlnkuvXujXNYGP6sJxbBnynBHKrP9rK0PupM/Euy5z /u4HJbenGtJrsoy9AsSAZyl1CVW7gvAPMVkWwEYRqlWePlAyMBt3YAXaod1/XLpZb3T9wI otyWE82DOU2ddmCrYjnnvvSSleLdkzmvOGQI5TuFUYz/uRTwUKV9QUgJls54yPsYkE41uQ hUuf7dEryAZtzzJR6DCbXQqPMHK40jlCviEumTSy/jkF33ZMXzoHOCtbtAqPUpTlkaFd8X aHP6h9tv1TaCzQgr91SiJ+oj6Mjc4be5qXpaGb8LKrHR8eTRyRBUPuxjeQA/fA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778984043; a=rsa-sha256; cv=none; b=wc0DPRqEEeOPBobABThHPxgydrt/oLmQgHljAMZ0kFmHOkpqGQgoDU7LUUhb5sR4vrO3VH QkbFUC/Kcyj1JLRRVzREr9SAwUOTHhNpfLUWpag941cawBoFtjZisVxawHCvhYsAtdKJvm 6X59EYGqNgaegeqQlI8jsg5qlQK0ISh6ODSWOCKwdcU7ho/CJ6iKrxENyjlXEfW6/M2BB+ pTqSB13p3rWTvE7bv/fGd6a4SMthgaF3BHM9V7RTZV4m5v2h609GgQUntHRTa5MjL3wMBR 8VyQqYiK91T/PEdfo0S8DN5ZtDePTTV/dwZ5Nscr2jv1ZRP+moaDjhQC7ucKSw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778984043; 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=+H2kUvGRf+6jSbv4oVwBsJSchXynh9M2/jEdvKUveUo=; b=sdIPG1EYNVRMD38GGY7jhzjkKn23kHIGiAGkuT8pjyfmdXInUUOYzblNpRNAlb9xxZmBkh IsNSmN6GUivBPnNkPPIsxOZGk2FZE+/6TJncM7QVr9f1xuWQimRyOAA4mDWK+qrDTm3MvH x+auaGaRBPHP8UNGsDdlTcoIS+CoaGhUiQXIEoKCG5pSwlOtItHS+zVV4k5V5eHYQ4NDae lxQEQ+fxkuHYVWH7TFCry0gYWwNKXMFI4axJ4XJ4jt0EfFxELU/MktCGQuABgMPAz1VwqH Wjxs368/kN/g0HyNI0rIwHnRiWHP1EOleU8OGQ3OZnXr5lqhI4NN6Z/ImhaGRA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gJ4Hb03sfz5rT for ; Sun, 17 May 2026 02:14:03 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 37682 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 17 May 2026 02:13:57 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Rick Macklem Subject: git: 763de195d7bd - stable/15 - nfsd: Disable use of callbacks for NFSv4.0 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: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org List-Id: 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: rmacklem X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 763de195d7bd6ea34fb45ac53b298ce750af2806 Auto-Submitted: auto-generated Date: Sun, 17 May 2026 02:13:57 +0000 Message-Id: <6a092465.37682.1fd327ea@gitrepo.freebsd.org> The branch stable/15 has been updated by rmacklem: URL: https://cgit.FreeBSD.org/src/commit/?id=763de195d7bd6ea34fb45ac53b298ce750af2806 commit 763de195d7bd6ea34fb45ac53b298ce750af2806 Author: Rick Macklem AuthorDate: 2026-05-03 23:25:45 +0000 Commit: Rick Macklem CommitDate: 2026-05-17 02:11:52 +0000 nfsd: Disable use of callbacks for NFSv4.0 Commit 71ac1ec5c9d9 disabled callbacks for the NFS client for NFSv4.0. This patch does the same for the NFSv4.0 server. The only use for callbacks for NFSv4.0 is delegations and delegations rarely work well for NFSv4.0 anyhow. Therefore, this patch disables callbacks for the NFSv4.0 server. This is the same behavior as occurs when vfs.nfsd.issue_delegations is 0. This change allowed the functions called nfsrv_getclientipaddr() and nfsrv_getipnumber() to be removed from the kernel. (cherry picked from commit 457c621add0a531273ee27798c924c6aaeacc4c1) --- sys/fs/nfsserver/nfs_nfsdstate.c | 261 +++++---------------------------------- 1 file changed, 32 insertions(+), 229 deletions(-) diff --git a/sys/fs/nfsserver/nfs_nfsdstate.c b/sys/fs/nfsserver/nfs_nfsdstate.c index 845949b8f630..e36a5c7810da 100644 --- a/sys/fs/nfsserver/nfs_nfsdstate.c +++ b/sys/fs/nfsserver/nfs_nfsdstate.c @@ -165,7 +165,6 @@ static void nfsrv_insertlock(struct nfslock *new_lop, struct nfslock *insert_lop, struct nfsstate *stp, struct nfslockfile *lfp); static void nfsrv_updatelock(struct nfsstate *stp, struct nfslock **new_lopp, struct nfslock **other_lopp, struct nfslockfile *lfp); -static int nfsrv_getipnumber(u_char *cp); static int nfsrv_checkrestart(nfsquad_t clientid, u_int32_t flags, nfsv4stateid_t *stateidp, int specialid); static int nfsrv_checkgrace(struct nfsrv_descript *nd, struct nfsclient *clp, @@ -4078,269 +4077,73 @@ out: } /* - * Get the client ip address for callbacks. If the strings can't be parsed, - * just set lc_program to 0 to indicate no callbacks are possible. - * (For cases where the address can't be parsed or is 0.0.0.0.0.0, set - * the address to the client's transport address. This won't be used - * for callbacks, but can be printed out by nfsstats for info.) + * Just set lc_program to 0 to indicate no callbacks are possible. + * Set the address to the client's transport address. This won't be used + * for callbacks, but can be printed out by nfsstats for info. * Return error if the xdr can't be parsed, 0 otherwise. */ int nfsrv_getclientipaddr(struct nfsrv_descript *nd, struct nfsclient *clp) { - u_int32_t *tl; - u_char *cp, *cp2; - int i, j, maxalen = 0, minalen = 0; - sa_family_t af; + uint32_t *tl; + int error = 0, i; #ifdef INET - struct sockaddr_in *rin = NULL, *sin; + struct sockaddr_in *rin, *sin; #endif #ifdef INET6 - struct sockaddr_in6 *rin6 = NULL, *sin6; + struct sockaddr_in6 *rin6, *sin6; #endif - u_char *addr; - int error = 0, cantparse = 0; - union { - in_addr_t ival; - u_char cval[4]; - } ip; - union { - in_port_t sval; - u_char cval[2]; - } port; - - /* 8 is the maximum length of the port# string. */ - addr = malloc(INET6_ADDRSTRLEN + 8, M_TEMP, M_WAITOK); + clp->lc_req.nr_client = NULL; clp->lc_req.nr_lock = 0; - af = AF_UNSPEC; - NFSM_DISSECT(tl, u_int32_t *, NFSX_UNSIGNED); + NFSM_DISSECT(tl, uint32_t *, NFSX_UNSIGNED); i = fxdr_unsigned(int, *tl); - if (i >= 3 && i <= 4) { - error = nfsrv_mtostr(nd, addr, i); + if (i < 0) { + error = NFSERR_BADXDR; + goto nfsmout; + } else if (i > 0) { + error = nfsm_advance(nd, NFSM_RNDUP(i), -1); if (error) goto nfsmout; -#ifdef INET - if (!strcmp(addr, "tcp")) { - clp->lc_flags |= LCL_TCPCALLBACK; - clp->lc_req.nr_sotype = SOCK_STREAM; - clp->lc_req.nr_soproto = IPPROTO_TCP; - af = AF_INET; - } else if (!strcmp(addr, "udp")) { - clp->lc_req.nr_sotype = SOCK_DGRAM; - clp->lc_req.nr_soproto = IPPROTO_UDP; - af = AF_INET; - } -#endif -#ifdef INET6 - if (af == AF_UNSPEC) { - if (!strcmp(addr, "tcp6")) { - clp->lc_flags |= LCL_TCPCALLBACK; - clp->lc_req.nr_sotype = SOCK_STREAM; - clp->lc_req.nr_soproto = IPPROTO_TCP; - af = AF_INET6; - } else if (!strcmp(addr, "udp6")) { - clp->lc_req.nr_sotype = SOCK_DGRAM; - clp->lc_req.nr_soproto = IPPROTO_UDP; - af = AF_INET6; - } - } -#endif - if (af == AF_UNSPEC) { - cantparse = 1; - } - } else { - cantparse = 1; - if (i > 0) { - error = nfsm_advance(nd, NFSM_RNDUP(i), -1); - if (error) - goto nfsmout; - } } - /* - * The caller has allocated clp->lc_req.nr_nam to be large enough - * for either AF_INET or AF_INET6 and zeroed out the contents. - * maxalen is set to the maximum length of the host IP address string - * plus 8 for the maximum length of the port#. - * minalen is set to the minimum length of the host IP address string - * plus 4 for the minimum length of the port#. - * These lengths do not include NULL termination, - * so INET[6]_ADDRSTRLEN - 1 is used in the calculations. - */ - switch (af) { + NFSM_DISSECT(tl, uint32_t *, NFSX_UNSIGNED); + i = fxdr_unsigned(int, *tl); + if (i < 0) { + error = NFSERR_BADXDR; + goto nfsmout; + } else if (i > 0) { + error = nfsm_advance(nd, NFSM_RNDUP(i), -1); + if (error) + goto nfsmout; + } + switch (nd->nd_nam->sa_family) { #ifdef INET case AF_INET: + sin = (struct sockaddr_in *)nd->nd_nam; rin = (struct sockaddr_in *)clp->lc_req.nr_nam; rin->sin_family = AF_INET; rin->sin_len = sizeof(struct sockaddr_in); - maxalen = INET_ADDRSTRLEN - 1 + 8; - minalen = 7 + 4; + rin->sin_addr.s_addr = sin->sin_addr.s_addr; + rin->sin_port = 0x0; break; #endif #ifdef INET6 case AF_INET6: + sin6 = (struct sockaddr_in6 *)nd->nd_nam; rin6 = (struct sockaddr_in6 *)clp->lc_req.nr_nam; rin6->sin6_family = AF_INET6; rin6->sin6_len = sizeof(struct sockaddr_in6); - maxalen = INET6_ADDRSTRLEN - 1 + 8; - minalen = 3 + 4; + rin6->sin6_addr = sin6->sin6_addr; + rin6->sin6_port = 0x0; break; #endif } - NFSM_DISSECT(tl, u_int32_t *, NFSX_UNSIGNED); - i = fxdr_unsigned(int, *tl); - if (i < 0) { - error = NFSERR_BADXDR; - goto nfsmout; - } else if (i == 0) { - cantparse = 1; - } else if (!cantparse && i <= maxalen && i >= minalen) { - error = nfsrv_mtostr(nd, addr, i); - if (error) - goto nfsmout; - - /* - * Parse out the address fields. We expect 6 decimal numbers - * separated by '.'s for AF_INET and two decimal numbers - * preceded by '.'s for AF_INET6. - */ - cp = NULL; - switch (af) { -#ifdef INET6 - /* - * For AF_INET6, first parse the host address. - */ - case AF_INET6: - cp = strchr(addr, '.'); - if (cp != NULL) { - *cp++ = '\0'; - if (inet_pton(af, addr, &rin6->sin6_addr) == 1) - i = 4; - else { - cp = NULL; - cantparse = 1; - } - } - break; -#endif -#ifdef INET - case AF_INET: - cp = addr; - i = 0; - break; -#endif - } - while (cp != NULL && *cp && i < 6) { - cp2 = cp; - while (*cp2 && *cp2 != '.') - cp2++; - if (*cp2) - *cp2++ = '\0'; - else if (i != 5) { - cantparse = 1; - break; - } - j = nfsrv_getipnumber(cp); - if (j >= 0) { - if (i < 4) - ip.cval[3 - i] = j; - else - port.cval[5 - i] = j; - } else { - cantparse = 1; - break; - } - cp = cp2; - i++; - } - if (!cantparse) { - /* - * The host address INADDR_ANY is (mis)used to indicate - * "there is no valid callback address". - */ - switch (af) { -#ifdef INET6 - case AF_INET6: - if (!IN6_ARE_ADDR_EQUAL(&rin6->sin6_addr, - &in6addr_any)) - rin6->sin6_port = htons(port.sval); - else - cantparse = 1; - break; -#endif -#ifdef INET - case AF_INET: - if (ip.ival != INADDR_ANY) { - rin->sin_addr.s_addr = htonl(ip.ival); - rin->sin_port = htons(port.sval); - } else { - cantparse = 1; - } - break; -#endif - } - } - } else { - cantparse = 1; - if (i > 0) { - error = nfsm_advance(nd, NFSM_RNDUP(i), -1); - if (error) - goto nfsmout; - } - } - if (cantparse) { - switch (nd->nd_nam->sa_family) { -#ifdef INET - case AF_INET: - sin = (struct sockaddr_in *)nd->nd_nam; - rin = (struct sockaddr_in *)clp->lc_req.nr_nam; - rin->sin_family = AF_INET; - rin->sin_len = sizeof(struct sockaddr_in); - rin->sin_addr.s_addr = sin->sin_addr.s_addr; - rin->sin_port = 0x0; - break; -#endif -#ifdef INET6 - case AF_INET6: - sin6 = (struct sockaddr_in6 *)nd->nd_nam; - rin6 = (struct sockaddr_in6 *)clp->lc_req.nr_nam; - rin6->sin6_family = AF_INET6; - rin6->sin6_len = sizeof(struct sockaddr_in6); - rin6->sin6_addr = sin6->sin6_addr; - rin6->sin6_port = 0x0; - break; -#endif - } - clp->lc_program = 0; - } + clp->lc_program = 0; nfsmout: - free(addr, M_TEMP); NFSEXITCODE2(error, nd); return (error); } -/* - * Turn a string of up to three decimal digits into a number. Return -1 upon - * error. - */ -static int -nfsrv_getipnumber(u_char *cp) -{ - int i = 0, j = 0; - - while (*cp) { - if (j > 2 || *cp < '0' || *cp > '9') - return (-1); - i *= 10; - i += (*cp - '0'); - cp++; - j++; - } - if (i < 256) - return (i); - return (-1); -} - /* * This function checks for restart conditions. */