From nobody Tue Jun 25 04:26:14 2024 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 4W7Wx25CRRz5MPms; Tue, 25 Jun 2024 04:26: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4W7Wx24TTnz4lC9; Tue, 25 Jun 2024 04:26:14 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1719289574; 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=EznUYjNOk2OGuuTpTTVcO/hK0qz03lxWaPxehfchz+4=; b=MXokjaFZZwfWw2agyWHnB4IgfJ3CwwojWK0zTn6zlwjyQrOvU1lErvtjTEAx9vu67RO+ew 8URRV/0WecuhpMFeh3h5H81pG5XkjJqYR0oHj7MHpjxMoJBtMlWoCzPikQHLRwOluejqSC Po1Mmja/5AliAzd4s8OOr3kZNN8mJbqPiaa6UtDSYwydZ8uxPoA25ATp6gJvl0hgAGyw// bgooSMzNhdDYkiBwkBhA6mdYLr7ljyktUWr/iXmsVYF/fYuBbMsSLvohzFyrM+mtd8TfX4 xX9w7BvRoPh/4v8PDvsZkBHi+PJvsMwYU94KC7atmmekJos1lip9YJnIzMVoWw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1719289574; a=rsa-sha256; cv=none; b=jDXuFiZy+409KNfBgU7A9cpnpaAvRAUDZXwIbw7h6+lWDFZJbNyrtrKadpOUPX7Ko3oRbI pMOae27xmEmyOONCwTnZvIAgcIggqc3u71SDtxbk6YorrL9AmJizolBvM7+IsXSMY/cXwL iuNCRJwwVcuBXYySHn1uOGNfPpNYzHX+oZjWi7MTqeMi1+2DlUPFIt8Mqrp3T2WMfvyZIe YAusRSGfXEEb4CrS5Jw3LkgimKx+QsnrUsKNoDFYR9Dngs3Qm8ToQ1seqe2/ijRYgqpSUj RiVFinlU2SQx7cQRkOaFMgWXg7Bap3OwTgtEbqxaSIdYZSyPZ+mMWnTV95ArkQ== 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=1719289574; 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=EznUYjNOk2OGuuTpTTVcO/hK0qz03lxWaPxehfchz+4=; b=W63Z5yVEY3pgnj8/lGDIrsudPTuKgkG5Nny/c63A+H69lK1Nj28VFn/QBU+daWH2/jBOCN ehrWNkIAyfd807ObeRQOPvZ59AbwSBNFFIUu5znhmYFaUCSQt6uhAovt6jbXVybx52dHeE 31cdXFHhRp200+7DkpxTrH9XSZ8cejk2zKQoB2CbzigykZZoxYyhya0raL35Vr2PHthXSR hXCS79WZLo6bv99/s8ChQuXCdS6wtSZOipECJeM5ja0PWi731A8sxjOkDORhb9WhgZnOm4 Zeex5U9kp1PKw/m0pQ5bCWNHJXGyY0FhIONf8pl9vK9Nwiz/F7g6DhyKVdjPTQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4W7Wx244y3znTn; Tue, 25 Jun 2024 04:26:14 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 45P4QEoR087496; Tue, 25 Jun 2024 04:26:14 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 45P4QECU087493; Tue, 25 Jun 2024 04:26:14 GMT (envelope-from git) Date: Tue, 25 Jun 2024 04:26:14 GMT Message-Id: <202406250426.45P4QECU087493@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Zhenlei Huang Subject: git: ae979c76443b - stable/14 - net80211: Correct a comment 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 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: zlei X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: ae979c76443bd7c33ed9f22182b4421d2c64b619 Auto-Submitted: auto-generated The branch stable/14 has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=ae979c76443bd7c33ed9f22182b4421d2c64b619 commit ae979c76443bd7c33ed9f22182b4421d2c64b619 Author: Zhenlei Huang AuthorDate: 2024-06-20 04:27:43 +0000 Commit: Zhenlei Huang CommitDate: 2024-06-25 04:25:31 +0000 net80211: Correct a comment MFC after: 3 days (cherry picked from commit 34c98f40f549b3e5692aa5095448ff9135030f99) --- sys/net80211/ieee80211_radiotap.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/net80211/ieee80211_radiotap.c b/sys/net80211/ieee80211_radiotap.c index 34e27b323fc1..79e00106a780 100644 --- a/sys/net80211/ieee80211_radiotap.c +++ b/sys/net80211/ieee80211_radiotap.c @@ -125,7 +125,7 @@ ieee80211_radiotap_vattach(struct ieee80211vap *vap) void ieee80211_radiotap_vdetach(struct ieee80211vap *vap) { - /* NB: bpfattach is called by ether_ifdetach and claims all taps */ + /* NB: bpfdetach is called by ether_ifdetach and claims all taps */ } static void From nobody Tue Jun 25 04:27:32 2024 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 4W7WyX5MFmz5MQ2J; Tue, 25 Jun 2024 04:27: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4W7WyX4cqpz4lQr; Tue, 25 Jun 2024 04:27:32 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1719289652; 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=JBd7Hk1mmWvFdWlLR7UWLXNBslG+D7OQ9S4KZTWPdrw=; b=ZOseEGJvjrDbhwdqh2Hm1RkU6CjtXLZzAqnZbRk5pW2h0RF1pSlq4tysd0L89ukAXM0U1P Fex97MUB/FXUtSNlVS34lWiA+++VuFWiK/tH4r32kq/jtO6qaCcymwsD3lZw4xYFxTG4pc kNm9ycAtdrygvG7Zss1HVGRSoUFb5wrieYYqtdMUqvFkI4TtAbyiNyaZ4gyYPqgik43od0 7NJgMPiX+L0w6jETkown44WWreAfLxK4SbHVa7RDbgAOmqIKncI6/eV2E+fM/LUYgT212C wzwTXHrXT2/hwa/lpCiDTEXt4JobXHt7/wa3WswkqgboTssedbn1Zeb0hskTxw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1719289652; a=rsa-sha256; cv=none; b=I3LoYR94HS2NYde4DzTbVSPF8aX6P7ZIZAUcgyw2EsIjv03h+TZF3HcjWjDRjhBzVAABCA f30acuuAyEtMDY9YGWC9ktQP8Vqx07bMpHhDXzmXuGrWgGaMD69AJ5+y5TvmOBufs1ueO1 qdpgViVFSPhHgao3jaNoFaQPPtMmWkFZctMSHtDSDJUQIni/zdLXOJY1kkrKGuNEn/Unnx meHKs8dcffaMB/dDakBPbRmpdfMR+ao3xXLVbBj0MZURml7zP8E2SvVHbF6nkVqcaf0/Ac TxdaADly+mKR1TrxnLhjywUXLW0gqTlWqp8L4yuDRw/MbJbLmmHuNVXAsYtNOg== 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=1719289652; 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=JBd7Hk1mmWvFdWlLR7UWLXNBslG+D7OQ9S4KZTWPdrw=; b=V/n+Z1PBDIsXmYwdB1UYps4FqjHx23ET4iyXUOlOotXucZsMWWbMcptQk1YAId3+qpuFOr yCvpAGIQxd7LVUB+Wt5vlS4OZtfoC9UEc7opG8deV33SP0LJQSxh/0o0KHNsFswNBjqTz7 EwVii5x7r3GZ7lIQwEtOZ5rfVFyuFng0iwysO/nIkJAXYi50o1FeaBkgWmKNHDgEFFn6yY kQ6R7/kTLTU/enL/maXtnJHn/LXK0cA2K2ssLGLGUENXb4OxAvbEzdjYBsUONe/Wjycuw3 4SMir4uBOZKpwqIVOZod3R2yc4gWPxwuCId8GlBk7Wxe3a6aNCnqa36iA6eX0A== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4W7WyX4Cq5zmm4; Tue, 25 Jun 2024 04:27:32 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 45P4RWhp087885; Tue, 25 Jun 2024 04:27:32 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 45P4RWAh087882; Tue, 25 Jun 2024 04:27:32 GMT (envelope-from git) Date: Tue, 25 Jun 2024 04:27:32 GMT Message-Id: <202406250427.45P4RWAh087882@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Zhenlei Huang Subject: git: 803bc0f91f28 - stable/13 - net80211: Correct a comment 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 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: zlei X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 803bc0f91f285dab7fa4557af76cf92db33cd196 Auto-Submitted: auto-generated The branch stable/13 has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=803bc0f91f285dab7fa4557af76cf92db33cd196 commit 803bc0f91f285dab7fa4557af76cf92db33cd196 Author: Zhenlei Huang AuthorDate: 2024-06-20 04:27:43 +0000 Commit: Zhenlei Huang CommitDate: 2024-06-25 04:27:06 +0000 net80211: Correct a comment MFC after: 3 days (cherry picked from commit 34c98f40f549b3e5692aa5095448ff9135030f99) (cherry picked from commit ae979c76443bd7c33ed9f22182b4421d2c64b619) --- sys/net80211/ieee80211_radiotap.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/net80211/ieee80211_radiotap.c b/sys/net80211/ieee80211_radiotap.c index 34e27b323fc1..79e00106a780 100644 --- a/sys/net80211/ieee80211_radiotap.c +++ b/sys/net80211/ieee80211_radiotap.c @@ -125,7 +125,7 @@ ieee80211_radiotap_vattach(struct ieee80211vap *vap) void ieee80211_radiotap_vdetach(struct ieee80211vap *vap) { - /* NB: bpfattach is called by ether_ifdetach and claims all taps */ + /* NB: bpfdetach is called by ether_ifdetach and claims all taps */ } static void From nobody Tue Jun 25 12:47:34 2024 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 4W7l3V5VJfz5PV7N; Tue, 25 Jun 2024 12:47: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4W7l3V4YYXz4dP3; Tue, 25 Jun 2024 12:47:34 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1719319654; 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=CrjitpHnuO+foPMIE09SpnwzuxCm0AKUjoI47MivW+g=; b=QBYViGYayDZjxFxM1cBP6vWuuOMmRqsOyanhpx9Ae4zDR6muwlhMSJSwrBZAQ8d0u9zlH3 RQa5H6h2/HihjolwIPSu3DhwWvmoAVt4M8nlsmLoilckGiQnb6R2I9V8O855hfN2gKENRw lTHojpiS5AaXeJyqab9vQK/OIGlT9bIZqeRFrDCnDQ45/Z4LyETun0VibmCjQXzJjZSsSC 9rM1LrpzzEvFpD4DhCzaYk11KB7B/tNPWE+k+gXLB6jjj+KQG9BOY/zJG+9Z4uPYVr/hzs fR2UTjGvg2/5iD+T0RpYIx5mTOIYl7BKjpsAXqw8N8Hg5Qp6YpWGbMicjXLxZg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1719319654; a=rsa-sha256; cv=none; b=ObbMhjlPutxGO+A4O5dnN5wWqyrDQOY1q7QJuN0mDOvOunBsTe4iARypBeTpcp4D4cIOJU 0PU5wI0idRMFPz7f1nR1f+MgJXGc4/LLzAC96RQ3v+FfisbfudK7JOC8LyPd6ZnELzYQVJ 9iiGi8tluRNNPSLU+8yOrKEWH2YwURKZ3sjJ59EoDBbNy+XTY5vOzKoX7xSC1Whz0u7jX3 UOmeUqY+mP1MTTXR6xDhW23oFSvMFrc+gzO/ileN61GRqO12iTfqwlbA+VgNDjCSBUnxIY RDeFSmWHIlknVP6xppHqkuCKA15tfo5GT4B/eKnmG18WrHUfAS4huxJQ9EFucw== 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=1719319654; 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=CrjitpHnuO+foPMIE09SpnwzuxCm0AKUjoI47MivW+g=; b=WpirVoTIvYwco+1JWPQsvJJOwZrE43BDmqsv56N3eNn5+fZ6M1nVndyodKjv0lq+jduTuR 6gUhn4u6879UhUDOwuBkNQHU3UzErX1KrINp/Q5dfag6vcvPwkdemFwMP/M7u9+GOAh338 UrzL+rQgeurdlBY+tdjIsvC4P1QOY643aPyc148+vvrCAe+jTLnS0kOP3PA1v2EIjLBz2H rnV22ZrE21Q6Fr3QZcJOIxeAjKSbc51wQKVJtt2HBld9K0AXrT+o5RxIaGwZm32PzBmMap RyaJc1YKuQsm7bOa7aK9yuK0dY5Vdt5oGd9iDnnb5cNwic0gn5of7ywAFnKmOA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4W7l3V48Drz12Zg; Tue, 25 Jun 2024 12:47:34 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 45PClYW3032506; Tue, 25 Jun 2024 12:47:34 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 45PClYWw032503; Tue, 25 Jun 2024 12:47:34 GMT (envelope-from git) Date: Tue, 25 Jun 2024 12:47:34 GMT Message-Id: <202406251247.45PClYWw032503@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Gleb Smirnoff Subject: git: df7001bad094 - stable/14 - netlink/route: provide pre-2.6.19 Linux compat shim 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 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: glebius X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: df7001bad09474da00885ed853bc6708019fb292 Auto-Submitted: auto-generated The branch stable/14 has been updated by glebius: URL: https://cgit.FreeBSD.org/src/commit/?id=df7001bad09474da00885ed853bc6708019fb292 commit df7001bad09474da00885ed853bc6708019fb292 Author: Gleb Smirnoff AuthorDate: 2024-06-20 23:10:39 +0000 Commit: Gleb Smirnoff CommitDate: 2024-06-25 12:47:24 +0000 netlink/route: provide pre-2.6.19 Linux compat shim The old Linux used 8-bit rtm_table field of the RTM_NEWROUTE message to specify routing table id. Modern netlink uses RTA_TABLE 32-bit attribute. Unfortunately, there is modern software (namely bird) that would prefer the old API as long as the routing table id fits into 8-bit. PR: 279662 (cherry picked from commit f34aca55adef1e28cd68b2e6705a0cac03f0238e) --- sys/netlink/route/rt.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/sys/netlink/route/rt.c b/sys/netlink/route/rt.c index ed09748995dc..7379d49b96a9 100644 --- a/sys/netlink/route/rt.c +++ b/sys/netlink/route/rt.c @@ -475,6 +475,7 @@ struct nl_parsed_route { uint32_t rta_nh_id; uint32_t rta_weight; uint32_t rtax_mtu; + uint8_t rtm_table; uint8_t rtm_family; uint8_t rtm_dst_len; uint8_t rtm_protocol; @@ -507,6 +508,7 @@ static const struct nlfield_parser nlf_p_rtmsg[] = { { .off_in = _IN(rtm_dst_len), .off_out = _OUT(rtm_dst_len), .cb = nlf_get_u8 }, { .off_in = _IN(rtm_protocol), .off_out = _OUT(rtm_protocol), .cb = nlf_get_u8 }, { .off_in = _IN(rtm_type), .off_out = _OUT(rtm_type), .cb = nlf_get_u8 }, + { .off_in = _IN(rtm_table), .off_out = _OUT(rtm_table), .cb = nlf_get_u8 }, { .off_in = _IN(rtm_flags), .off_out = _OUT(rtm_flags), .cb = nlf_get_u32 }, }; #undef _IN @@ -939,7 +941,10 @@ rtnl_handle_newroute(struct nlmsghdr *hdr, struct nlpcb *nlp, return (EINVAL); } - if (attrs.rta_table >= V_rt_numfibs) { + if (attrs.rtm_table > 0 && attrs.rta_table == 0) { + /* pre-2.6.19 Linux API compatibility */ + attrs.rta_table = attrs.rtm_table; + } else if (attrs.rta_table >= V_rt_numfibs) { NLMSG_REPORT_ERR_MSG(npt, "invalid fib"); return (EINVAL); } From nobody Wed Jun 26 00:35:17 2024 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 4W82m51r1wz5QJRc; Wed, 26 Jun 2024 00:35:17 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4W82m51C1Cz4lqp; Wed, 26 Jun 2024 00:35:17 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1719362117; 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=BobzU89A8VikXMKygGrjBwSzvzTGaY3jbZeLlIsw6+E=; b=VUJ23XyiVGtv+EvXRr4BSu6ANzUDCFLj50LctnUgYC8KXqxij8a8krm9m2CZcv+GT7i6NX 5nPT0MTubM01CL82Pg+xRBFO2JcdlAVSW3fOm5UGeLMb6u+aWDnq8vY+dMfEUhcakgTyCd VmLoX/14pDhwh1jFLp5vAOJ0pKoX4uvHN9lJY3UhSPStb3TAOMXb1PH1baCTNFULSdSBGs 47swA1Q8J2maWrCc6f7cJ91ek8NjtGJxq6auz00bYYtuCDUnkkR5wDux7c/A9CcJ44y7Kx b7jLjqnbk/w+7pbMzDICd/1hdiXijl/u26C5t7PKnZJ5wm8IyZ6YSnHqy1W+tQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1719362117; a=rsa-sha256; cv=none; b=HE0Fe4POJDQvRzgnQLrPLXvd3mrxMxee6hK7/hbph4S1Q6B/m0cw4EoWdWHSa1Wp7wR/+r eyTtKEIXQRaUbwM4zfBsWBeIxrUTPVbtYxeEdDc4YCLIRiVkv+c29hXAXeCZXojEVvYapg SMNUtoqgHsJt/+p2sreP5vM5Rp/hRvf4m0chPpJCqkxF9fP4qI/m9oOazTPm2J/D1ykoZ0 DG//XIU8cBehCp3/11q+qHvH0plu3ifqmb4vh81gZQk4URIWSgz7v17HzG9iCg4o4fL1Qe O2EPQ6tTAM7r3aPaAXgj/mUpHGSYIAjCOlxSzZU+yLRm3hrY8iP7hQeqsSNLXg== 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=1719362117; 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=BobzU89A8VikXMKygGrjBwSzvzTGaY3jbZeLlIsw6+E=; b=n7WTtLXzmezRQeR5iTckig2G96Mh4E0RA89o0zgJxf6uA1yq/+jzZ+OK9pccCaCwvd1NHu tEtTvc+GNLIWlgNVSfSmLsXRQ1mifGK0yzBgVJjPOQnGRIBZjUcL/06PtI7QxsymJHnnSJ Bs5p7Ymxl7k/P7FuPj+SdT7brXIAo1125oFxFDnHprHfsBIn6eCX5myGcLQW9RM7BEN7q3 pdGyX1B5Mai4BZ7IWlPBIF6iwLKqZ4GhYDfmUnqKkLShwPR1A0w2WYhZMNtTJu9Lo/haFQ BxohcVlgOcEZ3XozJQ4gBOgmL9gmZLNsdlAOm/KJb1vntBEP2Gl9yE/2LeAvDA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4W82m50pRbzP3b; Wed, 26 Jun 2024 00:35:17 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 45Q0ZHEb030671; Wed, 26 Jun 2024 00:35:17 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 45Q0ZHQT030668; Wed, 26 Jun 2024 00:35:17 GMT (envelope-from git) Date: Wed, 26 Jun 2024 00:35:17 GMT Message-Id: <202406260035.45Q0ZHQT030668@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Colin Percival Subject: git: 4ef9a9d28afe - stable/14 - release: Publish non-uploaded cloudware bits 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 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/14 X-Git-Reftype: branch X-Git-Commit: 4ef9a9d28afe86d2d73408d893064a56a8db0c32 Auto-Submitted: auto-generated The branch stable/14 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=4ef9a9d28afe86d2d73408d893064a56a8db0c32 commit 4ef9a9d28afe86d2d73408d893064a56a8db0c32 Author: Colin Percival AuthorDate: 2024-06-19 19:28:42 +0000 Commit: Colin Percival CommitDate: 2024-06-26 00:34:43 +0000 release: Publish non-uploaded cloudware bits While most "cloudware" (AWS, Azure, GCP, Vagrant) images get uploaded to their respective clouds, we have two images -- BASIC-CI and BASIC-CLOUDINIT -- which are published via the FTP mirrors. We have been handling these using a manual and error-prone process of copying them from the internal build directories into the FTP staging tree, but they should be handled using the "make install ftp-stage" mechanism which is used for all the other published images. This commit 1. Adds a new 'make cloud-install' target which is run as part of 'make install' and installs BASIC-CI and BASIC-CLOUDINIT images, and 2. Extends 'make ftp-stage' in Makefile.mirrors to copy those bits into the FTP staging area. As a side benefit, this will also make BASIC-CI and BASIC-CLOUDINIT images available for arm64; until now they have only been available for amd64. MFC after: 1 week (cherry picked from commit 4771c2e9d1c7db949a82dfe4f2b9878bb358a50e) --- release/Makefile | 3 +- release/Makefile.mirrors | 96 ++++++++++++++++++++++++++++++++++++++++++++++++ release/Makefile.vm | 42 +++++++++++++++++++++ 3 files changed, 140 insertions(+), 1 deletion(-) diff --git a/release/Makefile b/release/Makefile index ba9499ac5a3f..32e59a1a5c90 100644 --- a/release/Makefile +++ b/release/Makefile @@ -14,6 +14,7 @@ # install: Invokes the release-install and vm-install targets # release-install: Copies all release installation media into ${DESTDIR} # vm-install: Copies all virtual machine images into ${DESTDIR} +# cloud-install: Copies non-uploaded cloud images into ${DESTDIR} # # Variables affecting the build process: # WORLDDIR: location of src tree -- must have built world and default kernel @@ -329,7 +330,7 @@ real-release: ${MAKE} -C ${.CURDIR} ${.MAKEFLAGS} obj ${MAKE} -C ${.CURDIR} ${.MAKEFLAGS} ${RELEASE_TARGETS} -install: release-install vm-install +install: release-install vm-install .WAIT cloud-install release-install: .if defined(DESTDIR) && !empty(DESTDIR) diff --git a/release/Makefile.mirrors b/release/Makefile.mirrors index 591fd85b29ea..fd233e7abdb6 100644 --- a/release/Makefile.mirrors +++ b/release/Makefile.mirrors @@ -53,6 +53,11 @@ STAGE_TARGETS+= vm-images-stage VM_DIR= ${TLD}/VM-IMAGES/${REVISION}-${BRANCH}/${TARGET_ARCH} .endif +.if defined(WITH_CLOUDWARE) && !empty(WITH_CLOUDWARE) +STAGE_TARGETS+= ci-images-stage +CI_DIR= ${TLD}/CI-IMAGES/${REVISION}-${BRANCH}/${TARGET_ARCH} +.endif + CLEANFILES+= ${STAGE_TARGETS} CHECKSUM_FILES?= SHA512 SHA256 SNAP_SUFFIX!= echo ${_SNAP_SUFFIX:S,^-,,1} | tr -d ' ' @@ -203,6 +208,22 @@ vm-images-stage: ln -s ../${BUILDDATE}/${OSRELEASE}-${FS}-${SNAP_SUFFIX}.${VMFORMAT}.xz \ ${OSRELEASE}-${FS}.${VMFORMAT}.xz . endfor +. endfor +. for CW in ${CLOUDWARE} +. if ${CW} == BASIC-CLOUDINIT +. for VMFORMAT in ${${CW}_FORMAT} +. for FS in ${${CW}_FSLIST} + cd ${RELEASEDIR}/vmimages && \ + mv ${OSRELEASE}-${CW}.${FS}.${VMFORMAT}.xz \ + ${OSRELEASE}-${CW}-${SNAP_SUFFIX}.${FS}.${VMFORMAT}.xz + cp -p ${RELEASEDIR}/vmimages/${OSRELEASE}-${CW}-${SNAP_SUFFIX}.${FS}.${VMFORMAT}.xz \ + ${VM_DIR}/${BUILDDATE}/${OSRELEASE}-${CW}-${SNAP_SUFFIX}.${FS}.${VMFORMAT}.xz + cd ${VM_DIR}/Latest && \ + ln -s ../${BUILDDATE}/${OSRELEASE}-${CW}-${SNAP_SUFFIX}.${FS}.${VMFORMAT}.xz \ + ${OSRELEASE}-${CW}.${FS}.${VMFORMAT}.xz +. endfor +. endfor +. endif . endfor cd ${RELEASEDIR}/vmimages && rm -f CHECKSUM.* . for CHECKSUM in ${CHECKSUM_FILES} @@ -227,11 +248,86 @@ vm-images-stage: ${VM_DIR}/Latest/${OSRELEASE}-${FS}.${VMFORMAT}.xz . endfor . endfor +. for CW in ${CLOUDWARE} +. if ${CW} == BASIC-CLOUDINIT +. for VMFORMAT in ${${CW}_FORMAT} +. for FS in ${${CW}_FSLIST} + cp -p ${RELEASEDIR}/vmimages/${OSRELEASE}-${CW}.${FS}.${VMFORMAT}.xz \ + ${VM_DIR}/Latest/${OSRELEASE}-${CW}.${FS}.${VMFORMAT}.xz +. endfor +. endfor +. endif +. endfor . for CHECKSUM in ${CHECKSUM_FILES} cp -p ${RELEASEDIR}/vmimages/CHECKSUM.${CHECKSUM} \ ${VM_DIR}/Latest/CHECKSUM.${CHECKSUM} . endfor .endif +ci-images-stage: + mkdir -p ${CI_DIR} +.if defined(SNAPSHOT) && !empty(SNAPSHOT) +. if exists(${CI_DIR}/Latest) + rm -rf ${CI_DIR}/Latest +. endif + mkdir -p ${CI_DIR}/Latest + mkdir -p ${CI_DIR}/${BUILDDATE} +. for CW in ${CLOUDWARE} +. if ${CW} == BASIC-CI +. for VMFORMAT in ${${CW}_FORMAT} +. for FS in ${${CW}_FSLIST} + cd ${RELEASEDIR}/ciimages && \ + mv ${OSRELEASE}-${CW}-${FS}.${VMFORMAT}.xz \ + ${OSRELEASE}-${CW}-${SNAP_SUFFIX}.${FS}.${VMFORMAT}.xz + cp -p ${RELEASEDIR}/ciimages/${OSRELEASE}-${CW}-${SNAP_SUFFIX}.${FS}.${VMFORMAT}.xz \ + ${CI_DIR}/${BUILDDATE}/${OSRELEASE}-${CW}-${SNAP_SUFFIX}.${FS}.${VMFORMAT}.xz + cd ${CI_DIR}/Latest && \ + ln -s ../${BUILDDATE}/${OSRELEASE}-${CW}-${SNAP_SUFFIX}.${FS}.${VMFORMAT}.xz \ + ${OSRELEASE}-${CW}.${FS}.${VMFORMAT}.xz +. endfor + cd ${RELEASEDIR}/ciimages && \ + mv ${OSRELEASE}-${CW}.${VMFORMAT}.xz \ + ${OSRELEASE}-${CW}-${SNAP_SUFFIX}.${VMFORMAT}.xz + cp -p ${RELEASEDIR}/ciimages/${OSRELEASE}-${CW}-${SNAP_SUFFIX}.${VMFORMAT}.xz \ + ${CI_DIR}/${BUILDDATE}/${OSRELEASE}-${CW}-${SNAP_SUFFIX}.${VMFORMAT}.xz + cd ${CI_DIR}/Latest && \ + ln -s ../${BUILDDATE}/${OSRELEASE}-${CW}-${SNAP_SUFFIX}.${VMFORMAT}.xz \ + ${OSRELEASE}-${CW}.${VMFORMAT}.xz +. endfor +. endif +. endfor + cd ${RELEASEDIR}/ciimages && rm -f CHECKSUM.* +. for CHECKSUM in ${CHECKSUM_FILES} + cd ${RELEASEDIR}/ciimages && \ + ${CHECKSUM:tl} ${OSRELEASE}* > CHECKSUM.${CHECKSUM}-${SNAP_SUFFIX} + cp -p ${RELEASEDIR}/ciimages/CHECKSUM.${CHECKSUM}-${SNAP_SUFFIX} \ + ${CI_DIR}/${BUILDDATE}/CHECKSUM.${CHECKSUM}-${SNAP_SUFFIX} + cd ${CI_DIR}/Latest && \ + ln -s ../${BUILDDATE}/CHECKSUM.${CHECKSUM}-${SNAP_SUFFIX} \ + CHECKSUM.${CHECKSUM} +. endfor +.else # not snapshot +. if exists(${CI_DIR}/Latest) + rm -rf ${CI_DIR}/Latest +. endif + mkdir -p ${CI_DIR}/Latest +. for CW in ${CLOUDWARE} +. if ${CW} == BASIC-CI +. for VMFORMAT in ${${CW}_FORMAT} +. for FS in ${${CW}_FSLIST} + cp -p ${RELEASEDIR}/ciimages/${OSRELEASE}-${CW}-${FS}.${VMFORMAT}.xz \ + ${CI_DIR}/Latest/${OSRELEASE}-${CW}.${FS}.${VMFORMAT}.xz +. endfor + cp -p ${RELEASEDIR}/ciimages/${OSRELEASE}-${CW}.${VMFORMAT}.xz \ + ${CI_DIR}/Latest/${OSRELEASE}-${CW}.${VMFORMAT}.xz +. endfor +. endif +. endfor +. for CHECKSUM in ${CHECKSUM_FILES} + cp -p ${RELEASEDIR}/ciimages/CHECKSUM.${CHECKSUM} \ + ${CI_DIR}/Latest/CHECKSUM.${CHECKSUM} +. endfor +.endif + ftp-stage: remove-old-bits ${STAGE_TARGETS} diff --git a/release/Makefile.vm b/release/Makefile.vm index 95d48490c353..71a4392b6b0c 100644 --- a/release/Makefile.vm +++ b/release/Makefile.vm @@ -223,6 +223,48 @@ vm-install: ${DESTDIR}/vmimages/CHECKSUM.SHA256 .endif +cloud-install-BASIC-CI: + mkdir -p ${DESTDIR}/ciimages +.for _FS in ${BASIC-CI_FSLIST} +. for _FMT in ${BASIC-CI_FORMAT} + cp -p ${.OBJDIR}/${BASIC-CI${_FS:tu}${_FMT:tu}IMAGE} \ + ${DESTDIR}/ciimages/${OSRELEASE}-BASIC-CI-${_FS}.${_FMT} + ${XZ_CMD} ${DESTDIR}/ciimages/${OSRELEASE}-BASIC-CI-${_FS}.${_FMT} +. endfor +.endfor +.for _FMT in ${BASIC-CI_FORMAT} + ln -f ${DESTDIR}/ciimages/${OSRELEASE}-BASIC-CI-${VMFS}.${_FMT}.xz \ + ${DESTDIR}/ciimages/${OSRELEASE}-BASIC-CI.${_FMT}.xz +.endfor + cd ${DESTDIR}/ciimages && sha512 ${OSRELEASE}* > \ + ${DESTDIR}/ciimages/CHECKSUM.SHA512 + cd ${DESTDIR}/ciimages && sha256 ${OSRELEASE}* > \ + ${DESTDIR}/ciimages/CHECKSUM.SHA256 + +cloud-install-BASIC-CLOUDINIT: + mkdir -p ${DESTDIR}/vmimages +.for _FS in ${BASIC-CLOUDINIT_FSLIST} +. for _FMT in ${BASIC-CLOUDINIT_FORMAT} + cp -p ${.OBJDIR}/${BASIC-CLOUDINIT${_FS:tu}${_FMT:tu}IMAGE} \ + ${DESTDIR}/vmimages/${OSRELEASE}-BASIC-CLOUDINIT.${_FS}.${_FMT} + ${XZ_CMD} ${DESTDIR}/vmimages/${OSRELEASE}-BASIC-CLOUDINIT.${_FS}.${_FMT} +. endfor +.endfor + cd ${DESTDIR}/vmimages && sha512 ${OSRELEASE}* > \ + ${DESTDIR}/vmimages/CHECKSUM.SHA512 + cd ${DESTDIR}/vmimages && sha256 ${OSRELEASE}* > \ + ${DESTDIR}/vmimages/CHECKSUM.SHA256 + +CLOUD_INSTALL_TGTS= +.if defined(WITH_CLOUDWARE) && !empty(WITH_CLOUDWARE) +. for _CW in ${CLOUDWARE} +. if target(cloud-install-${_CW}) +CLOUD_INSTALL_TGTS+= cloud-install-${_CW} +. endif +. endfor +.endif +cloud-install: ${CLOUD_INSTALL_TGTS} + .if defined(WITH_VMIMAGES) && !empty(WITH_VMIMAGES) vm-release: ${VMTARGETS} .else From nobody Wed Jun 26 00:35:18 2024 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 4W82m645yyz5QJX7; Wed, 26 Jun 2024 00:35:18 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4W82m62RhLz4llj; Wed, 26 Jun 2024 00:35:18 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1719362118; 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=vZDqTOkTQaAqCZ/xETWa52Uj2DcIMHrsblz/G9Y5FLM=; b=ZmhqK3eE7xhGd2VrskKucucrg6xEAJSADw1OSb0bHSDowyxqGrf93tWTLRRFAz7nUpbM7K mJIvPBOrPo9yfW++/pHuFLbuywIgGGaTm64Hg0pznaYxC+GKu8F8r+JiC5qCwVs3cvelAZ bk/2vpGGJVxsAaytTnTC7Ndv/p7+mZG6NKaaj8XrpNw0i0ZuL+TjK4+iaaht3YtiqmeUaW BOrWcdSpxucZhGWbqvDzZSW3TYs8GDLVg3d+G+qOUfYhNMOcoJvFZSFUoObJCJIEBpgg3z +ssh1fu9LOTALwpGCQ3A84m374Eqpg/7gNfztKWjD8rHWSxD0G8TbkE4MB+wCw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1719362118; a=rsa-sha256; cv=none; b=rEft/35V0tVaKC1C5Svcm8imVFTT+nMsC/d3SWUzM8l0UXAWCu92ep0jkWx/oDyHw7BEhZ Gs1qQqu392s6SLnrNlPGpIQEHPENWGdQD1AwgSNaNSfaixzpey6EUFsZMJz3PJXWHzNF5h 5Ytziv4oj274A0BUeWlYTa9gJHt5aK2RnLJF02WyR6xpJoRJvyn3oIbkcvv6sJa+mYS02x D0trXydvLx+bgfuvzg2IyrqrvfgVnF770rxCWvkDuhfERznupr9fNQcydRFdyIlaKnOqqn GUXdpKbAZuLWy3ztA8bF6qIjTkEbT2TbeIzyXoHaOPwt2kGnu24neaDWQZw0mQ== 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=1719362118; 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=vZDqTOkTQaAqCZ/xETWa52Uj2DcIMHrsblz/G9Y5FLM=; b=J0DKO7whCAitnZTSv12ovUpOhgsPqtSuakyRevxWEHtOXcptxDLkjC+hz4QHkikPEc4+Gz hjORgtcpz2emDTqWTfVthhB4ueTL6Nw58rRmu3mKE+yVOJPV3/kdSQGBkhFZdh/HdQcOd/ oq3ilPTfU0RyLiq9co6E0ZCDSFeaAhqZo3SzNFk82bNbWuejRVwLXnp9C55TCE+RDSPXVX 1vK/WPXTWY3r/LpLxMAKIHhOYzwqyG15lyVZvvvSxw4hB9os2KeXh6RaV72SteQ8xcVSvc t7u1cyRPtwFmS5BAzlhVnI0heDnWqvy578XBBuzEISE+iHmUkzTRXV1gDK1Rmw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4W82m61mbbzNZ9; Wed, 26 Jun 2024 00:35:18 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 45Q0ZIjC030716; Wed, 26 Jun 2024 00:35:18 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 45Q0ZIHN030713; Wed, 26 Jun 2024 00:35:18 GMT (envelope-from git) Date: Wed, 26 Jun 2024 00:35:18 GMT Message-Id: <202406260035.45Q0ZIHN030713@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Colin Percival Subject: git: 443a4ce9d401 - stable/14 - release: Don't publish CW if !WITH_CLOUDWARE 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 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/14 X-Git-Reftype: branch X-Git-Commit: 443a4ce9d401db290a552558787765e413b34484 Auto-Submitted: auto-generated The branch stable/14 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=443a4ce9d401db290a552558787765e413b34484 commit 443a4ce9d401db290a552558787765e413b34484 Author: Colin Percival AuthorDate: 2024-06-21 00:38:46 +0000 Commit: Colin Percival CommitDate: 2024-06-26 00:34:43 +0000 release: Don't publish CW if !WITH_CLOUDWARE If WITH_CLOUDWARE is not set, we didn't build BASIC-CLOUDWARE; don't try to install it into the /VM-IMAGES/ directory as part of ftp-stage. Fixes: 4771c2e9d1c7 "release: Publish non-uploaded cloudware bits" MFC after: 6 days (cherry picked from commit 836f00ebb96ac343e0f8a68ea264d2d330198488) --- release/Makefile.mirrors | 32 ++++++++++++++++++-------------- 1 file changed, 18 insertions(+), 14 deletions(-) diff --git a/release/Makefile.mirrors b/release/Makefile.mirrors index fd233e7abdb6..1888f86d3002 100644 --- a/release/Makefile.mirrors +++ b/release/Makefile.mirrors @@ -209,10 +209,11 @@ vm-images-stage: ${OSRELEASE}-${FS}.${VMFORMAT}.xz . endfor . endfor -. for CW in ${CLOUDWARE} -. if ${CW} == BASIC-CLOUDINIT -. for VMFORMAT in ${${CW}_FORMAT} -. for FS in ${${CW}_FSLIST} +. if defined(WITH_CLOUDWARE) && !empty(WITH_CLOUDWARE) +. for CW in ${CLOUDWARE} +. if ${CW} == BASIC-CLOUDINIT +. for VMFORMAT in ${${CW}_FORMAT} +. for FS in ${${CW}_FSLIST} cd ${RELEASEDIR}/vmimages && \ mv ${OSRELEASE}-${CW}.${FS}.${VMFORMAT}.xz \ ${OSRELEASE}-${CW}-${SNAP_SUFFIX}.${FS}.${VMFORMAT}.xz @@ -221,10 +222,11 @@ vm-images-stage: cd ${VM_DIR}/Latest && \ ln -s ../${BUILDDATE}/${OSRELEASE}-${CW}-${SNAP_SUFFIX}.${FS}.${VMFORMAT}.xz \ ${OSRELEASE}-${CW}.${FS}.${VMFORMAT}.xz +. endfor . endfor -. endfor -. endif -. endfor +. endif +. endfor +. endif cd ${RELEASEDIR}/vmimages && rm -f CHECKSUM.* . for CHECKSUM in ${CHECKSUM_FILES} cd ${RELEASEDIR}/vmimages && \ @@ -248,16 +250,18 @@ vm-images-stage: ${VM_DIR}/Latest/${OSRELEASE}-${FS}.${VMFORMAT}.xz . endfor . endfor -. for CW in ${CLOUDWARE} -. if ${CW} == BASIC-CLOUDINIT -. for VMFORMAT in ${${CW}_FORMAT} -. for FS in ${${CW}_FSLIST} +. if defined(WITH_CLOUDWARE) && !empty(WITH_CLOUDWARE) +. for CW in ${CLOUDWARE} +. if ${CW} == BASIC-CLOUDINIT +. for VMFORMAT in ${${CW}_FORMAT} +. for FS in ${${CW}_FSLIST} cp -p ${RELEASEDIR}/vmimages/${OSRELEASE}-${CW}.${FS}.${VMFORMAT}.xz \ ${VM_DIR}/Latest/${OSRELEASE}-${CW}.${FS}.${VMFORMAT}.xz +. endfor . endfor -. endfor -. endif -. endfor +. endif +. endfor +. endif . for CHECKSUM in ${CHECKSUM_FILES} cp -p ${RELEASEDIR}/vmimages/CHECKSUM.${CHECKSUM} \ ${VM_DIR}/Latest/CHECKSUM.${CHECKSUM} From nobody Wed Jun 26 00:53:11 2024 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 4W838m0PYtz5QL6g; Wed, 26 Jun 2024 00:53: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4W838l6rfSz4ppB; Wed, 26 Jun 2024 00:53:11 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1719363192; 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=XM8VdKxqtBxJlShOGtL6ApstM+1VvDBaCj1cocXlS0c=; b=olD18h4OFiqiv/x6TguL2w+1ayP7FSqg4PBf0rNT6wjx4tBrwdBmFrrjEMlSgrxa0Nwtjb FNThg2Z61BgFmeVEIm0xDx4C2X2DxvoIkCeD6R4Sik5lZM+SmN3boyLThuEcg7bLlL/f0X J09gH/W7hialO091WeEDNcbqJoBwrYYy0+QyzlwDseLEI+8wf2uue5D9SaYDJa85dvtbmZ m+3uJrE+u+kjT33MSeJU5gr/hApPib0eeOXNMTwXo58tFKwxmiFLmBx2PojD0unHdTp4xG rJf47SKJ2DItPhM91YB0V06Yp4dUa+RyTADkhcNnP7fHwI61fxwtSyh0wjIP4Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1719363192; a=rsa-sha256; cv=none; b=jKvjPnTjpSSs8EO2RKeimoMq38oJV84XinWvjtzCcrYSNhRlRAFapMoEyUrD5f19Oi2TZD hsyubOEtaIEhhFwD2Jf9hg4p3iukilAz1dny5aHUIAoiGUsfHhua9QIk1kUbVbiTHnBYjy IUgQWO3tcdB6QRQpmMayRU2Xo0kPjTPZ4Lm3d0iXg585RSjwMUql3TL78l4r+opzc39bQh IW8eXCbpKOCRg8uZnfl9FY8hpM9yFgq6EXvlssBaSKlcx+M4vSZq9O+f9ivcwkcCw9nc94 w4soY63xFRZK3iWv7Q1IJs4ofwZmLxgSo4LdRqu4rKJ2+96FsfVZzHci8zJt2Q== 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=1719363192; 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=XM8VdKxqtBxJlShOGtL6ApstM+1VvDBaCj1cocXlS0c=; b=PSmM4UA1v6kPpXSVvzHiJClgw5Zel/iIAgIVQraVCec0EUhck6IPVOaNopRNVjD9xhQZGC a7nKoLMf480wx7rRn3TmMEQgm1jDe0Uw3MALTF+VHvFYmYBDvUlxbRRPDzNNSBm1gU5P27 L7Up/uxLquJX4Ve1ZMhwy+M4IFxF9kX5Mx1zzA94fzb8BcMooW252Q+8GtIRA5wHDbKjWE c+ASz8WqdG2WxW+H9eOfPQT90g/YaXrjdYpThH2uGyJFpYorxzUq6C9UOVXeGcMyU5ZlSJ x2tvB3AH4ppZIPoUF/LE+lIdbjan224mXhzMkmCcosNjdug7vPxW0/NKpB+zLw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4W838l5kpTzPJT; Wed, 26 Jun 2024 00:53:11 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 45Q0rBu2064018; Wed, 26 Jun 2024 00:53:11 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 45Q0rB3u064015; Wed, 26 Jun 2024 00:53:11 GMT (envelope-from git) Date: Wed, 26 Jun 2024 00:53:11 GMT Message-Id: <202406260053.45Q0rB3u064015@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Colin Percival Subject: git: d6fecbebfcea - stable/13 - release: Publish non-uploaded cloudware bits 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 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/13 X-Git-Reftype: branch X-Git-Commit: d6fecbebfcea804cc00ead9e93b16ce72b4a7f3d Auto-Submitted: auto-generated The branch stable/13 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=d6fecbebfcea804cc00ead9e93b16ce72b4a7f3d commit d6fecbebfcea804cc00ead9e93b16ce72b4a7f3d Author: Colin Percival AuthorDate: 2024-06-19 19:28:42 +0000 Commit: Colin Percival CommitDate: 2024-06-26 00:52:55 +0000 release: Publish non-uploaded cloudware bits [MFC note: We don't have BASIC-CLOUDINIT or support for multiple disk formats or filesystems in VMs on 13.x so this MFC only does BASIC-CI and only for UFS on RAW.] While most "cloudware" (AWS, Azure, GCP, Vagrant) images get uploaded to their respective clouds, we have two images -- BASIC-CI and BASIC-CLOUDINIT -- which are published via the FTP mirrors. We have been handling these using a manual and error-prone process of copying them from the internal build directories into the FTP staging tree, but they should be handled using the "make install ftp-stage" mechanism which is used for all the other published images. This commit 1. Adds a new 'make cloud-install' target which is run as part of 'make install' and installs BASIC-CI and BASIC-CLOUDINIT images, and 2. Extends 'make ftp-stage' in Makefile.mirrors to copy those bits into the FTP staging area. As a side benefit, this will also make BASIC-CI and BASIC-CLOUDINIT images available for arm64; until now they have only been available for amd64. MFC after: 1 week (cherry picked from commit 4771c2e9d1c7db949a82dfe4f2b9878bb358a50e) --- release/Makefile | 3 ++- release/Makefile.mirrors | 52 ++++++++++++++++++++++++++++++++++++++++++++++++ release/Makefile.vm | 20 +++++++++++++++++++ 3 files changed, 74 insertions(+), 1 deletion(-) diff --git a/release/Makefile b/release/Makefile index 7e6bc566961c..55d82a0d0f5e 100644 --- a/release/Makefile +++ b/release/Makefile @@ -14,6 +14,7 @@ # install: Invokes the release-install and vm-install targets # release-install: Copies all release installation media into ${DESTDIR} # vm-install: Copies all virtual machine images into ${DESTDIR} +# cloud-install: Copies non-uploaded cloud images into ${DESTDIR} # # Variables affecting the build process: # WORLDDIR: location of src tree -- must have built world and default kernel @@ -267,7 +268,7 @@ real-release: ${MAKE} -C ${.CURDIR} ${.MAKEFLAGS} obj ${MAKE} -C ${.CURDIR} ${.MAKEFLAGS} ${RELEASE_TARGETS} -install: release-install vm-install +install: release-install vm-install .WAIT cloud-install release-install: .if defined(DESTDIR) && !empty(DESTDIR) diff --git a/release/Makefile.mirrors b/release/Makefile.mirrors index cbc5cd768e28..904040eb11ba 100644 --- a/release/Makefile.mirrors +++ b/release/Makefile.mirrors @@ -53,6 +53,11 @@ STAGE_TARGETS+= vm-images-stage VM_DIR= ${TLD}/VM-IMAGES/${REVISION}-${BRANCH}/${TARGET_ARCH} .endif +.if defined(WITH_CLOUDWARE) && !empty(WITH_CLOUDWARE) +STAGE_TARGETS+= ci-images-stage +CI_DIR= ${TLD}/CI-IMAGES/${REVISION}-${BRANCH}/${TARGET_ARCH} +.endif + CLEANFILES+= ${STAGE_TARGETS} CHECKSUM_FILES?= SHA512 SHA256 SNAP_SUFFIX!= echo ${_SNAP_SUFFIX:S,^-,,1} | tr -d ' ' @@ -219,5 +224,52 @@ vm-images-stage: . endfor .endif +ci-images-stage: + mkdir -p ${CI_DIR} +.if defined(SNAPSHOT) && !empty(SNAPSHOT) +. if exists(${CI_DIR}/Latest) + rm -rf ${CI_DIR}/Latest +. endif + mkdir -p ${CI_DIR}/Latest + mkdir -p ${CI_DIR}/${BUILDDATE} +. for CW in ${CLOUDWARE} +. if ${CW} == BASIC-CI + cd ${RELEASEDIR}/ciimages && \ + mv ${OSRELEASE}-${CW}.raw.xz \ + ${OSRELEASE}-${CW}-${SNAP_SUFFIX}.raw.xz + cp -p ${RELEASEDIR}/ciimages/${OSRELEASE}-${CW}-${SNAP_SUFFIX}.raw.xz \ + ${CI_DIR}/${BUILDDATE}/${OSRELEASE}-${CW}-${SNAP_SUFFIX}.raw.xz + cd ${CI_DIR}/Latest && \ + ln -s ../${BUILDDATE}/${OSRELEASE}-${CW}-${SNAP_SUFFIX}.raw.xz \ + ${OSRELEASE}-${CW}.raw.xz +. endif +. endfor + cd ${RELEASEDIR}/ciimages && rm -f CHECKSUM.* +. for CHECKSUM in ${CHECKSUM_FILES} + cd ${RELEASEDIR}/ciimages && \ + ${CHECKSUM:tl} ${OSRELEASE}* > CHECKSUM.${CHECKSUM}-${SNAP_SUFFIX} + cp -p ${RELEASEDIR}/ciimages/CHECKSUM.${CHECKSUM}-${SNAP_SUFFIX} \ + ${CI_DIR}/${BUILDDATE}/CHECKSUM.${CHECKSUM}-${SNAP_SUFFIX} + cd ${CI_DIR}/Latest && \ + ln -s ../${BUILDDATE}/CHECKSUM.${CHECKSUM}-${SNAP_SUFFIX} \ + CHECKSUM.${CHECKSUM} +. endfor +.else # not snapshot +. if exists(${CI_DIR}/Latest) + rm -rf ${CI_DIR}/Latest +. endif + mkdir -p ${CI_DIR}/Latest +. for CW in ${CLOUDWARE} +. if ${CW} == BASIC-CI + cp -p ${RELEASEDIR}/ciimages/${OSRELEASE}-${CW}.raw.xz \ + ${CI_DIR}/Latest/${OSRELEASE}-${CW}.raw.xz +. endif +. endfor +. for CHECKSUM in ${CHECKSUM_FILES} + cp -p ${RELEASEDIR}/ciimages/CHECKSUM.${CHECKSUM} \ + ${CI_DIR}/Latest/CHECKSUM.${CHECKSUM} +. endfor +.endif + ftp-stage: remove-old-bits ${STAGE_TARGETS} diff --git a/release/Makefile.vm b/release/Makefile.vm index 2e5bdb9a7004..520f47ab3ca6 100644 --- a/release/Makefile.vm +++ b/release/Makefile.vm @@ -174,6 +174,26 @@ vm-install: ${DESTDIR}/vmimages/CHECKSUM.SHA256 .endif +cloud-install-BASIC-CI: + mkdir -p ${DESTDIR}/ciimages + cp -p ${.OBJDIR}/${BASIC-CIIMAGE} \ + ${DESTDIR}/ciimages/${OSRELEASE}-BASIC-CI.raw + ${XZ_CMD} ${DESTDIR}/ciimages/${OSRELEASE}-BASIC-CI.raw + cd ${DESTDIR}/ciimages && sha512 ${OSRELEASE}* > \ + ${DESTDIR}/ciimages/CHECKSUM.SHA512 + cd ${DESTDIR}/ciimages && sha256 ${OSRELEASE}* > \ + ${DESTDIR}/ciimages/CHECKSUM.SHA256 + +CLOUD_INSTALL_TGTS= +.if defined(WITH_CLOUDWARE) && !empty(WITH_CLOUDWARE) +. for _CW in ${CLOUDWARE} +. if target(cloud-install-${_CW}) +CLOUD_INSTALL_TGTS+= cloud-install-${_CW} +. endif +. endfor +.endif +cloud-install: ${CLOUD_INSTALL_TGTS} + vm-release: .if defined(WITH_VMIMAGES) && !empty(WITH_VMIMAGES) ${MAKE} -C ${.CURDIR} ${.MAKEFLAGS} ${VMTARGETS} From nobody Wed Jun 26 04:50:19 2024 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 4W88QM6XZQz5P0BL; Wed, 26 Jun 2024 04:50: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4W88QM5dmnz56yJ; Wed, 26 Jun 2024 04:50:19 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1719377419; 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=6brjpjskV3RGb5JEIY+nN4jDCWXOtRyaKtHfIlps5Gg=; b=WAZZHpBWO5G2Am1c3EyP9nLRAZHuMyPvFc9QXJ8Eft4V6q/QsnNfYQhGtwwD7hjV3Aazsm r2CkLP+523tB+yd3EsCVHXlXzhtb82cZxwH7dakVox9mjeMXkEyAyKDATYrYs+UaWaxH5P GKsUJ0am1wXHsTDCpRi566wfw+EyIugE4pFTos/kRiIGP49CfJjZGG658xZjcBwB5UbV+m znRnc0yYsFxgt1MacshrzeQg22zVvBXT3hUN/7wuqv31OVtdmurSDJHC/82TQmO8xA+LRi /1C6XXtp+z/oPsMNJzDgoPyskRTJGjTEGSL6nzGFTN71e0/qwynOsIRY4RJkyA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1719377419; a=rsa-sha256; cv=none; b=I85mdUGZwWpQc7rt9+zQghHL3Eo7sWKcD2pk6O0QheUtoeBxaYC3PXUAWbMF1HU7Iwp1yA EngW6Qzir0ksjCadKf795DQmO2ZLX9IeqXhFd9JA5D6v+VvST1gCfkW3PwY3uitLm3kfPm tzU/3RXWGzO2tyVzvKVI/ygD6QRly64Hld0id8E9PJqJZVHaeXBQf5zCzHkgpSIq4eGGXr +ByrYUdmsNvL2oFB7GwLfJYtEULV02vRuERukwSo6xYcHoS2TvdO0FOTNK6KTpTzaUjuE9 QyiOs6gzcZ8lo/6UmHyLOSnpE4N4Gvb2ieaIcuHSLh8SKvu6IqPXn2KjH042SQ== 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=1719377419; 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=6brjpjskV3RGb5JEIY+nN4jDCWXOtRyaKtHfIlps5Gg=; b=T2yjWHyXfOlAsKPedFN89TNuLkr0jlhA3mQMwnwepqKKp7Lq9cWq53dLvxOLKauTkCD+Ic SuQ7xA4dcCdbnPubzTZCzBdMK22gnZL1MPgjfelQMVPjvJhnRdii/16CQmnE2XtiShxxI/ U9h7Hoe3kP/TvHdI11S11hUfgTNUmhgJUhDDFcSSSStR/zEP1kqmPnm6XmM58XgSm/Ibm6 tJCjfdK+iFKko9a0tMb/kwQIstN0XHYl9k3CEC22LDd9lkUjyHlhDgXiWUCjPQtVLk80Yu KraRG1IT7GW72W9cxl3u8Rz4VTH6Z/YY8w9EHKBTmzirWfz+fNIiVd/fgBapDA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4W88QM5DtbzX89; Wed, 26 Jun 2024 04:50:19 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 45Q4oJtf063570; Wed, 26 Jun 2024 04:50:19 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 45Q4oJ5h063567; Wed, 26 Jun 2024 04:50:19 GMT (envelope-from git) Date: Wed, 26 Jun 2024 04:50:19 GMT Message-Id: <202406260450.45Q4oJ5h063567@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Zhenlei Huang Subject: git: 2193c63f9ad1 - stable/14 - icmp: do not store per-VNET identical array of 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 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: zlei X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 2193c63f9ad16ce6fa9ed1747a87a4db26feda68 Auto-Submitted: auto-generated The branch stable/14 has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=2193c63f9ad16ce6fa9ed1747a87a4db26feda68 commit 2193c63f9ad16ce6fa9ed1747a87a4db26feda68 Author: Gleb Smirnoff AuthorDate: 2024-03-24 16:13:23 +0000 Commit: Zhenlei Huang CommitDate: 2024-06-26 04:48:42 +0000 icmp: do not store per-VNET identical array of strings We need per-VNET struct counter_rate, but we don't need per-VNET set of const char *. Also, identical word "response" can go into the format string instead of being stored 7 times. Reviewed by: kp, zlei, tuexen Differential Revision: https://reviews.freebsd.org/D44475 (cherry picked from commit 7142ab4790666022a2a3d85910e9cd8e241d9b87) --- sys/netinet/ip_icmp.c | 37 ++++++++++++++++++------------------- 1 file changed, 18 insertions(+), 19 deletions(-) diff --git a/sys/netinet/ip_icmp.c b/sys/netinet/ip_icmp.c index c99499d689db..89ba56dd1b11 100644 --- a/sys/netinet/ip_icmp.c +++ b/sys/netinet/ip_icmp.c @@ -1093,28 +1093,26 @@ ip_next_mtu(int mtu, int dir) * the 'final' error, but it doesn't make sense to solve the printing * delay with more complex code. */ -struct icmp_rate { - const char *descr; - struct counter_rate cr; -}; -VNET_DEFINE_STATIC(struct icmp_rate, icmp_rates[BANDLIM_MAX]) = { - { "icmp unreach response" }, - { "icmp ping response" }, - { "icmp tstamp response" }, - { "closed port RST response" }, - { "open port RST response" }, - { "icmp6 unreach response" }, - { "sctp ootb response" } -}; +VNET_DEFINE_STATIC(struct counter_rate, icmp_rates[BANDLIM_MAX]); #define V_icmp_rates VNET(icmp_rates) +static const char *icmp_rate_descrs[BANDLIM_MAX] = { + [BANDLIM_ICMP_UNREACH] = "icmp unreach", + [BANDLIM_ICMP_ECHO] = "icmp ping", + [BANDLIM_ICMP_TSTAMP] = "icmp tstamp", + [BANDLIM_RST_CLOSEDPORT] = "closed port RST", + [BANDLIM_RST_OPENPORT] = "open port RST", + [BANDLIM_ICMP6_UNREACH] = "icmp6 unreach", + [BANDLIM_SCTP_OOTB] = "sctp ootb", +}; + static void icmp_bandlimit_init(void) { for (int i = 0; i < BANDLIM_MAX; i++) { - V_icmp_rates[i].cr.cr_rate = counter_u64_alloc(M_WAITOK); - V_icmp_rates[i].cr.cr_ticks = ticks; + V_icmp_rates[i].cr_rate = counter_u64_alloc(M_WAITOK); + V_icmp_rates[i].cr_ticks = ticks; } } VNET_SYSINIT(icmp_bandlimit, SI_SUB_PROTO_DOMAIN, SI_ORDER_ANY, @@ -1125,7 +1123,7 @@ icmp_bandlimit_uninit(void) { for (int i = 0; i < BANDLIM_MAX; i++) - counter_u64_free(V_icmp_rates[i].cr.cr_rate); + counter_u64_free(V_icmp_rates[i].cr_rate); } VNET_SYSUNINIT(icmp_bandlimit, SI_SUB_PROTO_DOMAIN, SI_ORDER_THIRD, icmp_bandlimit_uninit, NULL); @@ -1144,7 +1142,7 @@ badport_bandlim(int which) if ((V_icmplim + V_icmplim_curr_jitter) <= 0) V_icmplim_curr_jitter = -V_icmplim + 1; - pps = counter_ratecheck(&V_icmp_rates[which].cr, V_icmplim + + pps = counter_ratecheck(&V_icmp_rates[which], V_icmplim + V_icmplim_curr_jitter); if (pps > 0) { /* @@ -1162,8 +1160,9 @@ badport_bandlim(int which) if (pps == -1) return (-1); if (pps > 0 && V_icmplim_output) - log(LOG_NOTICE, "Limiting %s from %jd to %d packets/sec\n", - V_icmp_rates[which].descr, (intmax_t )pps, V_icmplim + + log(LOG_NOTICE, + "Limiting %s response from %jd to %d packets/sec\n", + icmp_rate_descrs[which], (intmax_t )pps, V_icmplim + V_icmplim_curr_jitter); return (0); } From nobody Wed Jun 26 04:50:20 2024 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 4W88QP02BKz5P0Cl; Wed, 26 Jun 2024 04:50: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4W88QN6Yxsz56vp; Wed, 26 Jun 2024 04:50:20 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1719377420; 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=IyqnednLFGx4iQGPce/T0pctij+9OYapbUuFQQYCsI0=; b=iP6ArdYqyEp30N5zx+ge0pLdAmapNw6Mx+um1wpBPh+Yx+aG07xxGlyekbzppkexP7JBz4 o7MZhEfv37eb0lNml7ThHzpLaq+9yyfq+1DICbtRbw27p8K+4VOnisR8jzm9ebZqnAB1k9 co4qnKvD6HcBpbsazRcUwbDQL05L4eFErWaUwfNu3HZqgH6XFYDM3KpAU/z88lPdfS/62l tEY/CSS3ONXAePqNoWMeNoT+Pj2rDRz8Gf/AxZ2fJyy5jDB16BGxC7qRrZe1v65NGqzUvW hvFHrV4c4Laxm90ohdjcRBqOhzJGzQ0wvg8/LNplSFqdEo/PkkDVrjS5Lx2yQA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1719377420; a=rsa-sha256; cv=none; b=cVSQsX04RhefwQ+nBrqpdVVFLIgi/aA6rFOLjyTkNM65gKDnb9fw6HRMxtRGaPjQ81iJy+ W9AiOMqZUHKxhO/WMqeRNFGGEFewRnGTJzrYgCwA5J7mEoW7NHjXetngLMw8xzy/Jwu/DV MUD5Y6qjWmdb3Scjbro4+KewLJSBxKrFCMV+wkR/JDfCzy7UuiGRAWVI9GGb2GhJ6infl/ 6hpXvdyymVDmfU6g5/vv/3xk8YbfeGNifaPX8t14IWZx08ONKBLX4wjoDkgpSgJW48aK82 TLHyGE+1Sq6j/NqeC5nE0iZaX4nyTOAC24ypTUtGhPomVgs9p3jvsZL0JACJ0Q== 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=1719377420; 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=IyqnednLFGx4iQGPce/T0pctij+9OYapbUuFQQYCsI0=; b=mqWla60TC4vod/UNgJPeMEf8iJJ26EmXBMcBpYaQKbTmWc2yjcqdAwKuqShBatqtjQcihl Wsb5RUeML69S3Ypd84HVr1UnKAARZDwwDFzr9nuTyx9ESzRCzFdB/OcJDN8t4iiVkAoIZu tkl2IJPw3XLrisd8IhHrvFA7DlJYHrZLN8nbltyQ8dCGnZmSUg0of7jFGP5LHq6PlgEFFe 9Alhf0Cb6LfEjMUyg7pyyvXb8aeSbt3JR66NeTC1otlPWa+1C/3rSI0Eh5YecswYxcdEO+ xGg9Akc2HqucCRSbUZe4XHqBqpbxNTngUre/7BkL+Frna3JBWPqr0MWWZt2RQg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4W88QN69VMzXBt; Wed, 26 Jun 2024 04:50:20 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 45Q4oKOj063618; Wed, 26 Jun 2024 04:50:20 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 45Q4oK2o063615; Wed, 26 Jun 2024 04:50:20 GMT (envelope-from git) Date: Wed, 26 Jun 2024 04:50:20 GMT Message-Id: <202406260450.45Q4oK2o063615@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Zhenlei Huang Subject: git: c04006ea039f - stable/14 - icmp: hide icmp_bandlimit_uninit() under VIMAGE 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 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: zlei X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: c04006ea039f24761622caa5e2e7e188fa4b2791 Auto-Submitted: auto-generated The branch stable/14 has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=c04006ea039f24761622caa5e2e7e188fa4b2791 commit c04006ea039f24761622caa5e2e7e188fa4b2791 Author: Gleb Smirnoff AuthorDate: 2024-03-24 16:13:23 +0000 Commit: Zhenlei Huang CommitDate: 2024-06-26 04:48:43 +0000 icmp: hide icmp_bandlimit_uninit() under VIMAGE The uninitialization may be executed only on a kernel with VIMAGE. Reviewed by: kp, tuexen, zlei Differential Revision: https://reviews.freebsd.org/D44476 (cherry picked from commit 9d7f17d7467ed8c9740730a8db7a82e4768e5177) --- sys/netinet/ip_icmp.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/sys/netinet/ip_icmp.c b/sys/netinet/ip_icmp.c index 89ba56dd1b11..39eb46fd2d90 100644 --- a/sys/netinet/ip_icmp.c +++ b/sys/netinet/ip_icmp.c @@ -1118,6 +1118,7 @@ icmp_bandlimit_init(void) VNET_SYSINIT(icmp_bandlimit, SI_SUB_PROTO_DOMAIN, SI_ORDER_ANY, icmp_bandlimit_init, NULL); +#ifdef VIMAGE static void icmp_bandlimit_uninit(void) { @@ -1127,6 +1128,7 @@ icmp_bandlimit_uninit(void) } VNET_SYSUNINIT(icmp_bandlimit, SI_SUB_PROTO_DOMAIN, SI_ORDER_THIRD, icmp_bandlimit_uninit, NULL); +#endif int badport_bandlim(int which) From nobody Wed Jun 26 04:50:21 2024 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 4W88QQ2wrjz5P0Jr; Wed, 26 Jun 2024 04:50:22 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4W88QQ0VM0z571n; Wed, 26 Jun 2024 04:50:22 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1719377422; 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=B8Z1nqayFjrqFlUQzXZSH5Ly3icVrbDlx7fZ8JMvlnc=; b=Ut4DHCXduRXSKi7ye46ps5BRgCXtryqLYjcyYX6t++Cey3LebtKj+yQw631oijGq5SrZwY SDrL2hZXJ1JR4S6qOzNvZSYL3dmrGkjs5qPoa1z976I0SCgkjsZYPgaN4uLT2EhcPNeRDj eyZvkEoGbKIcdrFUwb58WtJV2bpE0R4wmh+nYGLGnTL8gk22M1KvSFb8BY/lPzQShV3u4H o+JoC7Uf+OTotogBPA7ekvyeFwRo4nBgqNOfrgzxjd6c6b18iH2m0jWBY1lp0SP+f1Dy9N QOcCpvo3gpPo2ank3OP2DooKYx7yFqRCrQ1/OyvOxNzNeebrX+Xuzt+fIaLqdA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1719377422; a=rsa-sha256; cv=none; b=wAK1TfXHhPLfTbrUnBQ67qYG/BoRauRURVqbrbloUdkXNDQ7dbmlkLDDWP4Hf5w4423Xqa O1tTSUHbV+7dzukAz5zO6mj8GlNFqSPQ8N42GWsnVFx98kofNh8g5nF5qW5Xg2UCVUmJW+ VEFlSi5d2lW2zo14oDxB/il9skVhrjf7uwqFidb7eNykoB1RuW8JFHf/GZh0lgt/450GqG V81Veop//8DWdHGn7gZNNuFH+Fik3lYPSEupGhrx/UETQ/T/733xmWLyjpKLdJPNBvZuIi 8PVpddQwsTbVUwU39GSvwhm8Y0ElmJVZUMczIhnRWeNpXSgwVREZAELN0lElUA== 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=1719377422; 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=B8Z1nqayFjrqFlUQzXZSH5Ly3icVrbDlx7fZ8JMvlnc=; b=qvxCCYX4FEkBIdaiyRG+6epkSknY3cH63GRk0er2h4ni8LUYM1XdEoII9SjDuBFvGE+GmE VcslXfCCksd+Y2Z8TdFB9+zVtk4E3sA1mJrzaWZDsAFyrdq1RlivZNAaJDKVUQu+6YsHZy sXImyXuVlXURHeZ63fic4eWmVFnW/D3qAGLSE63CwGXqoyb9wRHntO5nieCt0wW6uJvb0j 6L7A4ME5UJhti/O083vqoZkEfQTSeCyx7Pp4Zw/ItTG8IoVB1JHzAYEWbwKsvVBgZwZj4g T7SHTCItZfE5yB3qGU8SfM02pGZg3fJIL/41WaOsXYCp/KlgDw/HIiqC6jnnfA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4W88QQ05jczXBv; Wed, 26 Jun 2024 04:50:22 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 45Q4oL5L063675; Wed, 26 Jun 2024 04:50:21 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 45Q4oLov063672; Wed, 26 Jun 2024 04:50:21 GMT (envelope-from git) Date: Wed, 26 Jun 2024 04:50:21 GMT Message-Id: <202406260450.45Q4oLov063672@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Zhenlei Huang Subject: git: 09a05224b04f - stable/14 - icmp: when logging ICMP ratelimiting message use correct jitter value 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 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: zlei X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 09a05224b04f4c67e1ebd8367788dc0068a47fc6 Auto-Submitted: auto-generated The branch stable/14 has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=09a05224b04f4c67e1ebd8367788dc0068a47fc6 commit 09a05224b04f4c67e1ebd8367788dc0068a47fc6 Author: Gleb Smirnoff AuthorDate: 2024-03-24 16:13:23 +0000 Commit: Zhenlei Huang CommitDate: 2024-06-26 04:48:43 +0000 icmp: when logging ICMP ratelimiting message use correct jitter value The limiting of the very last second has been done using certain jitter value. We update the jitter for the next second. But the logging should report the jitter before the change. Reviewed by: kp, tuexen, zlei Differential Revision: https://reviews.freebsd.org/D44477 (cherry picked from commit b508545ce044dbfdd83da772e73f969a3713d59d) --- sys/netinet/ip_icmp.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/sys/netinet/ip_icmp.c b/sys/netinet/ip_icmp.c index 39eb46fd2d90..83034f9d9dd4 100644 --- a/sys/netinet/ip_icmp.c +++ b/sys/netinet/ip_icmp.c @@ -1147,6 +1147,11 @@ badport_bandlim(int which) pps = counter_ratecheck(&V_icmp_rates[which], V_icmplim + V_icmplim_curr_jitter); if (pps > 0) { + if (V_icmplim_output) + log(LOG_NOTICE, + "Limiting %s response from %jd to %d packets/sec\n", + icmp_rate_descrs[which], (intmax_t )pps, + V_icmplim + V_icmplim_curr_jitter); /* * Adjust limit +/- to jitter the measurement to deny a * side-channel port scan as in CVE-2020-25705 @@ -1161,10 +1166,5 @@ badport_bandlim(int which) } if (pps == -1) return (-1); - if (pps > 0 && V_icmplim_output) - log(LOG_NOTICE, - "Limiting %s response from %jd to %d packets/sec\n", - icmp_rate_descrs[which], (intmax_t )pps, V_icmplim + - V_icmplim_curr_jitter); return (0); } From nobody Wed Jun 26 04:50:23 2024 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 4W88QR3SBXz5NyxG; Wed, 26 Jun 2024 04:50: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4W88QR1Vg5z56yh; Wed, 26 Jun 2024 04:50:23 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1719377423; 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=BEujx95rcDhAwozidVX3UxPLKqxxOPNvFk/34uNo8l8=; b=FZvgi2a2GTWaxjArIoDzqm3LFmKW+4I5DOMB7uUuKKZQJ4gsdBswCZRrHfgWuobLCZox0C +5QtABDkVRJc8PTWgTCf3kL0rw32sRO53+rdlIIuga4k/Bw3MVejntNa4s/73Mbt6AIW30 sgxIeXjoNuZhRyeoTzLabwj/4LcKvT974xMkzN104su8nYn6fkSZZLhWH7n7UeUUBsEse4 hPk6bEQ95foDcELh5i5dDlxLRhnjs8PhjzaiIAeIcOo/YfwjHH/Jd0DkkN1e6nIxe1tgyS ab122FMERBp0rBICmwx9N+UUDbZHOiEgO44I/O01UjZTIgTb/a5qJtkyg1XzdQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1719377423; a=rsa-sha256; cv=none; b=e0wFEesPJHSJCAo7+Tb3HNxs3FS2gjKr92h9xWWX9WGj1smNNCHg8eKTcTSTYqlZFX1Pyp z2k0xGPgDaOSaRDBF0Tx+QP2t5x/Z7Zp9/iUSWF9k53TAcCrM1AdMn8e/T4YR1F6yxc/tt jeoi1LppfgTfuM997saF0raB6n6TxEGhN01CH20mP3VxybieLNN0570Eee0b7UFNjXVPA1 Lqvc/pXX5T26X6KxMioVW+weULXVAkqJzug7/s4PwlLjozDbRReNTS6twF499afKZr/SJm 5JUxQVCHU1HsaOD68vbtf9CN307tu1WqkrDfqwktyIyUiAK7IejhpMvsqQUOlw== 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=1719377423; 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=BEujx95rcDhAwozidVX3UxPLKqxxOPNvFk/34uNo8l8=; b=qMCGMpFzypEsX7LioN8xpTxx0nD8oi9+t0jaahjP/wdpkKn/3UvkjEBXppymx8GB0K4dmA IU6E+uZW1FPmh6Fqfqb8lxhWyl0/PvH+W5pKmxzTf3ajGb2QMpOw0fto0veyMsXbxg9rYE hhaTTPP9qu5icI5XRTc4myNN/6ZPy/299izvYQ+b1WgDBPuo61TwnGnE2Edd7cvzRzaKnT wi230Qb+WdSY9uWMlkqvWKtn/T38lRq/mHV3WmnP7563DE48MgUEbRx/kpcNXN5lQc/E6m K2Vvda2FMofSs795Ibk58wEsun2s5MjH9zYbBdT2fbmSRS7Mux3NwXxjwUR1Tw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4W88QR14pZzXBw; Wed, 26 Jun 2024 04:50:23 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 45Q4oN8R063718; Wed, 26 Jun 2024 04:50:23 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 45Q4oNKF063715; Wed, 26 Jun 2024 04:50:23 GMT (envelope-from git) Date: Wed, 26 Jun 2024 04:50:23 GMT Message-Id: <202406260450.45Q4oNKF063715@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Zhenlei Huang Subject: git: d8acc7277cec - stable/14 - icmp: improve ICMP limit jitter 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 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: zlei X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: d8acc7277cecde08092289a58caceeca1b455888 Auto-Submitted: auto-generated The branch stable/14 has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=d8acc7277cecde08092289a58caceeca1b455888 commit d8acc7277cecde08092289a58caceeca1b455888 Author: Gleb Smirnoff AuthorDate: 2024-03-24 16:13:23 +0000 Commit: Zhenlei Huang CommitDate: 2024-06-26 04:48:43 +0000 icmp: improve ICMP limit jitter Instead of fixing up invalid values set by a user in badport_bandlim() which is a fast path function, provide a sysctl handler sysctl_icmplim_and_jitter(), that will check that jitter is less than the limit. Provide jitter initilization function icmplim_new_jitter() used at boot, in the sysctl handler and when we actually hit the limit. This also fixes no jitter on a fresh booted system until first limit hit. Instead of CVE number provide link the the actual paper that explains what and why we are doing here. The CVE number isn't very informative, it will just tell you what RedHat version you need to upgrade to. Reviewed by: kp, tuexen, zlei Differential Revision: https://reviews.freebsd.org/D44478 (cherry picked from commit ac44739fd834f51cacb26485a4140fd482e20150) --- sys/netinet/ip_icmp.c | 81 +++++++++++++++++++++++++++++++++++++-------------- 1 file changed, 59 insertions(+), 22 deletions(-) diff --git a/sys/netinet/ip_icmp.c b/sys/netinet/ip_icmp.c index 83034f9d9dd4..dcf387aa3c1c 100644 --- a/sys/netinet/ip_icmp.c +++ b/sys/netinet/ip_icmp.c @@ -82,19 +82,22 @@ extern ipproto_ctlinput_t *ip_ctlprotox[]; * routines to turnaround packets back to the originator, and * host table maintenance routines. */ -VNET_DEFINE_STATIC(int, icmplim) = 200; +static int sysctl_icmplim_and_jitter(SYSCTL_HANDLER_ARGS); +VNET_DEFINE_STATIC(u_int, icmplim) = 200; #define V_icmplim VNET(icmplim) -SYSCTL_INT(_net_inet_icmp, ICMPCTL_ICMPLIM, icmplim, CTLFLAG_VNET | CTLFLAG_RW, - &VNET_NAME(icmplim), 0, - "Maximum number of ICMP responses per second"); +SYSCTL_PROC(_net_inet_icmp, ICMPCTL_ICMPLIM, icmplim, CTLTYPE_UINT | + CTLFLAG_VNET | CTLFLAG_RW, &VNET_NAME(icmplim), 0, + &sysctl_icmplim_and_jitter, "IU", + "Maximum number of ICMP responses per second"); VNET_DEFINE_STATIC(int, icmplim_curr_jitter) = 0; #define V_icmplim_curr_jitter VNET(icmplim_curr_jitter) -VNET_DEFINE_STATIC(int, icmplim_jitter) = 16; +VNET_DEFINE_STATIC(u_int, icmplim_jitter) = 16; #define V_icmplim_jitter VNET(icmplim_jitter) -SYSCTL_INT(_net_inet_icmp, OID_AUTO, icmplim_jitter, CTLFLAG_VNET | CTLFLAG_RW, - &VNET_NAME(icmplim_jitter), 0, - "Random icmplim jitter adjustment limit"); +SYSCTL_PROC(_net_inet_icmp, OID_AUTO, icmplim_jitter, CTLTYPE_UINT | + CTLFLAG_VNET | CTLFLAG_RW, &VNET_NAME(icmplim_jitter), 0, + &sysctl_icmplim_and_jitter, "IU", + "Random icmplim jitter adjustment limit"); VNET_DEFINE_STATIC(int, icmplim_output) = 1; #define V_icmplim_output VNET(icmplim_output) @@ -1106,6 +1109,52 @@ static const char *icmp_rate_descrs[BANDLIM_MAX] = { [BANDLIM_SCTP_OOTB] = "sctp ootb", }; +static void +icmplim_new_jitter(void) +{ + /* + * Adjust limit +/- to jitter the measurement to deny a side-channel + * port scan as in https://dl.acm.org/doi/10.1145/3372297.3417280 + */ + if (V_icmplim_jitter > 0) + V_icmplim_curr_jitter = + arc4random_uniform(V_icmplim_jitter * 2 + 1) - + V_icmplim_jitter; +} + +static int +sysctl_icmplim_and_jitter(SYSCTL_HANDLER_ARGS) +{ + uint32_t new; + int error; + bool lim; + + MPASS(oidp->oid_arg1 == &VNET_NAME(icmplim) || + oidp->oid_arg1 == &VNET_NAME(icmplim_jitter)); + + lim = (oidp->oid_arg1 == &VNET_NAME(icmplim)); + new = lim ? V_icmplim : V_icmplim_jitter; + error = sysctl_handle_int(oidp, &new, 0, req); + if (error == 0 && req->newptr) { + if (lim) { + if (new <= V_icmplim_jitter) + error = EINVAL; + else + V_icmplim = new; + } else { + if (new >= V_icmplim) + error = EINVAL; + else { + V_icmplim_jitter = new; + icmplim_new_jitter(); + } + } + } + MPASS(V_icmplim + V_icmplim_curr_jitter > 0); + + return (error); +} + static void icmp_bandlimit_init(void) { @@ -1114,6 +1163,7 @@ icmp_bandlimit_init(void) V_icmp_rates[i].cr_rate = counter_u64_alloc(M_WAITOK); V_icmp_rates[i].cr_ticks = ticks; } + icmplim_new_jitter(); } VNET_SYSINIT(icmp_bandlimit, SI_SUB_PROTO_DOMAIN, SI_ORDER_ANY, icmp_bandlimit_init, NULL); @@ -1141,9 +1191,6 @@ badport_bandlim(int which) KASSERT(which >= 0 && which < BANDLIM_MAX, ("%s: which %d", __func__, which)); - if ((V_icmplim + V_icmplim_curr_jitter) <= 0) - V_icmplim_curr_jitter = -V_icmplim + 1; - pps = counter_ratecheck(&V_icmp_rates[which], V_icmplim + V_icmplim_curr_jitter); if (pps > 0) { @@ -1152,17 +1199,7 @@ badport_bandlim(int which) "Limiting %s response from %jd to %d packets/sec\n", icmp_rate_descrs[which], (intmax_t )pps, V_icmplim + V_icmplim_curr_jitter); - /* - * Adjust limit +/- to jitter the measurement to deny a - * side-channel port scan as in CVE-2020-25705 - */ - if (V_icmplim_jitter > 0) { - int32_t inc = - arc4random_uniform(V_icmplim_jitter * 2 +1) - - V_icmplim_jitter; - - V_icmplim_curr_jitter = inc; - } + icmplim_new_jitter(); } if (pps == -1) return (-1); From nobody Wed Jun 26 04:50:24 2024 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 4W88QS4Ts2z5P0GD; Wed, 26 Jun 2024 04:50:24 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4W88QS2PTLz56wX; Wed, 26 Jun 2024 04:50:24 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1719377424; 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=00JdlhkAECGINz/nfgpK6brcgUtVxAFyhG/PmyvLzdo=; b=JDrrKmZ4K2CT7OSBbMBjFSzxTTf4X/k9e+NeLE5gRyP76w0gNwxr3fNxZuvl+vAnR5WlG4 6QCLNMJtqnlXmKJ0INF/6m6KqK2OQybySwjbkjKnC9HSg4xHWz8/d0Q5DitKnyZx7lwnu3 ipKTKbJ2AbNgpuXeum0rNv9JEC/pDI3EYFFRKUlPLb5DK3NW3Cju2+14z4F8pRlddKUG6N Upj1inKgZMCj5iNVXPeqUM4ItLhgCubzOW3cDXpKo+vrjP1k8trGXOQdAIs7/0iTgZemyl LN5RN9C0ylCbzw2wWE/ee0QLL1SXTaUNrROuQphe3HxDM0fKppumgQRk078Iow== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1719377424; a=rsa-sha256; cv=none; b=EmQp3AvzPS2T/9yXzb7yPGP+AkEzBk2f3s+OBwWVDlYfm/LXXZib3Xpk1yTveeeSrVLa5Q hXLAV22FRid4GUw2YSJjpu3Q57Uzy1dzXTUrwp7iNLdYHFPHyUEgmbpdTZIJoAe3/D6kBx l6QxnuzrkLU2AnF0lPUjuUT14cCBRWU6bnR15cixaJpCMDjFhjEahzuaWNQKnWBL/KYcD5 X/146FRsEi8Tyhc0lT3eKH14cQTo9ZvLsVS62a0bvNNrGlkGB9vhzIPZDzdmhYmafnwcOI XwNG3z28v98C0m5x0pxLxyR6Lb4+t3MWi+9SMfesPI9RzMxPjmEm2/60kgC97A== 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=1719377424; 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=00JdlhkAECGINz/nfgpK6brcgUtVxAFyhG/PmyvLzdo=; b=qzHUFPYrxKS4zr8ZIrRKCz4sCykKQetTXDNaMKk2yI3WpVfhjcy4ax2xbUl+g13SWWnq1p A26YnBbKqhs6+6iBymzM8Mj8vfviMbKpq4Tz6ySFbCJ+J0eJprNOuA6C4A3FPBamLXCZYf sbUTmd1bQt90BXKZD4hbr/+dWrtJ2Pp3EA6bfcef3xoM1syNYsh9ECcfjMR46EMQJNyOoy NCyZGwFl30qiOUgYYjNIAiKlGeXPqalY3H59cqIhAY6rgtcLI05cNDfceeOBOfCHadUbGA DrB3QThM3AImDXGBbFDQ4VApH2s7+oPw20Pec8vBaeXPl6z6Ynkt32UYBHoA+Q== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4W88QS20VtzX44; Wed, 26 Jun 2024 04:50:24 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 45Q4oOsN063772; Wed, 26 Jun 2024 04:50:24 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 45Q4oOEe063769; Wed, 26 Jun 2024 04:50:24 GMT (envelope-from git) Date: Wed, 26 Jun 2024 04:50:24 GMT Message-Id: <202406260450.45Q4oOEe063769@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Zhenlei Huang Subject: git: 9e09b33e8efc - stable/14 - icmp6: make icmp6_ratelimit() responsible to update the stats counter 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 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: zlei X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 9e09b33e8efc9b4a7f9befb3cf61d17d4a1a35e5 Auto-Submitted: auto-generated The branch stable/14 has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=9e09b33e8efc9b4a7f9befb3cf61d17d4a1a35e5 commit 9e09b33e8efc9b4a7f9befb3cf61d17d4a1a35e5 Author: Gleb Smirnoff AuthorDate: 2024-03-24 16:13:23 +0000 Commit: Zhenlei Huang CommitDate: 2024-06-26 04:48:43 +0000 icmp6: make icmp6_ratelimit() responsible to update the stats counter Reviewed by: tuexen Differential Revision: https://reviews.freebsd.org/D44479 (cherry picked from commit c6c96aaba8dd74eb39469ed156ff19cc31d599b7) --- sys/netinet6/icmp6.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/sys/netinet6/icmp6.c b/sys/netinet6/icmp6.c index b8ac3fc7b094..ba66e18b6524 100644 --- a/sys/netinet6/icmp6.c +++ b/sys/netinet6/icmp6.c @@ -343,10 +343,8 @@ icmp6_error(struct mbuf *m, int type, int code, int param) } /* Finally, do rate limitation check. */ - if (icmp6_ratelimit(&oip6->ip6_src, type, code)) { - ICMP6STAT_INC(icp6s_toofreq); + if (icmp6_ratelimit(&oip6->ip6_src, type, code)) goto freeit; - } /* * OK, ICMP6 can be generated. @@ -2746,6 +2744,7 @@ icmp6_ratelimit(const struct in6_addr *dst, const int type, V_icmp6errppslim)) { /* The packet is subject to rate limit */ ret++; + ICMP6STAT_INC(icp6s_toofreq); } return ret; From nobody Wed Jun 26 04:50:25 2024 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 4W88QT5cbGz5P0Cs; Wed, 26 Jun 2024 04:50: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4W88QT36nXz57NT; Wed, 26 Jun 2024 04:50:25 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1719377425; 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=5+TJRontAsJADPOnGrds5LWmoMxcx/u7b/IMuIc0X4s=; b=E01Q4pVd856gsJYg0h9KPI5SmCZ0DS7EaXIZIkvomcXkiECvLX/dDlCMyaM4cT+8p6K/jn ZnLFx6lVt+04f6VhAle6JNI7rTEAViHy738ApzCNFeHVGLimMuPBjdQTwWNec9pvHYEXeX RMoRNT+RuRgNy1N6lTpz8N4xZJvy2eSierliwGT2H79rPfdetK6iY8BWuXpjTSL/ZFuoIX Szz4rshj9ylvsGWD0gf5/LHBjbBp5WPVL4D0y65isd1hvxv5NhMUc1a7TtPMw9Y5SmYiMj Lf0kZR3xRrpxqqIfKcAXEvgqfcYuhx4ZT6aF0njmebopzof0BODSM1S9wuG1sg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1719377425; a=rsa-sha256; cv=none; b=jBNK/SHS8acU+vYQwogFSdt8W5YcY9tms8Pl06kKMEuqheye87IwfCuUNA4mPnyUupQKxC f9OHBZGg5XtEwhFI2c3/ju13rrwqqRr53wUhI0yxTOoYYDrbpFLJCB3j6dHajI+HxKi5Vg o+xsw9/4j/H5KYXNnARzHR16AfIBAaN7Arr22qlHLCmw4z/EVloeZvvKuJI0C6SgAICAmH zYghoIUjtEbu60c3H6ZbdBhQrliO5J4E1mcru2OjQuj0+83jmjZSmaZADT/cjh5TrP5jvm ch/jlwxyx25Deajf5fZZhNCYma3ZuU2mCyzkA+qLj4GpkmsFz+Ul13uKFpFp7w== 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=1719377425; 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=5+TJRontAsJADPOnGrds5LWmoMxcx/u7b/IMuIc0X4s=; b=wqrH/h9iG2CQOR/3+yNMn7aJQgfeJgQhQbAVMEwl3IWGTSyuYR8xCoFAb4cCHUtj/HSZE0 skoM0kdstslhWuwfvLMhus3SNzhDHZ1sGwID5MGg8HfWdd/3WJZIFyp5xl3ZwHjz69D4jL Cc+U66ngR8WyiXAo6oAns0oRiruZffjSyYDUEU6bH0Xw8yuMmW2K6pVz5sd8aZd168UxKX OPDRWOsWZ/LRZkEe8znFH2Z3Wm8RoKNeH5753TEhrw1HrMKcWpw5dV0ea6MbA9SP1axLM9 UIiZNBBglSRPpIbiieaohzUup7uTEaoviUAuvgqIxaADh+5dbJBAloAouSh1EA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4W88QT2jTSzXNM; Wed, 26 Jun 2024 04:50:25 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 45Q4oP2O063817; Wed, 26 Jun 2024 04:50:25 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 45Q4oPPD063814; Wed, 26 Jun 2024 04:50:25 GMT (envelope-from git) Date: Wed, 26 Jun 2024 04:50:25 GMT Message-Id: <202406260450.45Q4oPPD063814@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Zhenlei Huang Subject: git: f6561ff8ee10 - stable/14 - icmp6: rate limit our echo replies 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 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: zlei X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: f6561ff8ee103194e2551efdfda1cd6d655b183d Auto-Submitted: auto-generated The branch stable/14 has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=f6561ff8ee103194e2551efdfda1cd6d655b183d commit f6561ff8ee103194e2551efdfda1cd6d655b183d Author: Gleb Smirnoff AuthorDate: 2024-03-24 16:13:23 +0000 Commit: Zhenlei Huang CommitDate: 2024-06-26 04:48:43 +0000 icmp6: rate limit our echo replies The generation of ICMP6_ECHO_REPLY bypasses icmp6_error(), thus rate limit was not applied. Reviewed by: tuexen, zlei Differential Revision: https://reviews.freebsd.org/D44480 (cherry picked from commit 32aeee8ce7e72738fff236ccd5629d55035458f8) --- sys/netinet6/icmp6.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/sys/netinet6/icmp6.c b/sys/netinet6/icmp6.c index ba66e18b6524..5b384889d422 100644 --- a/sys/netinet6/icmp6.c +++ b/sys/netinet6/icmp6.c @@ -548,6 +548,8 @@ icmp6_input(struct mbuf **mp, int *offp, int proto) icmp6_ifstat_inc(ifp, ifs6_in_echo); if (code != 0) goto badcode; + if (icmp6_ratelimit(&ip6->ip6_src, ICMP6_ECHO_REPLY, 0)) + break; if ((n = m_copym(m, 0, M_COPYALL, M_NOWAIT)) == NULL) { /* Give up remote */ break; From nobody Wed Jun 26 04:50:26 2024 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 4W88QW0QNqz5P0PD; Wed, 26 Jun 2024 04:50: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4W88QV42XYz57Lm; Wed, 26 Jun 2024 04:50:26 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1719377426; 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=YauO0ZRJnJbLzao5Rs9q1AUOSh7XwoC9yYllATM09Os=; b=X+5VzBZY0x6lS6YfTm4vi8cXTIX/JqHi1XURXmtny/fr0Qpu6KFJ4aLH0pQw5zBpSZQULu JerXox8nltgZse5LoqqAYpAJMyBh+veGZBT//ML7JNaUGayLcP1qHX1wAXK9vzq74DWapE H0W4eR/pQuJ89SitQd7pPP0I8N/3JBSPhYG7VkLX945jSHQuv2xB3HAGNk7bLME0uwbi2s 6pz/inGF0NjS48mabIKtPptmF+qtbGkJim/lDzf+EVz5jFp+0ceAor5CtJgfcDmlyRuBJz O+UC42wg6GdRGLrSH4o8auoNQE5MTA8cdKSBeUxjgJtLjZDfHpNCA1ChgMLFGQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1719377426; a=rsa-sha256; cv=none; b=uaA8t5QmS761lVZWJuI2+U/OCwhSNlzrdtcTZMaYsKCnOC84o8jqN5qLltDsUfQGf2SwCM 15FBM9nmdZVvAs1ABon1QeDJLz74bID4pvodPKdkH1jc74DLHs3B8aGFXPy2rGgVdeDdBh ETfTym7nTGbMtK5E5KG65FnAS1SfKU7CD97h1fTG31lh53grjI7D1O+sNbJczKPLqM818V Xd8oajTN+7yFjOO/ukA0K8pc/T97aPu7eg5OEXoHXA102RMeW8fPzyYvCbgn2HmrSGqFbo EMvdZjCIY7IRWUnHAnxzXe63DPlRWzDTrx3kHHJnQ5QHzIQ/Kb1G+/fwu29WYw== 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=1719377426; 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=YauO0ZRJnJbLzao5Rs9q1AUOSh7XwoC9yYllATM09Os=; b=bjcqQDFpEQtH5yimxP8MgJZHuXEhSgPQ+OrKCmBJCmheEytWGRD4dALFrxBKfZlq0S8m4z Dw14YSelIOHLMes/opNCX/n7+d+Atf7wrHPFgSBa+LEVZzR3kLwQyYB+hMzXeZB2DHorzD dfdyKBWe4O5ODyi/4Vdnhy/9RXUPGWuY0qHbq1NXmhfe2uKPDj0kU8RI/9aCjeaBPcDmEW 3qc8+r6KBtZeWLqcU8WI5z+IvMSrfjKXVlzsMJEZn6CRHyfFxzvnAVKULeUqjcyZ4f8ZGe gQvP072GuJfLxle5KGAgyx5kU8DwqleBkKQkPelotpJBAwpMfUBZ3P5gEAxbcg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4W88QV3dSVzX69; Wed, 26 Jun 2024 04:50:26 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 45Q4oQne063887; Wed, 26 Jun 2024 04:50:26 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 45Q4oQcG063884; Wed, 26 Jun 2024 04:50:26 GMT (envelope-from git) Date: Wed, 26 Jun 2024 04:50:26 GMT Message-Id: <202406260450.45Q4oQcG063884@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Zhenlei Huang Subject: git: 24a07b61ff28 - stable/14 - icmp6: move ICMPv6 related tunables to the files where they are used 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 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: zlei X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 24a07b61ff28ed243615244e371ca02e326035a0 Auto-Submitted: auto-generated The branch stable/14 has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=24a07b61ff28ed243615244e371ca02e326035a0 commit 24a07b61ff28ed243615244e371ca02e326035a0 Author: Gleb Smirnoff AuthorDate: 2024-03-24 16:13:23 +0000 Commit: Zhenlei Huang CommitDate: 2024-06-26 04:48:44 +0000 icmp6: move ICMPv6 related tunables to the files where they are used Most of them can be declared as static after the move out of in6_proto.c. Keeping sysctl(9) declarations with their text descriptions next to the variable declaration create self-documenting code. There should be no functional changes. Differential Revision: https://reviews.freebsd.org/D44481 (cherry picked from commit 4f96be33fe7676c69c5abb476bb09bba0c63a3f4) --- sys/netinet/icmp6.h | 10 +++----- sys/netinet6/icmp6.c | 34 +++++++++++++++++++++---- sys/netinet6/in6.c | 14 ++++++++++- sys/netinet6/in6_proto.c | 65 ------------------------------------------------ sys/netinet6/ip6_var.h | 5 ---- sys/netinet6/nd6.c | 44 ++++++++++++++++++++++---------- sys/netinet6/nd6.h | 14 ----------- sys/netinet6/nd6_nbr.c | 7 ++++++ sys/netinet6/nd6_rtr.c | 10 +++++--- 9 files changed, 91 insertions(+), 112 deletions(-) diff --git a/sys/netinet/icmp6.h b/sys/netinet/icmp6.h index e93317c66a11..ea7bf74797f1 100644 --- a/sys/netinet/icmp6.h +++ b/sys/netinet/icmp6.h @@ -646,6 +646,10 @@ struct icmp6stat { #ifdef _KERNEL #include +#ifdef SYSCTL_DECL +SYSCTL_DECL(_net_inet6_icmp6); +#endif + VNET_PCPUSTAT_DECLARE(struct icmp6stat, icmp6stat); /* * In-kernel consumers can use these accessor macros directly to update @@ -774,12 +778,6 @@ do { \ } \ } while (/*CONSTCOND*/ 0) -VNET_DECLARE(int, icmp6_rediraccept); /* accept/process redirects */ -VNET_DECLARE(int, icmp6_redirtimeout); /* cache time for redirect routes */ - -#define V_icmp6_rediraccept VNET(icmp6_rediraccept) -#define V_icmp6_redirtimeout VNET(icmp6_redirtimeout) - #define ICMP6_NODEINFO_FQDNOK 0x1 #define ICMP6_NODEINFO_NODEADDROK 0x2 #define ICMP6_NODEINFO_TMPADDROK 0x4 diff --git a/sys/netinet6/icmp6.c b/sys/netinet6/icmp6.c index 5b384889d422..996416856b20 100644 --- a/sys/netinet6/icmp6.c +++ b/sys/netinet6/icmp6.c @@ -116,22 +116,46 @@ extern ip6proto_ctlinput_t *ip6_ctlprotox[]; VNET_PCPUSTAT_DEFINE(struct icmp6stat, icmp6stat); VNET_PCPUSTAT_SYSINIT(icmp6stat); +SYSCTL_VNET_PCPUSTAT(_net_inet6_icmp6, ICMPV6CTL_STATS, stats, + struct icmp6stat, icmp6stat, + "ICMPv6 statistics (struct icmp6stat, netinet/icmp6.h)"); #ifdef VIMAGE VNET_PCPUSTAT_SYSUNINIT(icmp6stat); #endif /* VIMAGE */ +VNET_DEFINE_STATIC(int, icmp6_rediraccept) = 1; +#define V_icmp6_rediraccept VNET(icmp6_rediraccept) +SYSCTL_INT(_net_inet6_icmp6, ICMPV6CTL_REDIRACCEPT, rediraccept, + CTLFLAG_VNET | CTLFLAG_RW, &VNET_NAME(icmp6_rediraccept), 0, + "Accept ICMPv6 redirect messages"); + +VNET_DEFINE_STATIC(int, icmp6_redirtimeout) = 10 * 60; /* 10 minutes */ +#define V_icmp6_redirtimeout VNET(icmp6_redirtimeout) +SYSCTL_INT(_net_inet6_icmp6, ICMPV6CTL_REDIRTIMEOUT, redirtimeout, + CTLFLAG_VNET | CTLFLAG_RW, &VNET_NAME(icmp6_redirtimeout), 0, + "Delay in seconds before expiring redirect route"); + +VNET_DEFINE_STATIC(int, icmp6_nodeinfo) = 0; +#define V_icmp6_nodeinfo VNET(icmp6_nodeinfo) +SYSCTL_INT(_net_inet6_icmp6, ICMPV6CTL_NODEINFO, nodeinfo, + CTLFLAG_VNET | CTLFLAG_RW, &VNET_NAME(icmp6_nodeinfo), 0, + "Mask of enabled RFC4620 node information query types"); + VNET_DECLARE(struct inpcbinfo, ripcbinfo); -VNET_DECLARE(int, icmp6errppslim); +#define V_ripcbinfo VNET(ripcbinfo) + +VNET_DEFINE_STATIC(int, icmp6errppslim) = 100; +#define V_icmp6errppslim VNET(icmp6errppslim) +SYSCTL_INT(_net_inet6_icmp6, ICMPV6CTL_ERRPPSLIMIT, errppslimit, + CTLFLAG_VNET | CTLFLAG_RW, &VNET_NAME(icmp6errppslim), 0, + "Maximum number of ICMPv6 error messages per second"); + VNET_DEFINE_STATIC(int, icmp6errpps_count) = 0; VNET_DEFINE_STATIC(struct timeval, icmp6errppslim_last); -VNET_DECLARE(int, icmp6_nodeinfo); -#define V_ripcbinfo VNET(ripcbinfo) -#define V_icmp6errppslim VNET(icmp6errppslim) #define V_icmp6errpps_count VNET(icmp6errpps_count) #define V_icmp6errppslim_last VNET(icmp6errppslim_last) -#define V_icmp6_nodeinfo VNET(icmp6_nodeinfo) static void icmp6_errcount(int, int); static int icmp6_rip6_input(struct mbuf **, int); diff --git a/sys/netinet6/in6.c b/sys/netinet6/in6.c index 55d675417c41..e9f16dcf5c54 100644 --- a/sys/netinet6/in6.c +++ b/sys/netinet6/in6.c @@ -102,6 +102,7 @@ #include #include #include +#include #include #include @@ -125,8 +126,19 @@ _Static_assert(offsetof(struct in6_ifreq, ifr_ifru) == offsetof(struct ifreq, ifr_ifru), "struct in6_ifreq and struct ifreq are not type punnable"); -VNET_DECLARE(int, icmp6_nodeinfo_oldmcprefix); +VNET_DEFINE_STATIC(int, icmp6_nodeinfo_oldmcprefix) = 1; #define V_icmp6_nodeinfo_oldmcprefix VNET(icmp6_nodeinfo_oldmcprefix) +SYSCTL_INT(_net_inet6_icmp6, ICMPV6CTL_NODEINFO_OLDMCPREFIX, + nodeinfo_oldmcprefix, CTLFLAG_VNET | CTLFLAG_RW, + &VNET_NAME(icmp6_nodeinfo_oldmcprefix), 0, + "Join old IPv6 NI group address in draft-ietf-ipngwg-icmp-name-lookup " + "for compatibility with KAME implementation"); + +VNET_DEFINE_STATIC(int, nd6_useloopback) = 1; +#define V_nd6_useloopback VNET(nd6_useloopback) +SYSCTL_INT(_net_inet6_icmp6, ICMPV6CTL_ND6_USELOOPBACK, nd6_useloopback, + CTLFLAG_VNET | CTLFLAG_RW, &VNET_NAME(nd6_useloopback), 0, + "Create a loopback route when configuring an IPv6 address"); /* * Definitions of some costant IP6 addresses. diff --git a/sys/netinet6/in6_proto.c b/sys/netinet6/in6_proto.c index 6e7ffedc3dcd..de065f814560 100644 --- a/sys/netinet6/in6_proto.c +++ b/sys/netinet6/in6_proto.c @@ -173,11 +173,8 @@ VNET_DEFINE(int, ip6_v6only) = 1; #ifdef IPSTEALTH VNET_DEFINE(int, ip6stealth) = 0; #endif -VNET_DEFINE(int, nd6_onlink_ns_rfc4861) = 0;/* allow 'on-link' nd6 NS - * (RFC 4861) */ VNET_DEFINE(bool, ip6_log_cannot_forward) = 1; -/* icmp6 */ /* * BSDI4 defines these variables in in_proto.c... * XXX: what if we don't define INET? Should we define pmtu6_expire @@ -186,14 +183,6 @@ VNET_DEFINE(bool, ip6_log_cannot_forward) = 1; VNET_DEFINE(int, pmtu_expire) = 60*10; VNET_DEFINE(int, pmtu_probe) = 60*2; -/* ICMPV6 parameters */ -VNET_DEFINE(int, icmp6_rediraccept) = 1;/* accept and process redirects */ -VNET_DEFINE(int, icmp6_redirtimeout) = 10 * 60; /* 10 minutes */ -VNET_DEFINE(int, icmp6errppslim) = 100; /* 100pps */ -/* control how to respond to NI queries */ -VNET_DEFINE(int, icmp6_nodeinfo) = 0; -VNET_DEFINE(int, icmp6_nodeinfo_oldmcprefix) = 1; - VNET_DEFINE_STATIC(int, ip6_log_interval) = 5; VNET_DEFINE_STATIC(int, ip6_log_count) = 0; VNET_DEFINE_STATIC(struct timeval, ip6_log_last) = { 0 }; @@ -358,57 +347,3 @@ SYSCTL_BOOL(_net_inet6_ip6, OID_AUTO, log_cannot_forward, CTLFLAG_VNET | CTLFLAG_RW, &VNET_NAME(ip6_log_cannot_forward), 1, "Log packets that cannot be forwarded"); - -/* net.inet6.icmp6 */ -SYSCTL_INT(_net_inet6_icmp6, ICMPV6CTL_REDIRACCEPT, rediraccept, - CTLFLAG_VNET | CTLFLAG_RW, &VNET_NAME(icmp6_rediraccept), 0, - "Accept ICMPv6 redirect messages"); -SYSCTL_INT(_net_inet6_icmp6, ICMPV6CTL_REDIRTIMEOUT, redirtimeout, - CTLFLAG_VNET | CTLFLAG_RW, &VNET_NAME(icmp6_redirtimeout), 0, - "Delay in seconds before expiring redirect route"); -SYSCTL_VNET_PCPUSTAT(_net_inet6_icmp6, ICMPV6CTL_STATS, stats, - struct icmp6stat, icmp6stat, - "ICMPv6 statistics (struct icmp6stat, netinet/icmp6.h)"); -SYSCTL_INT(_net_inet6_icmp6, ICMPV6CTL_ND6_PRUNE, nd6_prune, - CTLFLAG_VNET | CTLFLAG_RW, &VNET_NAME(nd6_prune), 0, - "Frequency in seconds of checks for expired prefixes and routers"); -SYSCTL_INT(_net_inet6_icmp6, ICMPV6CTL_ND6_DELAY, nd6_delay, - CTLFLAG_VNET | CTLFLAG_RW, &VNET_NAME(nd6_delay), 0, - "Delay in seconds before probing for reachability"); -SYSCTL_INT(_net_inet6_icmp6, ICMPV6CTL_ND6_UMAXTRIES, nd6_umaxtries, - CTLFLAG_VNET | CTLFLAG_RW, &VNET_NAME(nd6_umaxtries), 0, - "Number of ICMPv6 NS messages sent during reachability detection"); -SYSCTL_INT(_net_inet6_icmp6, ICMPV6CTL_ND6_MMAXTRIES, nd6_mmaxtries, - CTLFLAG_VNET | CTLFLAG_RW, &VNET_NAME(nd6_mmaxtries), 0, - "Number of ICMPv6 NS messages sent during address resolution"); -SYSCTL_INT(_net_inet6_icmp6, ICMPV6CTL_ND6_USELOOPBACK, nd6_useloopback, - CTLFLAG_VNET | CTLFLAG_RW, &VNET_NAME(nd6_useloopback), 0, - "Create a loopback route when configuring an IPv6 address"); -SYSCTL_INT(_net_inet6_icmp6, ICMPV6CTL_NODEINFO, nodeinfo, - CTLFLAG_VNET | CTLFLAG_RW, &VNET_NAME(icmp6_nodeinfo), 0, - "Mask of enabled RFC4620 node information query types"); -SYSCTL_INT(_net_inet6_icmp6, ICMPV6CTL_NODEINFO_OLDMCPREFIX, - nodeinfo_oldmcprefix, CTLFLAG_VNET | CTLFLAG_RW, - &VNET_NAME(icmp6_nodeinfo_oldmcprefix), 0, - "Join old IPv6 NI group address in draft-ietf-ipngwg-icmp-name-lookup " - "for compatibility with KAME implementation"); -SYSCTL_INT(_net_inet6_icmp6, ICMPV6CTL_ERRPPSLIMIT, errppslimit, - CTLFLAG_VNET | CTLFLAG_RW, &VNET_NAME(icmp6errppslim), 0, - "Maximum number of ICMPv6 error messages per second"); -SYSCTL_INT(_net_inet6_icmp6, ICMPV6CTL_ND6_MAXNUDHINT, nd6_maxnudhint, - CTLFLAG_VNET | CTLFLAG_RW, &VNET_NAME(nd6_maxnudhint), 0, - ""); /* XXX unused */ -SYSCTL_INT(_net_inet6_icmp6, ICMPV6CTL_ND6_DEBUG, nd6_debug, - CTLFLAG_VNET | CTLFLAG_RW, &VNET_NAME(nd6_debug), 0, - "Log NDP debug messages"); -SYSCTL_INT(_net_inet6_icmp6, ICMPV6CTL_ND6_ONLINKNSRFC4861, - nd6_onlink_ns_rfc4861, CTLFLAG_VNET | CTLFLAG_RW, - &VNET_NAME(nd6_onlink_ns_rfc4861), 0, - "Accept 'on-link' ICMPv6 NS messages in compliance with RFC 4861"); -#ifdef EXPERIMENTAL -SYSCTL_INT(_net_inet6_icmp6, OID_AUTO, - nd6_ignore_ipv6_only_ra, CTLFLAG_VNET | CTLFLAG_RW, - &VNET_NAME(nd6_ignore_ipv6_only_ra), 0, - "Ignore the 'IPv6-Only flag' in RA messages in compliance with " - "draft-ietf-6man-ipv6only-flag"); -#endif diff --git a/sys/netinet6/ip6_var.h b/sys/netinet6/ip6_var.h index a3b3b0cb3585..464b74c4fd88 100644 --- a/sys/netinet6/ip6_var.h +++ b/sys/netinet6/ip6_var.h @@ -333,11 +333,6 @@ VNET_DECLARE(int, ip6stealth); #define V_ip6stealth VNET(ip6stealth) #endif -#ifdef EXPERIMENTAL -VNET_DECLARE(int, nd6_ignore_ipv6_only_ra); -#define V_nd6_ignore_ipv6_only_ra VNET(nd6_ignore_ipv6_only_ra) -#endif - VNET_DECLARE(bool, ip6_log_cannot_forward); #define V_ip6_log_cannot_forward VNET(ip6_log_cannot_forward) diff --git a/sys/netinet6/nd6.c b/sys/netinet6/nd6.c index b3ca612c90d6..3eacb05f88d7 100644 --- a/sys/netinet6/nd6.c +++ b/sys/netinet6/nd6.c @@ -91,21 +91,37 @@ MALLOC_DEFINE(M_IP6NDP, "ip6ndp", "IPv6 Neighbor Discovery"); -/* timer values */ -VNET_DEFINE(int, nd6_prune) = 1; /* walk list every 1 seconds */ -VNET_DEFINE(int, nd6_delay) = 5; /* delay first probe time 5 second */ -VNET_DEFINE(int, nd6_umaxtries) = 3; /* maximum unicast query */ -VNET_DEFINE(int, nd6_mmaxtries) = 3; /* maximum multicast query */ -VNET_DEFINE(int, nd6_useloopback) = 1; /* use loopback interface for - * local traffic */ -VNET_DEFINE(int, nd6_gctimer) = (60 * 60 * 24); /* 1 day: garbage - * collection timer */ +VNET_DEFINE_STATIC(int, nd6_prune) = 1; +#define V_nd6_prune VNET(nd6_prune) +SYSCTL_INT(_net_inet6_icmp6, ICMPV6CTL_ND6_PRUNE, nd6_prune, + CTLFLAG_VNET | CTLFLAG_RW, &VNET_NAME(nd6_prune), 0, + "Frequency in seconds of checks for expired prefixes and routers"); + +VNET_DEFINE_STATIC(int, nd6_delay) = 5; +#define V_nd6_delay VNET(nd6_delay) +SYSCTL_INT(_net_inet6_icmp6, ICMPV6CTL_ND6_DELAY, nd6_delay, + CTLFLAG_VNET | CTLFLAG_RW, &VNET_NAME(nd6_delay), 0, + "Delay in seconds before probing for reachability"); + +VNET_DEFINE_STATIC(int, nd6_umaxtries) = 3; +#define V_nd6_umaxtries VNET(nd6_umaxtries) +SYSCTL_INT(_net_inet6_icmp6, ICMPV6CTL_ND6_UMAXTRIES, nd6_umaxtries, + CTLFLAG_VNET | CTLFLAG_RW, &VNET_NAME(nd6_umaxtries), 0, + "Number of ICMPv6 NS messages sent during reachability detection"); + +VNET_DEFINE(int, nd6_mmaxtries) = 3; +#define V_nd6_mmaxtries VNET(nd6_mmaxtries) +SYSCTL_INT(_net_inet6_icmp6, ICMPV6CTL_ND6_MMAXTRIES, nd6_mmaxtries, + CTLFLAG_VNET | CTLFLAG_RW, &VNET_NAME(nd6_mmaxtries), 0, + "Number of ICMPv6 NS messages sent during address resolution"); + +VNET_DEFINE_STATIC(int, nd6_gctimer) = (60 * 60 * 24); /* 1 day: garbage + * collection timer */ +#define V_nd6_gctimer VNET(nd6_gctimer) /* preventing too many loops in ND option parsing */ VNET_DEFINE_STATIC(int, nd6_maxndopt) = 10; /* max # of ND options allowed */ -VNET_DEFINE(int, nd6_maxnudhint) = 0; /* max # of subsequent upper - * layer hints */ VNET_DEFINE_STATIC(int, nd6_maxqueuelen) = 16; /* max pkts cached in unresolved * ND entries */ #define V_nd6_maxndopt VNET(nd6_maxndopt) @@ -116,6 +132,10 @@ VNET_DEFINE(int, nd6_debug) = 1; #else VNET_DEFINE(int, nd6_debug) = 0; #endif +#define V_nd6_debug VNET(nd6_debug) +SYSCTL_INT(_net_inet6_icmp6, ICMPV6CTL_ND6_DEBUG, nd6_debug, + CTLFLAG_VNET | CTLFLAG_RW, &VNET_NAME(nd6_debug), 0, + "Log NDP debug messages"); static eventhandler_tag lle_event_eh, iflladdr_event_eh, ifnet_link_event_eh; @@ -148,8 +168,6 @@ VNET_DEFINE_STATIC(struct callout, nd6_slowtimo_ch); VNET_DEFINE_STATIC(struct callout, nd6_timer_ch); #define V_nd6_timer_ch VNET(nd6_timer_ch) -SYSCTL_DECL(_net_inet6_icmp6); - static void nd6_lle_event(void *arg __unused, struct llentry *lle, int evt) { diff --git a/sys/netinet6/nd6.h b/sys/netinet6/nd6.h index 3e7f2d814d47..1db1b666c60b 100644 --- a/sys/netinet6/nd6.h +++ b/sys/netinet6/nd6.h @@ -255,26 +255,12 @@ MALLOC_DECLARE(M_IP6NDP); #endif /* nd6.c */ -VNET_DECLARE(int, nd6_prune); -VNET_DECLARE(int, nd6_delay); -VNET_DECLARE(int, nd6_umaxtries); VNET_DECLARE(int, nd6_mmaxtries); -VNET_DECLARE(int, nd6_useloopback); -VNET_DECLARE(int, nd6_maxnudhint); -VNET_DECLARE(int, nd6_gctimer); VNET_DECLARE(struct nd_prhead, nd_prefix); VNET_DECLARE(int, nd6_debug); -VNET_DECLARE(int, nd6_onlink_ns_rfc4861); -#define V_nd6_prune VNET(nd6_prune) -#define V_nd6_delay VNET(nd6_delay) -#define V_nd6_umaxtries VNET(nd6_umaxtries) #define V_nd6_mmaxtries VNET(nd6_mmaxtries) -#define V_nd6_useloopback VNET(nd6_useloopback) -#define V_nd6_maxnudhint VNET(nd6_maxnudhint) -#define V_nd6_gctimer VNET(nd6_gctimer) #define V_nd_prefix VNET(nd_prefix) #define V_nd6_debug VNET(nd6_debug) -#define V_nd6_onlink_ns_rfc4861 VNET(nd6_onlink_ns_rfc4861) /* Lock for the prefix and default router lists. */ VNET_DECLARE(struct rwlock, nd6_lock); diff --git a/sys/netinet6/nd6_nbr.c b/sys/netinet6/nd6_nbr.c index 7b4fa7a8d8c9..353db66c2323 100644 --- a/sys/netinet6/nd6_nbr.c +++ b/sys/netinet6/nd6_nbr.c @@ -110,6 +110,13 @@ VNET_DEFINE_STATIC(int, dad_maxtry) = 15; /* max # of *tries* to transmit DAD packet */ #define V_dad_maxtry VNET(dad_maxtry) +VNET_DEFINE_STATIC(int, nd6_onlink_ns_rfc4861) = 0; +#define V_nd6_onlink_ns_rfc4861 VNET(nd6_onlink_ns_rfc4861) +SYSCTL_INT(_net_inet6_icmp6, ICMPV6CTL_ND6_ONLINKNSRFC4861, + nd6_onlink_ns_rfc4861, CTLFLAG_VNET | CTLFLAG_RW, + &VNET_NAME(nd6_onlink_ns_rfc4861), 0, + "Accept 'on-link' ICMPv6 NS messages in compliance with RFC 4861"); + /* * Input a Neighbor Solicitation Message. * diff --git a/sys/netinet6/nd6_rtr.c b/sys/netinet6/nd6_rtr.c index de991c98b6c3..845f9094f4c4 100644 --- a/sys/netinet6/nd6_rtr.c +++ b/sys/netinet6/nd6_rtr.c @@ -98,11 +98,15 @@ VNET_DEFINE(u_int32_t, ip6_temp_valid_lifetime) = DEF_TEMP_VALID_LIFETIME; VNET_DEFINE(int, ip6_temp_regen_advance) = TEMPADDR_REGEN_ADVANCE; #ifdef EXPERIMENTAL -VNET_DEFINE(int, nd6_ignore_ipv6_only_ra) = 1; +VNET_DEFINE_STATIC(int, nd6_ignore_ipv6_only_ra) = 1; +#define V_nd6_ignore_ipv6_only_ra VNET(nd6_ignore_ipv6_only_ra) +SYSCTL_INT(_net_inet6_icmp6, OID_AUTO, + nd6_ignore_ipv6_only_ra, CTLFLAG_VNET | CTLFLAG_RW, + &VNET_NAME(nd6_ignore_ipv6_only_ra), 0, + "Ignore the 'IPv6-Only flag' in RA messages in compliance with " + "draft-ietf-6man-ipv6only-flag"); #endif -SYSCTL_DECL(_net_inet6_icmp6); - /* RTPREF_MEDIUM has to be 0! */ #define RTPREF_HIGH 1 #define RTPREF_MEDIUM 0 From nobody Wed Jun 26 04:50:27 2024 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 4W88QW6vY2z5P0Bh; Wed, 26 Jun 2024 04:50: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4W88QW573jz57X1; Wed, 26 Jun 2024 04:50:27 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1719377427; 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=zeKkbbKQMu1eDPVPjnykIeUjSuTvfkrsc7cmEyi7nxo=; b=xAxt9DiN6fX7VALv4nfNUDG0ecfu19uLgtnYOgpkSOYCmwrjfEajozy7kSG7VYhXf/EDeO CA4ACv3k9Vh9797oz70i9Wc8FTm/hfMWzwHIEJZwheTZFWCJc3EkiIENcpDwrjZ3dh+Y4f 9PdcSGMk5ML1H595DFVwpeaX58gcpR/ei9DFtqRG8x3wl0ZHcRdnD5ToneNvCND1qjtnLI vojduiVSYvWKkOph1yB+jsH6NmjU3KBxDWGcLmIOscTF8aAJKwHF1dU5ldQ3qc48YVv0G7 U/aW9Yc/mSAxYpesM4xMpAYmSJd855bjeGt0JTTsQwZXWrAc7xYmeUBBXWqxjQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1719377427; a=rsa-sha256; cv=none; b=N0RoEVuhRZETwUsc4OuOwBnHs3z0GdPlNQLO02J7Dbl+18Ny1MGdRpOEKue3qkYEqX4FF6 Gm79um0BsIyeZxsbBF8+m1O6aqZ37JMEcV3eZcCrl1pwS/WLXfb1HbMMo/oooos6dquE/n aNUIv7p4U01ZmKzeJYzcEkoZ+QrEUtib9g6vq27YvmMzJpqnRk4i4l6NA3enTcxISKPaIt A1KjAJxV/sfeslBsB40xGvBhDU9qMfpTsGMdj+B5LYiOCQSObGwdM6n7lzh8dDwPitu91Q eFkOMon4BZmbqN7sLMHuZQf1fbTsl86P5d3hrNBP5S6O8NHYlhHQdHsroeX6mA== 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=1719377427; 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=zeKkbbKQMu1eDPVPjnykIeUjSuTvfkrsc7cmEyi7nxo=; b=qCGpQbogJurLc2nxClcrODA+e8/ZlLN6/+ZzGgtJBVotmjE0aj3wCX7W2wzQhSYuGzLU2+ KB1h0VNpyBRlh28yhGakZgLBGh9dcp0cV52tHrwjNouvdNGuEZ8GnKObGiGkZv0sFI8UxZ hxpQ2VcT7qcZa0BHWgTRa2pUl7YF5Ree6WmkFNBeD3H5Z5gEE1SIXul/2hwVQWloQnQSyt Pb1oZNL2lVUmx0i0bjU2lEf5iSZkbiGrrtAMMTTk/QSavj7JLz3LH/hu0IuMmbZprpEOCl Z5czNwL8V3bNJZgEQFZLcJKEzL8zCbVvH7wlAypdi4/xc+6SvIl8gqRYYpmKPA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4W88QW4kGfzX6B; Wed, 26 Jun 2024 04:50:27 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 45Q4oRCa063941; Wed, 26 Jun 2024 04:50:27 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 45Q4oRAJ063938; Wed, 26 Jun 2024 04:50:27 GMT (envelope-from git) Date: Wed, 26 Jun 2024 04:50:27 GMT Message-Id: <202406260450.45Q4oRAJ063938@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Zhenlei Huang Subject: git: b544e62dd00f - stable/14 - icmp6: bring rate limiting on a par with IPv4 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 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: zlei X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: b544e62dd00f167a3d8b4df3dd31fcd7bf1873a8 Auto-Submitted: auto-generated The branch stable/14 has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=b544e62dd00f167a3d8b4df3dd31fcd7bf1873a8 commit b544e62dd00f167a3d8b4df3dd31fcd7bf1873a8 Author: Gleb Smirnoff AuthorDate: 2024-03-24 16:13:23 +0000 Commit: Zhenlei Huang CommitDate: 2024-06-26 04:48:44 +0000 icmp6: bring rate limiting on a par with IPv4 Use counter_ratecheck() instead of racy and slow ppsratecheck. Use a separate counter for every currently known type of ICMPv6. Provide logging of ratelimit events. Provide jitter to counter open UDP port detection. Reviewed by: tuexen, zlei Differential Revision: https://reviews.freebsd.org/D44482 (cherry picked from commit a03aff88a14448c3084a0384082ec996d7213897) --- sys/netinet6/icmp6.c | 185 ++++++++++++++++++++++++++++++++++++++++++++------- 1 file changed, 162 insertions(+), 23 deletions(-) diff --git a/sys/netinet6/icmp6.c b/sys/netinet6/icmp6.c index 996416856b20..4bce366c7ed4 100644 --- a/sys/netinet6/icmp6.c +++ b/sys/netinet6/icmp6.c @@ -145,18 +145,6 @@ SYSCTL_INT(_net_inet6_icmp6, ICMPV6CTL_NODEINFO, nodeinfo, VNET_DECLARE(struct inpcbinfo, ripcbinfo); #define V_ripcbinfo VNET(ripcbinfo) -VNET_DEFINE_STATIC(int, icmp6errppslim) = 100; -#define V_icmp6errppslim VNET(icmp6errppslim) -SYSCTL_INT(_net_inet6_icmp6, ICMPV6CTL_ERRPPSLIMIT, errppslimit, - CTLFLAG_VNET | CTLFLAG_RW, &VNET_NAME(icmp6errppslim), 0, - "Maximum number of ICMPv6 error messages per second"); - -VNET_DEFINE_STATIC(int, icmp6errpps_count) = 0; -VNET_DEFINE_STATIC(struct timeval, icmp6errppslim_last); - -#define V_icmp6errpps_count VNET(icmp6errpps_count) -#define V_icmp6errppslim_last VNET(icmp6errppslim_last) - static void icmp6_errcount(int, int); static int icmp6_rip6_input(struct mbuf **, int); static void icmp6_reflect(struct mbuf *, size_t); @@ -2745,6 +2733,126 @@ icmp6_ctloutput(struct socket *so, struct sockopt *sopt) return (error); } +static int sysctl_icmp6lim_and_jitter(SYSCTL_HANDLER_ARGS); +VNET_DEFINE_STATIC(u_int, icmp6errppslim) = 100; +#define V_icmp6errppslim VNET(icmp6errppslim) +SYSCTL_PROC(_net_inet6_icmp6, ICMPV6CTL_ERRPPSLIMIT, errppslimit, + CTLTYPE_UINT | CTLFLAG_VNET | CTLFLAG_RW, &VNET_NAME(icmp6errppslim), 0, + &sysctl_icmp6lim_and_jitter, "IU", + "Maximum number of ICMPv6 error/reply messages per second"); + +VNET_DEFINE_STATIC(int, icmp6lim_curr_jitter) = 0; +#define V_icmp6lim_curr_jitter VNET(icmp6lim_curr_jitter) + +VNET_DEFINE_STATIC(u_int, icmp6lim_jitter) = 8; +#define V_icmp6lim_jitter VNET(icmp6lim_jitter) +SYSCTL_PROC(_net_inet6_icmp6, OID_AUTO, icmp6lim_jitter, CTLTYPE_UINT | + CTLFLAG_VNET | CTLFLAG_RW, &VNET_NAME(icmp6lim_jitter), 0, + &sysctl_icmp6lim_and_jitter, "IU", + "Random errppslimit jitter adjustment limit"); + +VNET_DEFINE_STATIC(int, icmp6lim_output) = 1; +#define V_icmp6lim_output VNET(icmp6lim_output) +SYSCTL_INT(_net_inet6_icmp6, OID_AUTO, icmp6lim_output, + CTLFLAG_VNET | CTLFLAG_RW, &VNET_NAME(icmp6lim_output), 0, + "Enable logging of ICMPv6 response rate limiting"); + +typedef enum { + RATELIM_PARAM_PROB = 0, + RATELIM_TOO_BIG, + RATELIM_UNREACH, + RATELIM_TEXCEED, + RATELIM_REDIR, + RATELIM_REPLY, + RATELIM_OTHER, + RATELIM_MAX +} ratelim_which; + +static const char *icmp6_rate_descrs[RATELIM_MAX] = { + [RATELIM_PARAM_PROB] = "bad IPv6 header", + [RATELIM_TOO_BIG] = "packet too big", + [RATELIM_UNREACH] = "destination unreachable", + [RATELIM_TEXCEED] = "time exceeded", + [RATELIM_REPLY] = "echo reply", + [RATELIM_REDIR] = "neighbor discovery redirect", + [RATELIM_OTHER] = "(other)", +}; + +static void +icmp6lim_new_jitter(void) +{ + /* + * Adjust limit +/- to jitter the measurement to deny a side-channel + * port scan as in https://dl.acm.org/doi/10.1145/3372297.3417280 + */ + if (V_icmp6lim_jitter > 0) + V_icmp6lim_curr_jitter = + arc4random_uniform(V_icmp6lim_jitter * 2 + 1) - + V_icmp6lim_jitter; +} + +static int +sysctl_icmp6lim_and_jitter(SYSCTL_HANDLER_ARGS) +{ + uint32_t new; + int error; + bool lim; + + MPASS(oidp->oid_arg1 == &VNET_NAME(icmp6errppslim) || + oidp->oid_arg1 == &VNET_NAME(icmp6lim_jitter)); + + lim = (oidp->oid_arg1 == &VNET_NAME(icmp6errppslim)); + new = lim ? V_icmp6errppslim : V_icmp6lim_jitter; + error = sysctl_handle_int(oidp, &new, 0, req); + if (error == 0 && req->newptr) { + if (lim) { + if (new <= V_icmp6lim_jitter) + error = EINVAL; + else + V_icmp6errppslim = new; + } else { + if (new >= V_icmp6errppslim) + error = EINVAL; + else { + V_icmp6lim_jitter = new; + icmp6lim_new_jitter(); + } + } + } + MPASS(V_icmp6errppslim + V_icmp6lim_curr_jitter > 0); + + return (error); +} + + +VNET_DEFINE_STATIC(struct counter_rate, icmp6_rates[RATELIM_MAX]); +#define V_icmp6_rates VNET(icmp6_rates) + +static void +icmp6_ratelimit_init(void) +{ + + for (int i = 0; i < RATELIM_MAX; i++) { + V_icmp6_rates[i].cr_rate = counter_u64_alloc(M_WAITOK); + V_icmp6_rates[i].cr_ticks = ticks; + } + icmp6lim_new_jitter(); +} +VNET_SYSINIT(icmp6_ratelimit, SI_SUB_PROTO_DOMAIN, SI_ORDER_ANY, + icmp6_ratelimit_init, NULL); + +#ifdef VIMAGE +static void +icmp6_ratelimit_uninit(void) +{ + + for (int i = 0; i < RATELIM_MAX; i++) + counter_u64_free(V_icmp6_rates[i].cr_rate); +} +VNET_SYSUNINIT(icmp6_ratelimit, SI_SUB_PROTO_DOMAIN, SI_ORDER_THIRD, + icmp6_ratelimit_uninit, NULL); +#endif + /* * Perform rate limit check. * Returns 0 if it is okay to send the icmp6 packet. @@ -2754,24 +2862,55 @@ icmp6_ctloutput(struct socket *so, struct sockopt *sopt) * XXX per-destination/type check necessary? * * dst - not used at this moment - * type - not used at this moment * code - not used at this moment */ int -icmp6_ratelimit(const struct in6_addr *dst, const int type, - const int code) +icmp6_ratelimit(const struct in6_addr *dst, const int type, const int code) { - int ret; + ratelim_which which; + int64_t pps; - ret = 0; /* okay to send */ + if (V_icmp6errppslim == 0) + return (0); - /* PPS limit */ - if (!ppsratecheck(&V_icmp6errppslim_last, &V_icmp6errpps_count, - V_icmp6errppslim)) { - /* The packet is subject to rate limit */ - ret++; + switch (type) { + case ICMP6_PARAM_PROB: + which = RATELIM_PARAM_PROB; + break; + case ICMP6_PACKET_TOO_BIG: + which = RATELIM_TOO_BIG; + break; + case ICMP6_DST_UNREACH: + which = RATELIM_UNREACH; + break; + case ICMP6_TIME_EXCEEDED: + which = RATELIM_TEXCEED; + break; + case ND_REDIRECT: + which = RATELIM_REDIR; + break; + case ICMP6_ECHO_REPLY: + which = RATELIM_REPLY; + break; + default: + which = RATELIM_OTHER; + break; + }; + + pps = counter_ratecheck(&V_icmp6_rates[which], V_icmp6errppslim + + V_icmp6lim_curr_jitter); + if (pps > 0) { + if (V_icmp6lim_output) + log(LOG_NOTICE, "Limiting ICMPv6 %s output from %jd " + "to %d packets/sec\n", icmp6_rate_descrs[which], + (intmax_t )pps, V_icmp6errppslim + + V_icmp6lim_curr_jitter); + icmp6lim_new_jitter(); + } + if (pps == -1) { ICMP6STAT_INC(icp6s_toofreq); + return (-1); } - return ret; + return (0); } From nobody Wed Jun 26 04:50:28 2024 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 4W88QY1KWCz5P0D0; Wed, 26 Jun 2024 04:50:29 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4W88QX6DrQz57Tt; Wed, 26 Jun 2024 04:50:28 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1719377428; 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=ogSXz0J+9vDSvBoBnGUYSCZtBUFmAL5U/W+cOTMZQuw=; b=LmWONripUYSQJ4GQor+qj697u1YxcsK6v0drvrQJBySW4ED1DoNK+Jzw3S4vnAH9GaXu/6 4Hl/+4n0izJB3eozdu0bI8NZJSR+tESkfFjDV7J/OScpfZJt4R7GANJs4862N1JTRpRj3r uv0aTQgw93TW8MOUzn/GHDocMR2r/+i5E7wjz6yy1pwgKzeOByA95Lx7CJJrObQKnkdnuh c+n3hl0b4d8rSHhBmH2SFTdTS6WN7ZFmi8qybUo8WAYPI34GaEZuglkz10ZXO6nzmLAk8s sRO2JTDeHDz+Ny+c+7osnGBsUuioL909EOMc6cDlEEzZJ1nUAjkDjQRePHTxEg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1719377428; a=rsa-sha256; cv=none; b=L340gyEgqfvgJ4DErSy7qTIm5hawir96CQ9rYqYS2CQwxsJ+LlB3CScsVNEoS9W5bXV8Hn +/FGw98lkVGhYYOduWnNkJI8oLt1HlwBwbL7zC0foRV0OEzInHvK2lxffaeTWQ3f6Z1U04 pBfACTyB9Qa/7iwGlXwu/PlcLLCp4UXHGNa1Y6d+nyQIoS3+QRLSVdVSoUbdQ33aW/reD2 VrjqD6OAP4uKLhHV8CB1j5jRSavb9/qTWOFSEKmGmcrsue/T6aHrq5i3CMD/5Iq7MVOKHp eYtM7/P9suMZmS94N47srFOLfV2Ypgb9ktHNZXPS82xAkfhcCAthuv/PEz0bww== 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=1719377428; 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=ogSXz0J+9vDSvBoBnGUYSCZtBUFmAL5U/W+cOTMZQuw=; b=V80hvl+4AawADZew06kRPjcKZQTQ3DHYZZddlIWNxu7oOOV+vPyCPiWxc5lRUqzFvQLChs fN+Pvcr2hFLaQi6uXz3MmQHz9RbTlUd2rtPqNp4iVEqYGS7QWQWb266QDvnvVHjksPnWNr Cv5yN2oLsM9lg8hZ4kJKKczfFangxtAgCujZonNkzPl+TabDSs6YkfX9auAwzcmUE3PUk+ 3+ZTghihqlHmvJaFG4LpE9advHGGarqchI4gGCh8rPxfz4+MdV+POyyfNflpcytkm26s5k XoSaxh1Av1aY20Uu8pjAlLdI/HQaUSgBQJ3xCtqAZgX6Pgp8/tg/1b/r/orHtg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4W88QX5qsjzXBx; Wed, 26 Jun 2024 04:50:28 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 45Q4oSl6063989; Wed, 26 Jun 2024 04:50:28 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 45Q4oSU9063986; Wed, 26 Jun 2024 04:50:28 GMT (envelope-from git) Date: Wed, 26 Jun 2024 04:50:28 GMT Message-Id: <202406260450.45Q4oSU9063986@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Zhenlei Huang Subject: git: d366b4931519 - stable/14 - icmp: allow zero value for ICMP limits 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 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: zlei X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: d366b4931519acf90a8e76d95356b0e4140aaf40 Auto-Submitted: auto-generated The branch stable/14 has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=d366b4931519acf90a8e76d95356b0e4140aaf40 commit d366b4931519acf90a8e76d95356b0e4140aaf40 Author: Gleb Smirnoff AuthorDate: 2024-03-25 02:52:03 +0000 Commit: Zhenlei Huang CommitDate: 2024-06-26 04:48:44 +0000 icmp: allow zero value for ICMP limits Zero means limit is disabled, so the value doesn't need to be checked against jitter value. Fixes: ac44739fd834f51cacb26485a4140fd482e20150 Fixes: a03aff88a14448c3084a0384082ec996d7213897 (cherry picked from commit 4399e055ea610cdefa1470ad1ee614dd81ba5e56) --- sys/netinet/ip_icmp.c | 2 +- sys/netinet6/icmp6.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/netinet/ip_icmp.c b/sys/netinet/ip_icmp.c index dcf387aa3c1c..67fb56dcdfa2 100644 --- a/sys/netinet/ip_icmp.c +++ b/sys/netinet/ip_icmp.c @@ -1137,7 +1137,7 @@ sysctl_icmplim_and_jitter(SYSCTL_HANDLER_ARGS) error = sysctl_handle_int(oidp, &new, 0, req); if (error == 0 && req->newptr) { if (lim) { - if (new <= V_icmplim_jitter) + if (new != 0 && new <= V_icmplim_jitter) error = EINVAL; else V_icmplim = new; diff --git a/sys/netinet6/icmp6.c b/sys/netinet6/icmp6.c index 4bce366c7ed4..c03c90e566c3 100644 --- a/sys/netinet6/icmp6.c +++ b/sys/netinet6/icmp6.c @@ -2806,7 +2806,7 @@ sysctl_icmp6lim_and_jitter(SYSCTL_HANDLER_ARGS) error = sysctl_handle_int(oidp, &new, 0, req); if (error == 0 && req->newptr) { if (lim) { - if (new <= V_icmp6lim_jitter) + if (new != 0 && new <= V_icmp6lim_jitter) error = EINVAL; else V_icmp6errppslim = new; From nobody Wed Jun 26 04:50:29 2024 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 4W88QZ15xYz5P0K1; Wed, 26 Jun 2024 04:50: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4W88QZ06BGz57V8; Wed, 26 Jun 2024 04:50:30 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1719377430; 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=MO44US+EMsvdl8st53fHw5Sb8tiHjFWRGIZpY4rjlPw=; b=OWyg0XdAuW6u2db4TdGYpKsC7XLI7oyKbUByDbC689Nk9FcrPDCWJMROxPfrKvcNTgl9LN xmXtyxmUttOBKHVibcDM7y5GEEWTaZOi1X5xsaCgmkxjDiT6350BgbjT1birUI7smSv/ur alkdKH5bduGlwOcsy1Nu7YSPSAamemduywQDjUGctAqpVmljphM714QvaW/ZMIBcYCRzX5 AbBeUZs1+CPvM0zwczPW8MRYQov/YvMVUdYVitu/UulZPkzv0C2SyErwIAlsVVD4XCOFGL hSBUdU4wtzvWeBC4yAdIE1kN2Nw9TqfKvz0QNvAPYtT+HKARMC8QPK2kov08fA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1719377430; a=rsa-sha256; cv=none; b=IBXwjbVNFwEWkO7FLSoRU9+FnwsASIyCSueukVhMjMGI6peIQBilJt+jV+6EGToKnNvDW9 M1eUIWXswU/4nQUNC11XeTkFv0d/RlU6hxPVOnxn1wi9mdNLhjFMF4Bj8JKVrm8P7qsHOH FoWzYWHS1dfe620CWWQvZxNIP2f6xsUds7bfpZ0RGVxlEAhCSCu4Y8gGDLWsxXZ5oyWqZW dqnnMFbozRSz3oPBQWzrQ5SsbEJ8XyNtpkgYbxSrA6dHMKTAfm8VbvpgOvPq6+k+bRe3XF X2KzEqfkN0uFdCuOdnCrS7WQ87f+0cgBdVINJdiIRyTW2Wtw1GOsBcqZ5QvoNA== 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=1719377430; 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=MO44US+EMsvdl8st53fHw5Sb8tiHjFWRGIZpY4rjlPw=; b=ZGM2WmFJ6j0GRRzB+w/3079QifPOKr5cNeZ3hrriKrJYzf4XO6sH7wI3eQ+aG6yuH8sEdB L1fiOXz0jKQ411PnR0nWLIBSBUSv7mG27fCpPvvVQ3qBUG3hgRWuwHTf03jBshVzL8P4B7 wbkpLiTAL0VuQ4i9RJndVDVAOh8EqtmFa8BqRvpwaH8a1oeXPTRNbMsE4zMQSjeVINKp1I qJB7n2GORgzTKrTJgzyA+DZ9GbIq8Y4Zbgn5s4P+zGeQcFEE6eoWhztk6R8z510uJxEcz6 m98PAYQRSpIke8CSNgdhdCirGhsjrVFjC6m3HWsiZAU2vvJcnb206SFIdq4SLQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4W88QY6pfyzWjb; Wed, 26 Jun 2024 04:50:29 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 45Q4oTFg064046; Wed, 26 Jun 2024 04:50:29 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 45Q4oT9X064043; Wed, 26 Jun 2024 04:50:29 GMT (envelope-from git) Date: Wed, 26 Jun 2024 04:50:29 GMT Message-Id: <202406260450.45Q4oT9X064043@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Zhenlei Huang Subject: git: 5a676edf9b61 - stable/14 - netpfil tests: disable ICMPv6 rate limiting in the test jail 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 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: zlei X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 5a676edf9b61db8e1677e882c445b5fc1cb46b90 Auto-Submitted: auto-generated The branch stable/14 has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=5a676edf9b61db8e1677e882c445b5fc1cb46b90 commit 5a676edf9b61db8e1677e882c445b5fc1cb46b90 Author: Gleb Smirnoff AuthorDate: 2024-03-25 02:54:34 +0000 Commit: Zhenlei Huang CommitDate: 2024-06-26 04:48:44 +0000 netpfil tests: disable ICMPv6 rate limiting in the test jail The dummynet test uses flood ping as source of traffic, so the rate limiting of ICMP replies broke the test. Fixes: 32aeee8ce7e72738fff236ccd5629d55035458f8 (cherry picked from commit 75d15e893b14188b83c5fb5e4979fa21c557934f) --- tests/sys/netpfil/common/dummynet.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/tests/sys/netpfil/common/dummynet.sh b/tests/sys/netpfil/common/dummynet.sh index 14d863d001c8..7537231c13bd 100644 --- a/tests/sys/netpfil/common/dummynet.sh +++ b/tests/sys/netpfil/common/dummynet.sh @@ -387,6 +387,7 @@ queue_v6_body() jexec alcatraz ifconfig ${epair}b inet6 2001:db8:42::2 no_dad up jexec alcatraz /usr/sbin/inetd -p inetd-alcatraz.pid \ $(atf_get_srcdir)/../pf/echo_inetd.conf + jexec alcatraz sysctl net.inet6.icmp6.errppslimit=0 # Sanity check atf_check -s exit:0 -o ignore ping6 -i .1 -c 3 -s 1200 2001:db8:42::2 From nobody Wed Jun 26 04:50:31 2024 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 4W88Qb5VMPz5P0K2; Wed, 26 Jun 2024 04:50:31 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4W88Qb1QJnz57RT; Wed, 26 Jun 2024 04:50:31 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1719377431; 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=V8Rl+bd0xm9GS90iKeLes7BB2pNJEYLpbwyquW8Ahx8=; b=kjywmZez9Ee+rERQbZVVoe1ywigU6IMI1UoWR/ktMhMiTQrlMe55IjoOXkkk/l6uI8N0JP adIQWzRylVs4AdvzGhiAmrttTrtlLqc4LsCDLMTth1CluDADAQM9VJpiLcKLhWqyO2fQZ+ jbQ4hiDs+oSdBOtQsFkjlUD+0BrJeVjj0qyMPlPdl16EDPM76g9TPk19kRY+Uatv4o5vi3 +7VXZkRepyBdGc7ecHPxUkTuCw0NDd0x/FUHjMf2BoztenqdmzRkgxhqJsOCJoqyrsox1u Lb2E8TJ+QSmr9QvGkVQsYg51OMClG6dIq1LlVyeFu3eNu9vyAUuTcI0WJAoTyQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1719377431; a=rsa-sha256; cv=none; b=wNZsSlA/O7TEN/vUWfz/Vc8GOmWr69dhY5blRlIVkil0moScLMZJLEdlM1V9IuduKdB0Th 2fswHXxg5AdND3W6R/MVtiIaAlOKEYTPJzxsHItDAHCCPdyQob5BzXNOsDUiCa7qCyhe5P tC6fzft45XpE+L3oZ9yhb24NSgSiZFq4/IT+iDLJnVoLrnQuqX/LysgOD5ZcYdyWipb6AS L44bm8BY0MghA8hZKdsPL/iZJtTjrDRxikL0AWyOZ9J3X2zhczC4hWvG7oEWMo/i1HdatW ZhRlNV2YkgC2ZfuN+cSlec+3/hAuveQDAmJ437K0uuPpldLtYPzcrqoBrBYN5w== 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=1719377431; 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=V8Rl+bd0xm9GS90iKeLes7BB2pNJEYLpbwyquW8Ahx8=; b=QpDwoVHUe/fHj0o1qnKeQhMztOVTEpABodw9uwxR/eSfGysv/v1LnbF1kGomVn4nhOugzd l4U552MbQB2Zmv6nctjEXEmYbbvxdNYfTZyGHV4vxbB0F+1i28vkqwN6N0sHOICB0l+02J 9XUDUNfIPLDo9f+ZFnlNfeKoLZBKy/0rE3QMfLB1COXGT5eaZLe2qNVCgjr7eRvyFM8gLp jdFcT4HmdJPwrMx472L2lF7RRTMA73tuRktEl99NtwM2wtIH7Zv5F9N6G1YGGmuNaJT1Qh DGx2tTHZCnARO9KR3l0au4lBw6MxDJkdsrwcW5H0G8B431Gj28jkelEkdamZdw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4W88Qb0vGQzX6C; Wed, 26 Jun 2024 04:50:31 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 45Q4oVef064106; Wed, 26 Jun 2024 04:50:31 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 45Q4oVvE064103; Wed, 26 Jun 2024 04:50:31 GMT (envelope-from git) Date: Wed, 26 Jun 2024 04:50:31 GMT Message-Id: <202406260450.45Q4oVvE064103@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Zhenlei Huang Subject: git: 2472e352d80f - stable/14 - icmp: correct the assertion that checks limit + jitter 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 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: zlei X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 2472e352d80fcf6440fd42fbb16960cc49d05b03 Auto-Submitted: auto-generated The branch stable/14 has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=2472e352d80fcf6440fd42fbb16960cc49d05b03 commit 2472e352d80fcf6440fd42fbb16960cc49d05b03 Author: Gleb Smirnoff AuthorDate: 2024-04-08 23:54:19 +0000 Commit: Zhenlei Huang CommitDate: 2024-06-26 04:48:45 +0000 icmp: correct the assertion that checks limit + jitter Fixes: 4399e055ea610cdefa1470ad1ee614dd81ba5e56 (cherry picked from commit f7c4d12bcd5bd7f7fbf6bf9fa601c47e7f97bc5f) --- sys/netinet/ip_icmp.c | 2 +- sys/netinet6/icmp6.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/netinet/ip_icmp.c b/sys/netinet/ip_icmp.c index 67fb56dcdfa2..5ad1b2a664db 100644 --- a/sys/netinet/ip_icmp.c +++ b/sys/netinet/ip_icmp.c @@ -1150,7 +1150,7 @@ sysctl_icmplim_and_jitter(SYSCTL_HANDLER_ARGS) } } } - MPASS(V_icmplim + V_icmplim_curr_jitter > 0); + MPASS(V_icmplim + V_icmplim_curr_jitter >= 0); return (error); } diff --git a/sys/netinet6/icmp6.c b/sys/netinet6/icmp6.c index c03c90e566c3..d6e47a29eede 100644 --- a/sys/netinet6/icmp6.c +++ b/sys/netinet6/icmp6.c @@ -2819,7 +2819,7 @@ sysctl_icmp6lim_and_jitter(SYSCTL_HANDLER_ARGS) } } } - MPASS(V_icmp6errppslim + V_icmp6lim_curr_jitter > 0); + MPASS(V_icmp6errppslim + V_icmp6lim_curr_jitter >= 0); return (error); } From nobody Thu Jun 27 08:48:34 2024 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 4W8sfp3xZNz5PFCB; Thu, 27 Jun 2024 08:48: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4W8sfp3Nt8z4SfV; Thu, 27 Jun 2024 08:48:34 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1719478114; 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=pRqlPYRuU9Ou96mo0UzOk1XFhegg7cYf5Zo54Yc9Dzg=; b=SZxzA7FzdzrL644sbiMEZa0EmEVsfYA0YJ3Fjt8qbt43RIekHN65UNGB79xL1fAxQDTfQV J3XblTG/H9EiDZJvtqNzM6SLFW/je4vFBxs5EZu8ZjW2afUBNL7WjHzrC9T1IDtd/hjNUN Ng9NKJ91tleRNNrq837CThvBssQmNlrlvQnaFdlGTnhQqXQXsSv8FA4GSx1iBNg1cIsE3N mNnIFamIDMLtTHk3UbCYJ3VrL2YeFm2zOWh5oZpqwhoQvZAoRZbp+AYrwg8a8UsPdeljJK WTFbs/zWvaaUB9uH7FTiKgcmcqdDYcoOlYdvRgSUlmYuLwjVva9Oj3AXK2rxVg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1719478114; a=rsa-sha256; cv=none; b=Ro1QndtbMuBAx+mI/LW3rs8w4FEsvWxT7fSfaL63kcqbWLZJ9zBRNuW8FuP04etZCHO+ob CKPJ266MMLje4PeKE2mOfl4q8fsk51QouTleIGOCoobGyAu5RusRlAchhve+8LoVViS4/c Wu8JQ/koPrukuyh1vEvrdjNXfCWDgXWINNNE3NWKv8xOsvDzT2iCHRTIfmtcg16Fja8dCh 0XXoJ45xzpIkZuLU8s+2wBhBzmpCCywLLkwET+yAWBC/UBo2WJs5VqCp2+PmJAbaFmLGom WSE2QcmjyC317L2DhGIv2FqXxJ3TGczuA6/nW40ulOzac61+NXEzWzzBEUMNQg== 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=1719478114; 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=pRqlPYRuU9Ou96mo0UzOk1XFhegg7cYf5Zo54Yc9Dzg=; b=XD//H1UhYcldhYp07PMulflgPWax3ZrZNVugQGHecbC5IcDx8SwfQkno74LJNVdd5ClqDT defUvTu6LGsiGf0V3JmYeQURTjO8kiGTrI2FbhmnPBoFk/QeexByN3+AcxlsRps4ReF//w De+ipKr/19JUS6XFBz9u/h5g/oRYEkDZ3JrXuk2mlC3wM9cbBKAWjsXTQHtb6La6DBgtoM yh0ItElRBcE9ob6Ez88weW+uBzJDHlj/Yzrsg/h2kkHaNK+JZyGKJ7mdUIkpawkyt34x0i WvnF2LnKG5NvORfVBIV5S3TBRQDtz55vtsOxSOxV+8v9YTtQSCoQe0RohUsoJw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4W8sfp2jH4z1L5G; Thu, 27 Jun 2024 08:48:34 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 45R8mY6t093085; Thu, 27 Jun 2024 08:48:34 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 45R8mYcm093082; Thu, 27 Jun 2024 08:48:34 GMT (envelope-from git) Date: Thu, 27 Jun 2024 08:48:34 GMT Message-Id: <202406270848.45R8mYcm093082@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Baptiste Daroussin Subject: git: c333758fca3e - stable/14 - mac_do: add a new MAC/do policy and mdo(1) utility 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 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/14 X-Git-Reftype: branch X-Git-Commit: c333758fca3e7dfe07b2908ba25702eb5e60d00f Auto-Submitted: auto-generated The branch stable/14 has been updated by bapt: URL: https://cgit.FreeBSD.org/src/commit/?id=c333758fca3e7dfe07b2908ba25702eb5e60d00f commit c333758fca3e7dfe07b2908ba25702eb5e60d00f Author: Baptiste Daroussin AuthorDate: 2024-05-09 22:03:28 +0000 Commit: Baptiste Daroussin CommitDate: 2024-06-27 08:44:29 +0000 mac_do: add a new MAC/do policy and mdo(1) utility This policy enables a user to become another user without having to be root (hence no setuid binary). it is configured via rules using sysctl security.mac.do.rules For example: security.mac.do.rules=uid=1001:80,gid=0:any The above rule means the user identifier by the uid 1001 is able to become user 80 Any user of the group 0 are allowed to become any user on the system. The mdo(1) utility expects the MAC/do policy to be installed and its rules defined. Reviewed by: des Differential Revision: https://reviews.freebsd.org/D45145 (cherry picked from commit 8aac90f18aef7c9eea906c3ff9a001ca7b94f375) --- share/man/man4/Makefile | 1 + share/man/man4/mac_do.4 | 78 +++++++ sys/modules/Makefile | 2 + sys/modules/mac_do/Makefile | 6 + sys/security/mac_do/mac_do.c | 545 +++++++++++++++++++++++++++++++++++++++++++ usr.bin/Makefile | 1 + usr.bin/mdo/Makefile | 4 + usr.bin/mdo/mdo.1 | 44 ++++ usr.bin/mdo/mdo.c | 76 ++++++ 9 files changed, 757 insertions(+) diff --git a/share/man/man4/Makefile b/share/man/man4/Makefile index 10ae7f3cef19..aa55108d8b4e 100644 --- a/share/man/man4/Makefile +++ b/share/man/man4/Makefile @@ -289,6 +289,7 @@ MAN= aac.4 \ mac_biba.4 \ mac_bsdextended.4 \ mac_ddb.4 \ + mac_do.4 \ mac_ifoff.4 \ mac_ipacl.4 \ mac_lomac.4 \ diff --git a/share/man/man4/mac_do.4 b/share/man/man4/mac_do.4 new file mode 100644 index 000000000000..9a9ebe1ca989 --- /dev/null +++ b/share/man/man4/mac_do.4 @@ -0,0 +1,78 @@ +.\"- +.\" Copyright (c) 2024 Baptiste Daroussin +.\" +.\" SPDX-License-Identifier: BSD-2-Clause +.\" +.Dd May 22, 2024 +.Dt MAC_DO 4 +.Os +.Sh NAME +.Nm mac_do +.Nd "policy allowing user to execute program as another user" +.Sh SYNOPSIS +To compile the +.Nm +policy into your kernel, place the following lines +in your kernel configruation file: +.Bd -ragged -offset indent +.Cd "options MAC" +.Cd "options MAC_DO" +.Ed +.Sh DESCRIPTION +The +.Nm +policy grants users the ability to run processs as other users +according to predefined rules. +.Pp +The exact set of kernel privileges granted are: +.Bl -inset -compact -offset indent +.It Dv PRIV_CRED_SETGROUPS +.It Dv PRIV_CRET_SETUID +.El +.Pp +The following +.Xr sysctl 8 +MIBs are available: +.Bl -tag -width indent +.It Va security.mac.do.enabled +Enable the +.Nm +policy. +(Default: 1). +.It Va security.mac.do.rules +The set of rules. +.El +.Pp +The rules consist of a list of elements separated by +.So , Sc . +Each element is of the form +.Sm off +.Do +.Op Cm uid | Cm gid +.Li = +.Ar fid +.Li : +.Ar tid +.Dc +.Sm on . +Where +.Ar fid +is the uid or gid of the user or group the rule applies to, and +.Ar tid +is the uid of the targetted user. +Two special forms are accepted for +.Ar tid : +.Va any +or +.Va * , +which allow to target any user. +.Sh EXAMPLES +The following rule: +.Pp +.Dl security.mac.do.rules=uid=1001:80,gid=0:any +.Pp +means the user with the uid 1001 can execute processes as user with uid 80, +all the users which belongs to the group gid 0 can execute processes as any user. +.Sh SEE ALSO +.Xr mac 4 , +.Xr mdo 1 diff --git a/sys/modules/Makefile b/sys/modules/Makefile index 9a92b6f3de7d..56a28b4b71ec 100644 --- a/sys/modules/Makefile +++ b/sys/modules/Makefile @@ -223,6 +223,7 @@ SUBDIR= \ ${_mac_biba} \ ${_mac_bsdextended} \ ${_mac_ddb} \ + ${_mac_do} \ ${_mac_ifoff} \ ${_mac_ipacl} \ ${_mac_lomac} \ @@ -586,6 +587,7 @@ _mac_bsdextended= mac_bsdextended .if ${KERN_OPTS:MDDB} || defined(ALL_MODULES) _mac_ddb= mac_ddb .endif +_mac_do= mac_do _mac_ifoff= mac_ifoff _mac_ipacl= mac_ipacl _mac_lomac= mac_lomac diff --git a/sys/modules/mac_do/Makefile b/sys/modules/mac_do/Makefile new file mode 100644 index 000000000000..532a5b9faa71 --- /dev/null +++ b/sys/modules/mac_do/Makefile @@ -0,0 +1,6 @@ +.PATH: ${SRCTOP}/sys/security/mac_do + +KMOD= mac_do +SRCS= mac_do.c vnode_if.h + +.include diff --git a/sys/security/mac_do/mac_do.c b/sys/security/mac_do/mac_do.c new file mode 100644 index 000000000000..8685954b7db6 --- /dev/null +++ b/sys/security/mac_do/mac_do.c @@ -0,0 +1,545 @@ +/*- + * Copyright(c) 2024 Baptiste Daroussin + * + * SPDX-License-Identifier: BSD-2-Clause + */ + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#include + +SYSCTL_DECL(_security_mac); + +static SYSCTL_NODE(_security_mac, OID_AUTO, do, + CTLFLAG_RW|CTLFLAG_MPSAFE, 0, "mac_do policy controls"); + +static int do_enabled = 1; +SYSCTL_INT(_security_mac_do, OID_AUTO, enabled, CTLFLAG_RWTUN, + &do_enabled, 0, "Enforce do policy"); + +static MALLOC_DEFINE(M_DO, "do_rule", "Rules for mac_do"); + +#define MAC_RULE_STRING_LEN 1024 + +static unsigned mac_do_osd_jail_slot; + +#define RULE_UID 1 +#define RULE_GID 2 +#define RULE_ANY 3 + +struct rule { + int from_type; + union { + uid_t f_uid; + gid_t f_gid; + }; + int to_type; + uid_t t_uid; + TAILQ_ENTRY(rule) r_entries; +}; + +struct mac_do_rule { + char string[MAC_RULE_STRING_LEN]; + TAILQ_HEAD(rulehead, rule) head; +}; + +static struct mac_do_rule rules0; + +static void +toast_rules(struct rulehead *head) +{ + struct rule *r; + + while ((r = TAILQ_FIRST(head)) != NULL) { + TAILQ_REMOVE(head, r, r_entries); + free(r, M_DO); + } +} + +static int +parse_rule_element(char *element, struct rule **rule) +{ + int error = 0; + char *type, *id, *p; + struct rule *new; + + new = malloc(sizeof(*new), M_DO, M_ZERO|M_WAITOK); + + type = strsep(&element, "="); + if (type == NULL) { + error = EINVAL; + goto out; + } + if (strcmp(type, "uid") == 0) { + new->from_type = RULE_UID; + } else if (strcmp(type, "gid") == 0) { + new->from_type = RULE_GID; + } else { + error = EINVAL; + goto out; + } + id = strsep(&element, ":"); + if (id == NULL) { + error = EINVAL; + goto out; + } + if (new->from_type == RULE_UID) + new->f_uid = strtol(id, &p, 10); + if (new->from_type == RULE_GID) + new->f_gid = strtol(id, &p, 10); + if (*p != '\0') { + error = EINVAL; + goto out; + } + if (*element == '\0') { + error = EINVAL; + goto out; + } + if (strcmp(element, "any") == 0 || strcmp(element, "*") == 0) { + new->to_type = RULE_ANY; + } else { + new->to_type = RULE_UID; + new->t_uid = strtol(element, &p, 10); + if (*p != '\0') { + error = EINVAL; + goto out; + } + } +out: + if (error != 0) { + free(new, M_DO); + *rule = NULL; + } else + *rule = new; + return (error); +} + +static int +parse_rules(char *string, struct rulehead *head) +{ + struct rule *new; + char *element; + int error = 0; + + while ((element = strsep(&string, ",")) != NULL) { + if (strlen(element) == 0) + continue; + error = parse_rule_element(element, &new); + if (error) + goto out; + TAILQ_INSERT_TAIL(head, new, r_entries); + } +out: + if (error != 0) + toast_rules(head); + return (error); +} + +static struct mac_do_rule * +mac_do_rule_find(struct prison *spr, struct prison **prp) +{ + struct prison *pr; + struct mac_do_rule *rules; + + for (pr = spr;; pr = pr->pr_parent) { + mtx_lock(&pr->pr_mtx); + if (pr == &prison0) { + rules = &rules0; + break; + } + rules = osd_jail_get(pr, mac_do_osd_jail_slot); + if (rules != NULL) + break; + mtx_unlock(&pr->pr_mtx); + } + *prp = pr; + + return (rules); +} + +static int +sysctl_rules(SYSCTL_HANDLER_ARGS) +{ + char *copy_string, *new_string; + struct rulehead head, saved_head; + struct prison *pr; + struct mac_do_rule *rules; + int error; + + rules = mac_do_rule_find(req->td->td_ucred->cr_prison, &pr); + mtx_unlock(&pr->pr_mtx); + if (req->newptr == NULL) + return (sysctl_handle_string(oidp, rules->string, MAC_RULE_STRING_LEN, req)); + + new_string = malloc(MAC_RULE_STRING_LEN, M_DO, + M_WAITOK|M_ZERO); + mtx_lock(&pr->pr_mtx); + strlcpy(new_string, rules->string, MAC_RULE_STRING_LEN); + mtx_unlock(&pr->pr_mtx); + + error = sysctl_handle_string(oidp, new_string, MAC_RULE_STRING_LEN, req); + if (error) + goto out; + + copy_string = strdup(new_string, M_DO); + TAILQ_INIT(&head); + error = parse_rules(copy_string, &head); + free(copy_string, M_DO); + if (error) + goto out; + TAILQ_INIT(&saved_head); + mtx_lock(&pr->pr_mtx); + TAILQ_CONCAT(&saved_head, &rules->head, r_entries); + TAILQ_CONCAT(&rules->head, &head, r_entries); + strlcpy(rules->string, new_string, MAC_RULE_STRING_LEN); + mtx_unlock(&pr->pr_mtx); + toast_rules(&saved_head); + +out: + free(new_string, M_DO); + return (error); +} + +SYSCTL_PROC(_security_mac_do, OID_AUTO, rules, + CTLTYPE_STRING|CTLFLAG_RW|CTLFLAG_MPSAFE, + 0, 0, sysctl_rules, "A", + "Rules"); + +static void +destroy(struct mac_policy_conf *mpc) +{ + osd_jail_deregister(mac_do_osd_jail_slot); + toast_rules(&rules0.head); +} + +static void +mac_do_alloc_prison(struct prison *pr, struct mac_do_rule **lrp) +{ + struct prison *ppr; + struct mac_do_rule *rules, *new_rules; + void **rsv; + + rules = mac_do_rule_find(pr, &ppr); + if (ppr == pr) + goto done; + + mtx_unlock(&ppr->pr_mtx); + new_rules = malloc(sizeof(*new_rules), M_PRISON, M_WAITOK|M_ZERO); + rsv = osd_reserve(mac_do_osd_jail_slot); + rules = mac_do_rule_find(pr, &ppr); + if (ppr == pr) { + free(new_rules, M_PRISON); + osd_free_reserved(rsv); + goto done; + } + mtx_lock(&pr->pr_mtx); + osd_jail_set_reserved(pr, mac_do_osd_jail_slot, rsv, new_rules); + TAILQ_INIT(&new_rules->head); +done: + if (lrp != NULL) + *lrp = rules; + mtx_unlock(&pr->pr_mtx); + mtx_unlock(&ppr->pr_mtx); +} + +static void +mac_do_dealloc_prison(void *data) +{ + struct mac_do_rule *r = data; + + toast_rules(&r->head); +} + +static int +mac_do_prison_set(void *obj, void *data) +{ + struct prison *pr = obj; + struct vfsoptlist *opts = data; + struct rulehead head, saved_head; + struct mac_do_rule *rules; + char *rules_string, *copy_string; + int error, jsys, len; + + error = vfs_copyopt(opts, "mdo", &jsys, sizeof(jsys)); + if (error == ENOENT) + jsys = -1; + error = vfs_getopt(opts, "mdo.rules", (void **)&rules_string, &len); + if (error == ENOENT) + rules = NULL; + else + jsys = JAIL_SYS_NEW; + switch (jsys) { + case JAIL_SYS_INHERIT: + mtx_lock(&pr->pr_mtx); + osd_jail_del(pr, mac_do_osd_jail_slot); + mtx_unlock(&pr->pr_mtx); + break; + case JAIL_SYS_NEW: + mac_do_alloc_prison(pr, &rules); + if (rules_string == NULL) + break; + copy_string = strdup(rules_string, M_DO); + TAILQ_INIT(&head); + error = parse_rules(copy_string, &head); + free(copy_string, M_DO); + if (error) + return (1); + TAILQ_INIT(&saved_head); + mtx_lock(&pr->pr_mtx); + TAILQ_CONCAT(&saved_head, &rules->head, r_entries); + TAILQ_CONCAT(&rules->head, &head, r_entries); + strlcpy(rules->string, rules_string, MAC_RULE_STRING_LEN); + mtx_unlock(&pr->pr_mtx); + toast_rules(&saved_head); + break; + } + return (0); +} + +SYSCTL_JAIL_PARAM_SYS_NODE(mdo, CTLFLAG_RW, "Jail MAC/do parameters"); +SYSCTL_JAIL_PARAM_STRING(_mdo, rules, CTLFLAG_RW, MAC_RULE_STRING_LEN, + "Jail MAC/do rules"); + +static int +mac_do_prison_get(void *obj, void *data) +{ + struct prison *ppr, *pr = obj; + struct vfsoptlist *opts = data; + struct mac_do_rule *rules; + int jsys, error; + + rules = mac_do_rule_find(pr, &ppr); + error = vfs_setopt(opts, "mdo", &jsys, sizeof(jsys)); + if (error != 0 && error != ENOENT) + goto done; + error = vfs_setopts(opts, "mdo.rules", rules->string); + if (error != 0 && error != ENOENT) + goto done; + mtx_unlock(&ppr->pr_mtx); + error = 0; +done: + return (0); +} + +static int +mac_do_prison_create(void *obj, void *data __unused) +{ + struct prison *pr = obj; + + mac_do_alloc_prison(pr, NULL); + return (0); +} + +static int +mac_do_prison_remove(void *obj, void *data __unused) +{ + struct prison *pr = obj; + struct mac_do_rule *r; + + mtx_lock(&pr->pr_mtx); + r = osd_jail_get(pr, mac_do_osd_jail_slot); + mtx_unlock(&pr->pr_mtx); + toast_rules(&r->head); + return (0); +} + +static int +mac_do_prison_check(void *obj, void *data) +{ + struct vfsoptlist *opts = data; + char *rules_string; + int error, jsys, len; + + error = vfs_copyopt(opts, "mdo", &jsys, sizeof(jsys)); + if (error != ENOENT) { + if (error != 0) + return (error); + if (jsys != JAIL_SYS_NEW && jsys != JAIL_SYS_INHERIT) + return (EINVAL); + } + error = vfs_getopt(opts, "mdo.rules", (void **)&rules_string, &len); + if (error != ENOENT) { + if (error != 0) + return (error); + if (len > MAC_RULE_STRING_LEN) { + vfs_opterror(opts, "mdo.rules too long"); + return (ENAMETOOLONG); + } + } + if (error == ENOENT) + error = 0; + return (error); +} + +static void +init(struct mac_policy_conf *mpc) +{ + static osd_method_t methods[PR_MAXMETHOD] = { + [PR_METHOD_CREATE] = mac_do_prison_create, + [PR_METHOD_GET] = mac_do_prison_get, + [PR_METHOD_SET] = mac_do_prison_set, + [PR_METHOD_CHECK] = mac_do_prison_check, + [PR_METHOD_REMOVE] = mac_do_prison_remove, + }; + struct prison *pr; + + mac_do_osd_jail_slot = osd_jail_register(mac_do_dealloc_prison, methods); + TAILQ_INIT(&rules0.head); + sx_slock(&allprison_lock); + TAILQ_FOREACH(pr, &allprison, pr_list) + mac_do_alloc_prison(pr, NULL); + sx_sunlock(&allprison_lock); +} + +static bool +rule_is_valid(struct ucred *cred, struct rule *r) +{ + if (r->from_type == RULE_UID && r->f_uid == cred->cr_uid) + return (true); + if (r->from_type == RULE_GID && r->f_gid == cred->cr_gid) + return (true); + return (false); +} + +static int +priv_grant(struct ucred *cred, int priv) +{ + struct rule *r; + struct prison *pr; + struct mac_do_rule *rule; + + if (do_enabled == 0) + return (EPERM); + + rule = mac_do_rule_find(cred->cr_prison, &pr); + TAILQ_FOREACH(r, &rule->head, r_entries) { + if (rule_is_valid(cred, r)) { + switch (priv) { + case PRIV_CRED_SETGROUPS: + case PRIV_CRED_SETUID: + mtx_unlock(&pr->pr_mtx); + return (0); + default: + break; + } + } + } + mtx_unlock(&pr->pr_mtx); + return (EPERM); +} + +static int +check_setgroups(struct ucred *cred, int ngrp, gid_t *groups) +{ + struct rule *r; + char *fullpath = NULL; + char *freebuf = NULL; + struct prison *pr; + struct mac_do_rule *rule; + + if (do_enabled == 0) + return (0); + if (cred->cr_uid == 0) + return (0); + + if (vn_fullpath(curproc->p_textvp, &fullpath, &freebuf) != 0) + return (EPERM); + if (strcmp(fullpath, "/usr/bin/mdo") != 0) { + free(freebuf, M_TEMP); + return (EPERM); + } + free(freebuf, M_TEMP); + + rule = mac_do_rule_find(cred->cr_prison, &pr); + TAILQ_FOREACH(r, &rule->head, r_entries) { + if (rule_is_valid(cred, r)) { + mtx_unlock(&pr->pr_mtx); + return (0); + } + } + mtx_unlock(&pr->pr_mtx); + + return (EPERM); +} + +static int +check_setuid(struct ucred *cred, uid_t uid) +{ + struct rule *r; + int error; + char *fullpath = NULL; + char *freebuf = NULL; + struct prison *pr; + struct mac_do_rule *rule; + + if (do_enabled == 0) + return (0); + if (cred->cr_uid == uid || cred->cr_uid == 0) + return (0); + + if (vn_fullpath(curproc->p_textvp, &fullpath, &freebuf) != 0) + return (EPERM); + if (strcmp(fullpath, "/usr/bin/mdo") != 0) { + free(freebuf, M_TEMP); + return (EPERM); + } + free(freebuf, M_TEMP); + + error = EPERM; + rule = mac_do_rule_find(cred->cr_prison, &pr); + TAILQ_FOREACH(r, &rule->head, r_entries) { + if (r->from_type == RULE_UID) { + if (cred->cr_uid != r->f_uid) + continue; + if (r->to_type == RULE_ANY) { + error = 0; + break; + } + if (r->to_type == RULE_UID && uid == r->t_uid) { + error = 0; + break; + } + } + if (r->from_type == RULE_GID) { + if (cred->cr_gid != r->f_gid) + continue; + if (r->to_type == RULE_ANY) { + error = 0; + break; + } + if (r->to_type == RULE_UID && uid == r->t_uid) { + error = 0; + break; + } + } + } + mtx_unlock(&pr->pr_mtx); + return (error); +} + +static struct mac_policy_ops do_ops = { + .mpo_destroy = destroy, + .mpo_init = init, + .mpo_cred_check_setuid = check_setuid, + .mpo_cred_check_setgroups = check_setgroups, + .mpo_priv_grant = priv_grant, +}; + +MAC_POLICY_SET(&do_ops, mac_do, "MAC/do", + MPC_LOADTIME_FLAG_UNLOADOK, NULL); +MODULE_VERSION(mac_do, 1); diff --git a/usr.bin/Makefile b/usr.bin/Makefile index aa62155703a7..61834d33cabc 100644 --- a/usr.bin/Makefile +++ b/usr.bin/Makefile @@ -88,6 +88,7 @@ SUBDIR= alias \ lzmainfo \ m4 \ mandoc \ + mdo \ mesg \ ministat \ mkdep \ diff --git a/usr.bin/mdo/Makefile b/usr.bin/mdo/Makefile new file mode 100644 index 000000000000..e20f2719fc82 --- /dev/null +++ b/usr.bin/mdo/Makefile @@ -0,0 +1,4 @@ +PROG= mdo +SRCS= mdo.c + +.include diff --git a/usr.bin/mdo/mdo.1 b/usr.bin/mdo/mdo.1 new file mode 100644 index 000000000000..115ce44f4531 --- /dev/null +++ b/usr.bin/mdo/mdo.1 @@ -0,0 +1,44 @@ +.\"- +.\" Copyright(c) 2024 Baptiste Daroussin +.\" +.\" SPDX-License-Identifier: BSD-2-Clause +.\" +.Dd May 22, 2024 +.Dt MDO 1 +.Os +.Sh NAME +.Nm mdo +.Nd execute commands as another user +.Sh SYNOPSIS +.Nm +.Op Fl u Ar username +.Op Fl i +.Op command Op args +.Sh DESCRIPTION +The +.Nm +utility executes the specified +.Ar command +as user +.Ar username . +.Pp +If no +.Ar username +is provided it defaults to the +.Va root +user. +If no +.Ar command +is specified, it will execute the shell specified as +.Va SHELL +environnement variable, falling back on +.Pa /bin/sh . +.Pp +The +.Fl i +option can be used to only call +.Fn setuid +and keep the group from the calling user. +.Sh SEE ALSO +.Xr su 1 +.Xr mac_do 4 diff --git a/usr.bin/mdo/mdo.c b/usr.bin/mdo/mdo.c new file mode 100644 index 000000000000..22e2838daa08 --- /dev/null +++ b/usr.bin/mdo/mdo.c @@ -0,0 +1,76 @@ +/*- + * Copyright(c) 2024 Baptiste Daroussin + * + * SPDX-License-Identifier: BSD-2-Clause + */ + +#include + +#include +#include +#include +#include +#include +#include +#include +#include + +static void +usage(void) +{ + fprintf(stderr, "usage: mdo [-u username] [-i] [--] [command [args]]\n"); + exit(EXIT_FAILURE); +} + +int +main(int argc, char **argv) +{ + struct passwd *pw; + const char *username = "root"; + bool uidonly = false; + int ch; + + while ((ch = getopt(argc, argv, "u:i")) != -1) { + switch (ch) { + case 'u': + username = optarg; + break; + case 'i': + uidonly = true; + break; + default: + usage(); + } + } + argc -= optind; + argv += optind; + + if ((pw = getpwnam(username)) == NULL) { + if (strspn(username, "0123456789") == strlen(username)) { + const char *errp = NULL; + uid_t uid = strtonum(username, 0, UID_MAX, &errp); + if (errp != NULL) + err(EXIT_FAILURE, "%s", errp); + pw = getpwuid(uid); + } + if (pw == NULL) + err(EXIT_FAILURE, "invalid username '%s'", username); + } + if (!uidonly) { + if (initgroups(pw->pw_name, pw->pw_gid) == -1) + err(EXIT_FAILURE, "failed to call initgroups"); + if (setgid(pw->pw_gid) == -1) + err(EXIT_FAILURE, "failed to call setgid"); + } + if (setuid(pw->pw_uid) == -1) + err(EXIT_FAILURE, "failed to call setuid"); + if (*argv == NULL) { + const char *sh = getenv("SHELL"); + if (sh == NULL) + sh = _PATH_BSHELL; + execlp(sh, sh, "-i", NULL); + } else { + execvp(argv[0], argv); + } + err(EXIT_FAILURE, "exec failed"); +} From nobody Thu Jun 27 08:48:35 2024 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 4W8sfq4nTVz5PFHP; Thu, 27 Jun 2024 08:48: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4W8sfq3DmNz4T4B; Thu, 27 Jun 2024 08:48:35 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1719478115; 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=YDnUCU61Xxd3JtJoCHrnngfWNv1nEFzaX8tNgCFWU9I=; b=iKFLvYW30EKzzDy4uiMbB+ClwnSk/4FyiilfhIFuUiq+PijdTR/LruxwpS238GWp5nZSZ8 YSva2LN9jy2v+cIuO3d1jq4pCq40XdEdVem8uwW8sM+5tj1lRxctB7KYysub/yfuXgbqz8 DtOvhOlzpdmRMfJv3/1i4HpG0FRwffajn4iTTOOTY4lUJR7y9g51EtpD8bVmX5i8kN8BMv ELkIMYowO7+gjhdzXv/7eqGejWekuqUs03GcWXm9glcMmJis+NE2VdSBbjVpMahY0Jf1ln XprrC91bXvl352uGwmjwgodCMKJfHmwa1M/+0TuFXmIY/IUUDRbPVynQIp70CQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1719478115; a=rsa-sha256; cv=none; b=tJBAbCwRss7xFIU/njfkM28yXpqMhNvugiCSWiaDWLC3CTdq4cfk8+Ud8h0Xl2ku3GKemz 4v//zRbHPOY9mx2cLY8OmcbkJeSF5TpvxG18fq/BdkQVDlSg+7D33j8XPMfjQ2CwX98NGG rPdQ4C/hhCM9wxadZDemRB5/IZwFD/72ZyskLq3b5pfsv7AdSM/2Ttv2arzXpgl0T4ZbJu H86ve26WQUgY2bY0OqDH/fja6pz/GD01Nlwm9pBZO2Dz+WXfpIQ69ZZpKEoUe0Bf2pmoHe zi5CGClYeevrrQfVU0I9L3IkrnzwRuF9Akg9PSZW6uc2qE0Dpdo87nMDGSQreA== 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=1719478115; 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=YDnUCU61Xxd3JtJoCHrnngfWNv1nEFzaX8tNgCFWU9I=; b=utN8uY2vNkZMJwVh93vveQYVjkNIgCsyfUqmDe4pNMMPzV0DOx+ZpDy9CggVXWYcTVH59o 2IO6rErhtgtWtguYk2NOuY6AzrF/zJ83aaYmnJjlzWpJE7WzCup9aCxAmkXOqQAx/p8OyS s/YrMp2nbnGNOhnc7DRpuGbpTKbE7FGuHe26j5ZmD8ABuyON2QXlvJEcamvfStnbjij4yn R8QjIBefrQug4XbQv6dHMRnPANDjy1rBln/UPhm18K0zuzjFcVIG9ntOwDsoWHPMtiXMis ZSLih9RyM34/vNjvRmwyi/VpBFIu4UIPrNdku4aNAlZ6XO+mfRUqAA+31xalqQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4W8sfq2pcBz1Ks2; Thu, 27 Jun 2024 08:48:35 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 45R8mZio093121; Thu, 27 Jun 2024 08:48:35 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 45R8mZ4o093118; Thu, 27 Jun 2024 08:48:35 GMT (envelope-from git) Date: Thu, 27 Jun 2024 08:48:35 GMT Message-Id: <202406270848.45R8mZ4o093118@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Baptiste Daroussin Subject: git: 7f66cc235b3d - stable/14 - mac_do(4): fix typo 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 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/14 X-Git-Reftype: branch X-Git-Commit: 7f66cc235b3d1da1b6231c98a6adc4dbadbca294 Auto-Submitted: auto-generated The branch stable/14 has been updated by bapt: URL: https://cgit.FreeBSD.org/src/commit/?id=7f66cc235b3d1da1b6231c98a6adc4dbadbca294 commit 7f66cc235b3d1da1b6231c98a6adc4dbadbca294 Author: Baptiste Daroussin AuthorDate: 2024-05-22 13:56:03 +0000 Commit: Baptiste Daroussin CommitDate: 2024-06-27 08:46:58 +0000 mac_do(4): fix typo Reported by: Gary Jennejohn (cherry picked from commit eaab8e4166a02212cb7d6aea4304834d9bcf5ff9) --- share/man/man4/mac_do.4 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/share/man/man4/mac_do.4 b/share/man/man4/mac_do.4 index 9a9ebe1ca989..ce9f8cf25a4a 100644 --- a/share/man/man4/mac_do.4 +++ b/share/man/man4/mac_do.4 @@ -27,7 +27,7 @@ according to predefined rules. The exact set of kernel privileges granted are: .Bl -inset -compact -offset indent .It Dv PRIV_CRED_SETGROUPS -.It Dv PRIV_CRET_SETUID +.It Dv PRIV_CRED_SETUID .El .Pp The following From nobody Thu Jun 27 08:48:36 2024 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 4W8sfs11Qpz5PFHR; Thu, 27 Jun 2024 08:48: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4W8sfr4dQDz4T0P; Thu, 27 Jun 2024 08:48:36 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1719478116; 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=NTc05Tb0XH43F926/oaYaOE2KZ7nu4TCqEq6Kx3THzQ=; b=aG8k5VoWnLShhNRX2Gy9m2zZkSRz1M1GCXq2VwgFZB+Jq8MzacfTtutNE3/ouZz3riYmMu ScmOIT+qSHEAvmaDIpTc/ELl52G8e1eFwzolMkySkMWE5wzbcn11ihbCGEfE6xlqOp5rqs RzO0vxzMbNVtCHaTiickjz4jtu8kncA3781FnZTH2W5WKcYCbIB5LeBLAKBCBnIFKsAINt e/iNG/Loviy9pKi4rSW6bXupiKUGo+jPhxBNGBFs1WTH/SnR2qsyGBebLYXhEXxjHrb2Al slD3rbMWS29sjoNEOoaMphdXAW7IO08nkC2CI+jInw8HT7NHPqQyECTczmiE4A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1719478116; a=rsa-sha256; cv=none; b=gpO86SWN8lggbBv/GoUzf6i7FVtWGhGeGQsS24tXEPZ+yfLGCShnRNHVPcWhBZedHOW7Hr +HOUKRfVEUPXSFgQyifWTD5Vg4xOJKuRBlYPnC219hNoFZwmwd8LFTqbAXW7p5Oajf7xSL V8tAwtNsOyz55A/+inYRbfveNhXb1QZYTRrKl2IM2f6aK2r9fhfpu1nH76Bl56BtQ5vNe/ gGQB76Pcfj8BOfFMY3iJiFDnqoq+KCy8wx/6A2oKcwrJmcpzZ3KqBrbOIchJ2SAU8y5cq4 c7Ahw4Vph0V2fx7WBO5mV668SomBImZkC4lDkAR1ESDE+6RtbuZ/8LKZBIwRxw== 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=1719478116; 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=NTc05Tb0XH43F926/oaYaOE2KZ7nu4TCqEq6Kx3THzQ=; b=AGkb5Hn6x0DbBns+E+XBeMcKPidTwOro9uRrylp0vtDmPBZnmrk/ybVWCDeZTIvoRlNt2T GAb3jjVJh50DH+DnVmaXVW2Tz8KiYIXvd/2QYsLIdEdMApf5WugzdL8XpgQywFsl0MUof+ jZ+Bb2nHyuuF91WIt3gpZ9okEGhRHzo53sb2XjjOSg06s0yKZsHpFbV8IwCMRaXqEnlMPn AU7/zIaoqoAhFR3kEPNB3RqasSW3iOI7Y2QbH92zDVGzaKZDZmeylX+lLn+oJvqeur/j48 OhvJTeDdzTwVN78wcBcuTZRyzNYVPkuZ0+t+fDOEquoES+H40vNnJp1Um0ponA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4W8sfr49ttz1Kp6; Thu, 27 Jun 2024 08:48:36 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 45R8maa3093185; Thu, 27 Jun 2024 08:48:36 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 45R8maqD093182; Thu, 27 Jun 2024 08:48:36 GMT (envelope-from git) Date: Thu, 27 Jun 2024 08:48:36 GMT Message-Id: <202406270848.45R8maqD093182@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Baptiste Daroussin Subject: git: 9722023c4875 - stable/14 - MAC/do: allow to call setuid if real user id is 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 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/14 X-Git-Reftype: branch X-Git-Commit: 9722023c4875a326ee9e4e9e0db71d463d990368 Auto-Submitted: auto-generated The branch stable/14 has been updated by bapt: URL: https://cgit.FreeBSD.org/src/commit/?id=9722023c4875a326ee9e4e9e0db71d463d990368 commit 9722023c4875a326ee9e4e9e0db71d463d990368 Author: Baptiste Daroussin AuthorDate: 2024-05-23 10:09:11 +0000 Commit: Baptiste Daroussin CommitDate: 2024-06-27 08:47:06 +0000 MAC/do: allow to call setuid if real user id is 0 This fixed sshd not able to call restore_uid when MAC/do policy is loaded (cherry picked from commit 61b07f8aa52844b21637ac264ea134c1aef48cb7) --- sys/security/mac_do/mac_do.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/security/mac_do/mac_do.c b/sys/security/mac_do/mac_do.c index 8685954b7db6..507e64ea0175 100644 --- a/sys/security/mac_do/mac_do.c +++ b/sys/security/mac_do/mac_do.c @@ -489,7 +489,7 @@ check_setuid(struct ucred *cred, uid_t uid) if (do_enabled == 0) return (0); - if (cred->cr_uid == uid || cred->cr_uid == 0) + if (cred->cr_uid == uid || cred->cr_uid == 0 || cred->cr_ruid == 0) return (0); if (vn_fullpath(curproc->p_textvp, &fullpath, &freebuf) != 0) From nobody Thu Jun 27 08:51:49 2024 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 4W8skZ1xmxz5PF7g; Thu, 27 Jun 2024 08:51: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4W8skY6SJTz4V8Z; Thu, 27 Jun 2024 08:51:49 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1719478309; 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=HwwgWjuGjt7p057gNo1uiBTHtbYBvbp0ZhOOVhmb8q8=; b=hv+d2fpgAcP2IwSOYcADzTdGmcnwrhkH7s+2QJ2/bFxZgJbQb7b0yAVUgwb3nY84qRD3Ex QE6CTGmtJSjV6A+SVaJ+u7edGeks+89ej9rRworyZQpMtwXiGn5mJk9aBODbt0KP7N9p1H Y3CbEDzTzJe6z5eH49lNmNsAxHv1jXp1IjhKNf0izbXMKbaHESGcz5BjfetulAOdmm47FN T7ZGF532yycC0Bk3F5xd/li4XKQD+1zG0531SG57moWf97G1okcHigJZdnhtETR7F8FsYy Y6DpEgIn0vMM4llMZmme4tdQCSB+hhfLW69TsQBM3zDQjQK6HnN0urdPJfdMkQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1719478309; a=rsa-sha256; cv=none; b=pxgdGoA8APhJPrBlC36doV3uci6NRzgJfg30KVEb1IJjchN/hpLsRBUCV1SYc3cAEUhoO5 K2h3xFqBpZY+MgdRQJoAWDOb/KxKkVn2INbPpHpJCxDrVlvdc28/iQz0nrAm1QDcCXUpM0 QDTS3wKp249zV2y8HKgGSavpotblZUQPUDvu27ViRMOk8cFLdCouIzB+ciSBaoAOZB6YX8 GH7Q+pTdh7sIPw/QFi8rq3vmMYHojMCej5zamV2hgQSpmpZ5wlhAMI3Mpgz0XTztrFJsaq cNGfHVgp1bEKspkEwS9EJSu+XaJDLWtKro/i5kbTYXkYXW2VizdKpgGG6Cwsbw== 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=1719478309; 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=HwwgWjuGjt7p057gNo1uiBTHtbYBvbp0ZhOOVhmb8q8=; b=jpZ6Uf+zrOpfU6q26AoPYoQLttJjtADAzlPJqgVaRZHb+ORGJ62jTDPhbtByQ3hEXS3Wif P3iJKopG8KDho5RWXXBLJUFpibAom8cIxSaJgcfWhU6EYDNrXdbDs85sHOmlYuiJ9PDC8/ dhL1msJjIdZxlcFWf/sSIf+7xweuA5j+B0ravYpF0uvswykcetseFmWbFxlzyw9pz+JZPo tnNFF114+FjYNbPQG/7fgQTMMToGoxHDpN+nwBvgq1RS6O2gfWPa001Dw2ouvU8lRmk0bx 52bUS0E3NsQiYTEfecaQgzHrgprX6iRBU1/hPqzysGjb39cAfVmbBCF8VdEA3Q== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4W8skY61Dmz1L5W; Thu, 27 Jun 2024 08:51:49 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 45R8pnaF007649; Thu, 27 Jun 2024 08:51:49 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 45R8pnZ7007640; Thu, 27 Jun 2024 08:51:49 GMT (envelope-from git) Date: Thu, 27 Jun 2024 08:51:49 GMT Message-Id: <202406270851.45R8pnZ7007640@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Baptiste Daroussin Subject: git: b8722a229e9a - stable/14 - RELNOTES: document MAC/do 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 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/14 X-Git-Reftype: branch X-Git-Commit: b8722a229e9a0343aa403df975c82bda33c28137 Auto-Submitted: auto-generated The branch stable/14 has been updated by bapt: URL: https://cgit.FreeBSD.org/src/commit/?id=b8722a229e9a0343aa403df975c82bda33c28137 commit b8722a229e9a0343aa403df975c82bda33c28137 Author: Baptiste Daroussin AuthorDate: 2024-05-22 12:05:57 +0000 Commit: Baptiste Daroussin CommitDate: 2024-06-27 08:50:17 +0000 RELNOTES: document MAC/do (cherry picked from commit c180fd3d75c4289a7dcf675dc160c74aafd451c3) --- RELNOTES | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/RELNOTES b/RELNOTES index 1ec11c872d77..1ff7364f0ed5 100644 --- a/RELNOTES +++ b/RELNOTES @@ -10,6 +10,10 @@ newline. Entries should be separated by a newline. Changes to this file should not be MFCed. +c333758fca3e: + new MAC/do policy and mdo(1) utility which enables a user to + become another user without the requirement of setuid root. + eeb04a736cb9: date(1) now supports nanoseconds. For example: `date -Ins` prints "2024-04-22T12:20:28,763742224+02:00" and From nobody Thu Jun 27 08:55:02 2024 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 4W8spH1mKrz5PFc4; Thu, 27 Jun 2024 08:55: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4W8spH1DGRz4VVs; Thu, 27 Jun 2024 08:55:03 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1719478503; 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=eZ6us/4VjmXyNE08uR3uC2w9KKbrC5BRHkP2BB6hV7w=; b=ifOIgLNfAM+hYr9kHSAZ5u11pt7jnVQ5A1XpK4kmjEYW3nuwKGt20vHKrr4WF4zBJlXkL6 aZ1hyC17a0xH/PDlrryXUeJp8Ujtk7aTew0fc8MtoJERlMw4ZJOdOQJkrN8LNzWt2Mpl5B 6fWsHc06uY3EH0fgeo+pI+RPeJDzbjFdbyQNlE96vtWRQ07tlbEitdrBHKhGZI4YVZ7COY WAMhTSgaZ87stxcwCx/8F23z20B5OZJ3qUDm7ITMMpRTuKUGJBnv4aRh7LOKbXxZxJANJm CU9JF1qEyqC50ZhJzENd58B7kJyTUWzqE13CHYepthypSybH1QJqXsKWI+D46w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1719478503; a=rsa-sha256; cv=none; b=mVz+mPQd2sTBbIyMN3J3W2qqdCa5OEOZ3xtFU/I5WDReeCZZKJGWaem5exe66sOX2B3Smh kFN1LtDy7pXT4eS7wZsUdlz26MaRJcOXWVFkXyzIX8FDOCmpHMSu5N0LzYEH4QcR95IRZ7 qEGq8tcSoGNlg1byzbVszl29OwEDIqY6ynQv5hSg3MRzhzIvJJcrmIfzANjWXX4neEToxU TGBiPHjvk/iafuTpoD2SGwZ0dPXzUJ7pM9ECWLbGaPeJpdzFcFEHmn8Fg+F8IQwq3O6lyI +mOgBMAVSb1DWIUGErc6C07cmAOxcNJHVZnEFkkjmMmUfq/BZzL7Xa9Mf8jjEA== 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=1719478503; 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=eZ6us/4VjmXyNE08uR3uC2w9KKbrC5BRHkP2BB6hV7w=; b=S2mLXJ4bEup+EDgAF0Qg6hm+dfCr8XsGD3R4PR2jUNShP9SBIiNUJDJTX5wWTgAl33sucu ne5wOPUBfEXKsrFAKc/pTcjKZS1OVb4t0au8cAWUpK/sSyufnbVa1g43oGFGtjbPYx/0XZ Nmz2/oqXxcHtBe8G66SsNW63xIbIJ8LTBiqSIS9J4CklufXCqAN6xBpWXc7I/q//HQVRsZ NUCvP2fgfHbW4VxsODK7KRevf01AN5g0SU3xu9qX0sfVPdYYKrIF5h74nZnpvVGqQGQ0ER z1f1iDccIKdweOh0CEipiOda4zEkXMLrxP28jr2nSYTqTrrV5m1LpsYsVT9vMg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4W8spH0Tkjz1LBv; Thu, 27 Jun 2024 08:55:03 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 45R8t28g009919; Thu, 27 Jun 2024 08:55:02 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 45R8t28D009916; Thu, 27 Jun 2024 08:55:02 GMT (envelope-from git) Date: Thu, 27 Jun 2024 08:55:02 GMT Message-Id: <202406270855.45R8t28D009916@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Baptiste Daroussin Subject: git: 8ef92ee26b9d - stable/14 - libarchive: fix thread autodetermination for zstd compression format 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 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/14 X-Git-Reftype: branch X-Git-Commit: 8ef92ee26b9d8e5bb76a759b6356119b5a8b8e9d Auto-Submitted: auto-generated The branch stable/14 has been updated by bapt: URL: https://cgit.FreeBSD.org/src/commit/?id=8ef92ee26b9d8e5bb76a759b6356119b5a8b8e9d commit 8ef92ee26b9d8e5bb76a759b6356119b5a8b8e9d Author: Baptiste Daroussin AuthorDate: 2024-05-03 13:37:29 +0000 Commit: Baptiste Daroussin CommitDate: 2024-06-27 08:53:41 +0000 libarchive: fix thread autodetermination for zstd compression format The libarchive code uses sysconf(3) to determine the number of threads when 0 has been given as the number of thread to use MFC after: 3 days (cherry picked from commit a25e0ba57ee17e75ab27fdc09ac3275a8215087e) --- lib/libarchive/Makefile.inc | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/lib/libarchive/Makefile.inc b/lib/libarchive/Makefile.inc index 153f96b12165..755a39ec01e8 100644 --- a/lib/libarchive/Makefile.inc +++ b/lib/libarchive/Makefile.inc @@ -4,7 +4,8 @@ LIBADD= z bz2 lzma bsdxml zstd CFLAGS+= -DHAVE_BZLIB_H=1 -DHAVE_LIBLZMA=1 -DHAVE_LZMA_H=1 \ - -DHAVE_ZSTD_H=1 -DHAVE_LIBZSTD=1 -DHAVE_ZSTD_compressStream=1 + -DHAVE_ZSTD_H=1 -DHAVE_LIBZSTD=1 -DHAVE_ZSTD_compressStream=1 \ + -DHAVE_SYSCONF=1 CFLAGS+= -DPLATFORM_CONFIG_H=\"${.CURDIR}/config_freebsd.h\" .if ${MK_OPENSSL} != "no" From nobody Thu Jun 27 08:55:14 2024 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 4W8spV4jkkz5PFt0; Thu, 27 Jun 2024 08:55: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4W8spV4Dnqz4VcQ; Thu, 27 Jun 2024 08:55:14 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1719478514; 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=mbF+CHpIcMJ3u5HXEwCSORZ0g6SIU0HJZdavF4BgfcE=; b=C5A1Pgn+MrLQv83CpywILzNMP5BIlAKjpBZqP9khH0gjEvDHgM056OqQMJmFSB2fK9c+33 +e1FWA51C0SJ1Dxe74OYidCUH9We/vcI8bRoCWm9iQmQjHxDtQb7yknmbdjy3EUg5TYSDi ri8bLQM280a5/dXu8PziTehkfc8OJBSg5uWunNAPvTDMhmnFH8HQuTQ/HDllwCehKKuwmg gwYGUF25FpS7K1nmbiIiGch6MJIITB5lE7nbVf+qjF9mq3N68LG994edE6Kqt1xbHaaJ9d VB4Foxj95D2nNeamfXUduBqDVLpa/Q9dsI1XQ/ThzZbJBhPtqPOUTkGte18OlQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1719478514; a=rsa-sha256; cv=none; b=l4Y1ljwq2JEXKixbp8jOqeuKO7u9afkcaGWfRXbgZEr/Cwt6hJu9xi1uq9s48Waj5o7qMm 3QmG/vqodaOGl6Xhu0zs7W6LusSqy7+oamAG36Lo4smsHMOHcO3NyEk13Py58tXnLGs2QG PsyocQRlay9HCFslV3l+LVYAYLUWg0SQDofmDR/lkUxf6we/lFKHgNCxx0yMdz7Kqb+EBI ePzJtrdw0zrSENTnU0TQsqVx2qNiaMnsSOh4BbdEMZXd7bAxUOB3/BtaRbIShj4lxyhO8f Dk6pxHZP20TNLUTJtJvsFGP0CYFAHBGxdx/Ir8GhBf3p7Ci0r3olZI9q50mvTA== 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=1719478514; 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=mbF+CHpIcMJ3u5HXEwCSORZ0g6SIU0HJZdavF4BgfcE=; b=yKvYPnArZOgb5IxLmBflly49aGvQNPWAa2htiIH2q7760FlZ1Kjuycy+WAQYjftMuKfvc7 hUDXg54vBRzxOj7AKtRBYrhTk1YqSXhH0AgC9EePryrMbFs8BHbiE++NIjJGcAPuEfhDe7 vaKdM53OwvfF2J+k1VJc6DytXY5IgN97sLYRoS5yo1MT3R76aVc7Gz8c3R1+9iWRUupFZ8 3DdH6BqXd+QcJ8uomyblp525QXpLIgMIeb5ffFOLwIpsC+RcWrN2YVUPASCLesPR7imzZa /JcTjWGXCg5pR3Y3QzBGEfFIkF8C03ilUOdyTwBipkGPbFnhdebQKPg4dJMWiA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4W8spV3nvFz1L5k; Thu, 27 Jun 2024 08:55:14 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 45R8tESt010074; Thu, 27 Jun 2024 08:55:14 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 45R8tEuK010071; Thu, 27 Jun 2024 08:55:14 GMT (envelope-from git) Date: Thu, 27 Jun 2024 08:55:14 GMT Message-Id: <202406270855.45R8tEuK010071@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Baptiste Daroussin Subject: git: 798c7248e7b8 - stable/13 - libarchive: fix thread autodetermination for zstd compression format 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 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/13 X-Git-Reftype: branch X-Git-Commit: 798c7248e7b83487b3c3a93540b826d8344b50e1 Auto-Submitted: auto-generated The branch stable/13 has been updated by bapt: URL: https://cgit.FreeBSD.org/src/commit/?id=798c7248e7b83487b3c3a93540b826d8344b50e1 commit 798c7248e7b83487b3c3a93540b826d8344b50e1 Author: Baptiste Daroussin AuthorDate: 2024-05-03 13:37:29 +0000 Commit: Baptiste Daroussin CommitDate: 2024-06-27 08:54:04 +0000 libarchive: fix thread autodetermination for zstd compression format The libarchive code uses sysconf(3) to determine the number of threads when 0 has been given as the number of thread to use MFC after: 3 days (cherry picked from commit a25e0ba57ee17e75ab27fdc09ac3275a8215087e) --- lib/libarchive/Makefile.inc | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/lib/libarchive/Makefile.inc b/lib/libarchive/Makefile.inc index 153f96b12165..755a39ec01e8 100644 --- a/lib/libarchive/Makefile.inc +++ b/lib/libarchive/Makefile.inc @@ -4,7 +4,8 @@ LIBADD= z bz2 lzma bsdxml zstd CFLAGS+= -DHAVE_BZLIB_H=1 -DHAVE_LIBLZMA=1 -DHAVE_LZMA_H=1 \ - -DHAVE_ZSTD_H=1 -DHAVE_LIBZSTD=1 -DHAVE_ZSTD_compressStream=1 + -DHAVE_ZSTD_H=1 -DHAVE_LIBZSTD=1 -DHAVE_ZSTD_compressStream=1 \ + -DHAVE_SYSCONF=1 CFLAGS+= -DPLATFORM_CONFIG_H=\"${.CURDIR}/config_freebsd.h\" .if ${MK_OPENSSL} != "no" From nobody Thu Jun 27 08:57:43 2024 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 4W8ssM5N0Qz5PGDd; Thu, 27 Jun 2024 08:57:43 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4W8ssM4qQjz4W3Z; Thu, 27 Jun 2024 08:57:43 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1719478663; 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=dTgXnt8e+X0VM/REYVfNUThSLqyIlEJbRbQQ/TwfTN8=; b=pUzAJbhsDaHGgx9i/MbksWvNZQBWlZtdcAfX6+Eme+bvLXMg0Frm0FDms5PQB8Go9+ypE+ bq2mWYf9lcWysTK12B0VGpJAur1xPyzJatBz0sYr7iHintSQWcjBs06mzzweImJnZ97EG2 jFxhWpMw2hrXImJoShbyJCv25gELUrRX8LfdlVEB/5mH45LffZiFm2NER52VDS1fYY3yqj JFPEqstctha43bVe1rqYK9mDYugrXWMd8Oaj1rDw/uhArn72aiSjwGeDv/KwD+L1lbhIqh 9VjVDmgZYBuCCGqawZoEFjibY0D377cf63+YHEGodhq32V9ODUc8cfjwsPQ3UA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1719478663; a=rsa-sha256; cv=none; b=YRB5eg0K2eruIrW3vetUIeKyr2e+cOOANaAm1qPU/97I0dNO7JT9a7k6H5zPCuuv0lxigB 3hTZzzti2ezsgiEZNSMi06N/2gaGvp78qvvzh9t9B/cgK7A4ut/ymwq5dnNA4RNsOUU4H0 S5aYasGhxD8K2ZTAp5um+DG3EncktxpIdWMDhYj6xfBlM2wl40NeTxzbcUU3aafUlvWOzp iEaucqBletkMj/pL00TrlvcvHLAO46nLHLCNBydC6e+f7P58w1Nt1t3tb7yG1BeSKV6YRm 4deS1EUnLIvjmzk/nWq3QVtIOkj6N/lPri9k4whgPdH/E5hfjAm6ZCWIJVAYww== 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=1719478663; 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=dTgXnt8e+X0VM/REYVfNUThSLqyIlEJbRbQQ/TwfTN8=; b=xvolaexJ3FsKERrm5n5W3NIdh7OQmDRTHcyGQmGbaJSJCxPqupta6qSSiZP9yHklcyUeDU OlGClsSBT3ZyxTxlEJA3cwsoELb1E2i5sRp0Vd34SIKXbBQ/TrIVJZcDocIy4loysUbSbo RNuY+THtUQFegG5RQloPATLj3v/y7iDek123ANU4Ybd0bXGN2enf+Nn8FSo0n04s+XWN+c cu/xSEoosZ93hNE/HpfzYjJUAIpzzW0LyeOG9XpR39f6d02zJOLMYdzbAViD800DheTNbM 1/KT4+P+orufyqftgpEs2ZoB8UUsaspqhHVZn/RdPPB2V8xrn5eIgyCKPaQgAQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4W8ssM47lyz1L5m; Thu, 27 Jun 2024 08:57:43 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 45R8vhcT010485; Thu, 27 Jun 2024 08:57:43 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 45R8vheu010483; Thu, 27 Jun 2024 08:57:43 GMT (envelope-from git) Date: Thu, 27 Jun 2024 08:57:43 GMT Message-Id: <202406270857.45R8vheu010483@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Baptiste Daroussin Subject: git: 12e584c11e25 - stable/14 - nuageinit: use pw(8) instead of getent(1) 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 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/14 X-Git-Reftype: branch X-Git-Commit: 12e584c11e25d10ec86a1124b7d350f8a26b67db Auto-Submitted: auto-generated The branch stable/14 has been updated by bapt: URL: https://cgit.FreeBSD.org/src/commit/?id=12e584c11e25d10ec86a1124b7d350f8a26b67db commit 12e584c11e25d10ec86a1124b7d350f8a26b67db Author: Baptiste Daroussin AuthorDate: 2024-06-05 08:34:25 +0000 Commit: Baptiste Daroussin CommitDate: 2024-06-27 08:55:06 +0000 nuageinit: use pw(8) instead of getent(1) pw(8) allows to seek for users in a custom rootdir, which makes it easier for a testsuite MFC After: 3 days (cherry picked from commit 83fcab792c9d7f13f7e8bd73cf1850ba74f49341) --- libexec/nuageinit/nuage.lua | 20 ++++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) diff --git a/libexec/nuageinit/nuage.lua b/libexec/nuageinit/nuage.lua index 55486ae2b122..020b54b0776c 100644 --- a/libexec/nuageinit/nuage.lua +++ b/libexec/nuageinit/nuage.lua @@ -72,7 +72,12 @@ local function adduser(pwd) warnmsg("Argument should be a table") return nil end - local f = io.popen("getent passwd "..pwd.name) + local root = os.getenv("NUAGE_FAKE_ROOTDIR") + local cmd = "pw " + if root then + cmd = cmd .. "-R " .. root .. " " + end + local f = io.popen(cmd .. " usershow " ..pwd.name .. " -7 2>/dev/null") local pwdstr = f:read("*a") f:close() if pwdstr:len() ~= 0 then @@ -109,8 +114,7 @@ local function adduser(pwd) precmd = "echo "..pwd.plain_text_passwd .. "| " postcmd = " -H 0 " end - local root = os.getenv("NUAGE_FAKE_ROOTDIR") - local cmd = precmd .. "pw " + cmd = precmd .. "pw " if root then cmd = cmd .. "-R " .. root .. " " end @@ -140,7 +144,12 @@ local function addgroup(grp) warnmsg("Argument should be a table") return false end - local f = io.popen("getent group "..grp.name) + local root = os.getenv("NUAGE_FAKE_ROOTDIR") + local cmd = "pw " + if root then + cmd = cmd .. "-R " .. root .. " " + end + local f = io.popen(cmd .. " groupshow " ..grp.name .. " 2>/dev/null") local grpstr = f:read("*a") f:close() if grpstr:len() ~= 0 then @@ -151,8 +160,7 @@ local function addgroup(grp) local list = splitlist(grp.members) extraargs = " -M " .. table.concat(list, ',') end - local root = os.getenv("NUAGE_FAKE_ROOTDIR") - local cmd = "pw " + cmd = "pw " if root then cmd = cmd .. "-R " .. root .. " " end From nobody Thu Jun 27 08:57:44 2024 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 4W8ssN6B0vz5PG3S; Thu, 27 Jun 2024 08:57: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4W8ssN5cf8z4W3d; Thu, 27 Jun 2024 08:57:44 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1719478664; 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=yti766KZtYjbb/t6jL0i+2VFyjS1xxzPzqVtOzZVX7k=; b=qA67CPY6xCMYf9suTBR6cuOWcV6PvqAjcmKsbCYjcwCHoRx3Y0DmfgLeDk/BwNyVAO0Qb9 jkkd0H1Pa3XnVoSrAUko7bP2WIjlDKW0vzNkwvd73oY0dyXNF7GeFh4hx4Lzgqu/G6jSDo /2gQCvMs0UZjUxLXb0xivl6i3O2voYqv7JqOpcgCoemfCmZUX69J57xoQ2Bl+J3i3DiybL UefBnxdaLA9itk0eznayf/mvJCoXf2JMlhTrgDRpFII80T6UnMoQ8saFcXwwED0WmcYRjS PnR3H96qmGgsbF8eG1rlUM/wQOlHbWJAF/T7HR5YCVFaP9mLgJwfbb7LrqLb4Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1719478664; a=rsa-sha256; cv=none; b=o8XHAluk5QC1KHTRu+anxctBrn6ZPD/WH6xALmpC3S7cxduskLpeeDaN3aVedWbITnjABt hdVxM3JNYJ1a0GUfHjSwqiNkn940QplNQo8yFBZ58OryTqb9j+M6RDrhwXL5xr/ZHX+Bny NxMkwW6Jr0oNZ6qdfVxB9dsyxYHXyEGuNp1pcrMLimPdf1JuARZxjEjBdxjqxJXAlcY0hG qq+m/dPlEt4cKsGKe1IqCDtlv+4Nj31P+e0wF9nrSKNL7jCteLOkEP6p7Xjd67uY/U1Mum q7fMPcJDnEaPPv87pujzdzXtDHDizjwomW+Fge/6Wuj96OeswkcDGD1FXRFZWw== 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=1719478664; 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=yti766KZtYjbb/t6jL0i+2VFyjS1xxzPzqVtOzZVX7k=; b=kvwXg1Q7UeiDxIuS/HhlQabeTC6/FYZheTkQWf6nQUEYvFOiFcQJvarWCXwRiEwTB4dVsx twygmMsxqcN+AUmy/OEmHQqPs/Wftx5oK9eQxdmdaeEZ3R1Wl5S3aguSNtNcEmzmzgvIFf kUI1x4Xt4TTRCq4hPn/SVrQXJ1RVNz/3k74ibCHqat0cz3ovGCX+k6ad/4soB7quQ7bFZc Mo1m6TeXtqzf022w1Ts47wHN5qZRMSh+qXpJRMpNqYuMMbTiaYdWvpBFaqWgio0K31jmWx uK+shjS0nrqEfgC65xNK46ikJTZA+ZQp8NAXHY0E8ksVfwBm5ZnEhhRa4JPjwg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4W8ssN4w3yz1L5n; Thu, 27 Jun 2024 08:57:44 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 45R8viSY010531; Thu, 27 Jun 2024 08:57:44 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 45R8viTo010528; Thu, 27 Jun 2024 08:57:44 GMT (envelope-from git) Date: Thu, 27 Jun 2024 08:57:44 GMT Message-Id: <202406270857.45R8viTo010528@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Baptiste Daroussin Subject: git: 3cfc085f8ac9 - stable/14 - nuageinit: make addsshkey friendly for testsuite 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 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/14 X-Git-Reftype: branch X-Git-Commit: 3cfc085f8ac9c24a3d6dac0027efa1d8e96197d1 Auto-Submitted: auto-generated The branch stable/14 has been updated by bapt: URL: https://cgit.FreeBSD.org/src/commit/?id=3cfc085f8ac9c24a3d6dac0027efa1d8e96197d1 commit 3cfc085f8ac9c24a3d6dac0027efa1d8e96197d1 Author: Baptiste Daroussin AuthorDate: 2024-06-05 08:44:17 +0000 Commit: Baptiste Daroussin CommitDate: 2024-06-27 08:55:07 +0000 nuageinit: make addsshkey friendly for testsuite (cherry picked from commit fa07b02f6e09f776b3afe5709e8fee1764c11a2a) --- libexec/nuageinit/nuage.lua | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/libexec/nuageinit/nuage.lua b/libexec/nuageinit/nuage.lua index 020b54b0776c..ca70c778791b 100644 --- a/libexec/nuageinit/nuage.lua +++ b/libexec/nuageinit/nuage.lua @@ -177,6 +177,10 @@ end local function addsshkey(homedir, key) local chownak = false local chowndotssh = false + local root = os.getenv("NUAGE_FAKE_ROOTDIR") + if root then + homedir = root .. "/" .. homedir + end local ak_path = homedir .. "/.ssh/authorized_keys" local dotssh_path = homedir .. "/.ssh" local dirattrs = lfs.attributes(ak_path) From nobody Thu Jun 27 08:57:45 2024 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 4W8ssQ1trMz5PGKC; Thu, 27 Jun 2024 08:57: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4W8ssQ08rmz4W7W; Thu, 27 Jun 2024 08:57:46 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1719478666; 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=MSWab7f0Z5wQfUCUCnGkNijwvuBzf4gCv/psiCk4eD0=; b=T3rgjxlR/hHlVbqaxnBDz4P/abtNCxYLZx2pBbNoW1lom5M8aEq/QqvXSmrC2dUxhD6eIa MkYiNb03FjjYOLdFmOp8JT4o/BR935UPX1QafiJiqvkPgXzKrhixc2lpU4iaM+WPe7t+GT BRvkFHOAnOlJ830D+pgkXxTAGU4YgA0b6vncBojXz9M6IbNULgAbNgZihXTRGBg6by6EUp JjNDr5rclLrE2C+Q8p4/V1hRRpnkWeYV0nf9dLls7PuXd3tvBwAqgG+7i0Ay+MluYpRjRd ASmrj0rtab8f363wap/7+pWM2wP9X+AwjU8nXTfpVc0a+ZmZdOW8rRCvjF00uw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1719478666; a=rsa-sha256; cv=none; b=sOmBNTDwhAN+zoPC8brGJ3Sgi4yA0/xS+XMN35rub4truW7uIKdFllZBpxQZMsD6Ip068Y YheYLcoXAMEgmkKGutBwBTvQtj+6EFcDCN7IKgpg8ocZ++W3Iav6bwgs9hQEmQOsQpsfso o7Dnl9K/GS1y5KjBrqgm0C+cgHxl8TenQQqq6vWUK08bSbH8yKfS9Wg1NU63bkgMjuTDBz 1YXjWJ733ITBTfDe1Zzl9kUA3rkjP6ZsUlox1A8KVWfkPIqRrzV3l2HZ4colpXFXgs1gQI s9ka4RlEApwWfzN3z6XK/GS0LHwhpTSyt0SVIN6pZLLNQBnpmwtXl+fqJsk5dw== 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=1719478666; 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=MSWab7f0Z5wQfUCUCnGkNijwvuBzf4gCv/psiCk4eD0=; b=WUfvS1lbm8gyTqTqOz7T8/E9QmL1dexsxpsC1LF/XVak6tuoLhgNI7G6hhWKYpQsa9LKHk WUOgh7mwu20KzX+BHBhUoWB/LXIorbvsO0wdr8Cy27t63zdJrIGYTvow28f2ahnOBzO6Kv Mvs2679sjrgW5QyS+n2qhKFVPYd0nRXFaNNPX7BYtd4MR3wyCdYYAjq+jkYM29BX1Z1+5o qk6qxSunqjEGLoz4Dl2OcmYIecgnJVEVGfISCkKpMf6VDZWYf1hRF8yHRpBRRMoECRexTB hidjydjPPeMSesoC+1FG+UlBMsMcCRG/pl11cPlT4ECXfqFykxQPoxg0XgNMFA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4W8ssP5tljz1LcV; Thu, 27 Jun 2024 08:57:45 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 45R8vjuH010576; Thu, 27 Jun 2024 08:57:45 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 45R8vjZQ010573; Thu, 27 Jun 2024 08:57:45 GMT (envelope-from git) Date: Thu, 27 Jun 2024 08:57:45 GMT Message-Id: <202406270857.45R8vjZQ010573@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Baptiste Daroussin Subject: git: 30346359b377 - stable/14 - nuageinit: fix authorized_key test 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 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/14 X-Git-Reftype: branch X-Git-Commit: 30346359b3775a958a7241e90982bf68fef667fc Auto-Submitted: auto-generated The branch stable/14 has been updated by bapt: URL: https://cgit.FreeBSD.org/src/commit/?id=30346359b3775a958a7241e90982bf68fef667fc commit 30346359b3775a958a7241e90982bf68fef667fc Author: Baptiste Daroussin AuthorDate: 2024-06-05 08:58:17 +0000 Commit: Baptiste Daroussin CommitDate: 2024-06-27 08:56:17 +0000 nuageinit: fix authorized_key test After miss reading the cloudinit spec I ended up writting a wrong test for basic ssh key setup, nuageinit has been fixed, but not the test, here is the actual fix. Reported by: markj (cherry picked from commit 8d7331e62a5aa75760ac54e3cb1594b0001645c6) --- libexec/nuageinit/tests/nuageinit.sh | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/libexec/nuageinit/tests/nuageinit.sh b/libexec/nuageinit/tests/nuageinit.sh index 926233bcf66d..42c95e1b2abd 100644 --- a/libexec/nuageinit/tests/nuageinit.sh +++ b/libexec/nuageinit/tests/nuageinit.sh @@ -173,16 +173,17 @@ EOF config2_pubkeys_body() { here=$(pwd) + export NUAGE_FAKE_ROOTDIR=$(pwd) if [ $(id -u) -ne 0 ]; then atf_skip "root required" fi mkdir -p media/nuageinit - cat > media/nuageinit/meta_data.json << EOF -{ - "public_keys": { - "mykey": "ssh-rsa AAAAB3NzaC1y...== Generated by Nova" - }, -} + touch media/nuageinit/meta_data.json + cat > media/nuageinit/user-data << EOF +#cloud-config + +ssh_authorized_keys: + - "ssh-rsa AAAAB3NzaC1y...== Generated by Nova" EOF mkdir -p etc cat > etc/master.passwd < To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Baptiste Daroussin Subject: git: d45717e497d1 - stable/14 - release: don't keep old packages if the BRANCH changes 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 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/14 X-Git-Reftype: branch X-Git-Commit: d45717e497d10d6f6584e10d39a13a4e5dcd214d Auto-Submitted: auto-generated The branch stable/14 has been updated by bapt: URL: https://cgit.FreeBSD.org/src/commit/?id=d45717e497d10d6f6584e10d39a13a4e5dcd214d commit d45717e497d10d6f6584e10d39a13a4e5dcd214d Author: Siva Mahadevan AuthorDate: 2024-06-05 18:11:38 +0000 Commit: Baptiste Daroussin CommitDate: 2024-06-27 08:58:52 +0000 release: don't keep old packages if the BRANCH changes (cherry picked from commit 4231a5e5040403f4ae46a63bf6e1209d5eb7adb8) --- Makefile.inc1 | 20 ++++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) diff --git a/Makefile.inc1 b/Makefile.inc1 index 141a18d7b745..b2e7be43f2ee 100644 --- a/Makefile.inc1 +++ b/Makefile.inc1 @@ -550,17 +550,23 @@ MAJOR_REVISION= ${_REVISION:R} _PKG_REVISION= ${_REVISION} _STRTIMENOW= %Y%m%d%H%M%S _TIMENOW= ${_STRTIMENOW:gmtime} +BRANCH_EXT= .if ${_BRANCH:MCURRENT*} || ${_BRANCH:MSTABLE*} || ${_BRANCH:MPRERELEASE*} _PKG_REVISION= ${MAJOR_REVISION} -EXTRA_REVISION= .snap${_TIMENOW} +BRANCH_EXT= snap +EXTRA_REVISION= .${BRANCH_EXT}${_TIMENOW} .elif ${_BRANCH:MALPHA*} -EXTRA_REVISION= .a${_BRANCH:C/ALPHA([0-9]+).*/\1/}.${_TIMENOW} +BRANCH_EXT= a${_BRANCH:C/ALPHA([0-9]+).*/\1/} +EXTRA_REVISION= .${BRANCH_EXT}.${_TIMENOW} .elif ${_BRANCH:MBETA*} -EXTRA_REVISION= .b${_BRANCH:C/BETA([0-9]+).*/\1/}.${_TIMENOW} +BRANCH_EXT= b${_BRANCH:C/BETA([0-9]+).*/\1/} +EXTRA_REVISION= .${BRANCH_EXT}.${_TIMENOW} .elif ${_BRANCH:MRC*} -EXTRA_REVISION= .rc${_BRANCH:C/RC([0-9]+).*/\1/}.${_TIMENOW} +BRANCH_EXT= rc${_BRANCH:C/RC([0-9]+).*/\1/} +EXTRA_REVISION= .${BRANCH_EXT}.${_TIMENOW} .elif ${_BRANCH:M*-p*} -EXTRA_REVISION= p${_BRANCH:C/.*-p([0-9]+$)/\1/} +BRANCH_EXT= p${_BRANCH:C/.*-p([0-9]+$)/\1/} +EXTRA_REVISION= ${BRANCH_EXT} .endif PKG_VERSION:= ${_PKG_REVISION}${EXTRA_REVISION:C/[[:space:]]//g} .endif @@ -1995,9 +2001,11 @@ PKG_EXT= pkg .if exists(${REPODIR}/${PKG_ABI}) PKG_VERSION_FROM!=/usr/bin/readlink ${REPODIR}/${PKG_ABI}/latest PKG_VERSION_FROM_DIR= ${REPODIR}/${PKG_ABI}/${PKG_VERSION_FROM} +BRANCH_EXT_FROM= ${PKG_VERSION_FROM:C/.*([[:alpha:]][^\.]*).*/\1/} .else PKG_VERSION_FROM= PKG_VERSION_FROM_DIR= +BRANCH_EXT_FROM= .endif .endif .endif @@ -2035,7 +2043,7 @@ real-update-packages: stage-packages .PHONY continue; \ fi ; \ newsum=$$(pkg query -F ${REPODIR}/${PKG_ABI}/${PKG_VERSION}/$${newpkgname} '%X') ; \ - if [ "$${oldsum}" == "$${newsum}" ]; then \ + if [ "${BRANCH_EXT_FROM}" == "${BRANCH_EXT}" -a $${oldsum}" == "$${newsum}" ]; then \ echo "==> Keeping old ${PKG_NAME_PREFIX}-$${pkgname}-${PKG_VERSION_FROM}.${PKG_EXT}" ; \ rm ${REPODIR}/${PKG_ABI}/${PKG_VERSION}/$${newpkgname} ; \ cp $${pkg} ${REPODIR}/${PKG_ABI}/${PKG_VERSION} ; \ From nobody Thu Jun 27 09:00:52 2024 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 4W8sx05Bllz5PG3h; Thu, 27 Jun 2024 09:00: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4W8sx04WdDz4Wp1; Thu, 27 Jun 2024 09: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=1719478852; 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=PZnRCqI+/B0qqFkMFYIDO0hPD1EZT2QYuVQGnMZXGBY=; b=jPr4JyPNgUqNXX7RlZ72hPQiDhdC6ATeb8GQPeBGSkRLJcd/l/+aLWTT8zYmYaDqd64P25 Harpdj2FbU87oeQCSQQQerL7iolQJx90B/B0HtOujNOE1IUZ1nTvNeLYBZFkS6ZtGUscfo QB4yjpUMzIWmMMzD+ztHYg/OUnkyZ8Bx+S5YdA5rb5VzivR6tldqn3iqlH0+/7bK8ET1VK bKk4LEHoux92DNU2Q/hYqWX1dkiUPmrEsyvyB0psdmZ1ERbPG9WE/DLxZgL3XjpNYPCllJ g8IS0cW6N4TfV+r0Qug1HSLEIRHm+2E7hzD/2hKjGvUvFGmZrbde1vOFes2b/A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1719478852; a=rsa-sha256; cv=none; b=eC/l5FHcsW8CRjZ7wBnljmPQwOOMGjpbOxzw6zG8C9igeZD1vMogO8+magbN6NtFRpuex/ 22XOrPKcHsZmP4Cxi0+q7hObcZoHhVUUT/jKtwv6zSqpUddQCzg1yOpwkR5fp3ZMAGIrzs mKgtw51YS6HFNEkbU7s7wDY4wIUyzW2KLGB+OGzZjDvahRr/58L0czbrGLRPYN370a8enn VMBJBQj5iEvP1xveUdSvGdcHtkXuzqiy7wYtC5/Z1NjI9T4zQD2IZloW2bLe1mcn/U6Lfa kdahBb8l/5bzyEUtKVgVKSSIjrtEt3/0JXmMeNc0PB5KQQ6BdE66mfGbVEC68g== 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=1719478852; 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=PZnRCqI+/B0qqFkMFYIDO0hPD1EZT2QYuVQGnMZXGBY=; b=i3RWPEga8wUkuvy5gHLJ8tqUF5c921SzmhTjkM894OK3FmSI+H9kto/fcIYWHoEX0Z7TDU toupFHf+qjeadknvQGNV/rAh7+DjAWkDtanfEZT6JN2wNSFb7iqUl3Y8pwAY5L/njrbMJM mfNUkTOkUfSquAUTg3wkqQLizvaMjWTjrun/nKvcRJaQ8rQR11Ec2XW3PfPz+z/V4psfCl 7GwgGUz3YdOCfA2B9o5B4H1j3+Iit72y5ys8GXNT1JIemoJWAXOkBUWxL89MFAY/s31Bpt CieF9x26g8L1BYyxPKbRITZf76e0MdJfS/lqV/Bb/vwiTgx2kzMe2I21nGtziw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4W8sx047RCz1LC3; Thu, 27 Jun 2024 09:00:52 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 45R90qOK020834; Thu, 27 Jun 2024 09:00:52 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 45R90qHb020830; Thu, 27 Jun 2024 09:00:52 GMT (envelope-from git) Date: Thu, 27 Jun 2024 09:00:52 GMT Message-Id: <202406270900.45R90qHb020830@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Baptiste Daroussin Subject: git: f8df17340cd6 - stable/14 - Makefile.inc1: Fix typo affecting incremental pkgbase builds. 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 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/14 X-Git-Reftype: branch X-Git-Commit: f8df17340cd6b28e76cfc55ec41e7878db78af81 Auto-Submitted: auto-generated The branch stable/14 has been updated by bapt: URL: https://cgit.FreeBSD.org/src/commit/?id=f8df17340cd6b28e76cfc55ec41e7878db78af81 commit f8df17340cd6b28e76cfc55ec41e7878db78af81 Author: Navdeep Parhar AuthorDate: 2024-06-20 19:15:12 +0000 Commit: Baptiste Daroussin CommitDate: 2024-06-27 08:59:29 +0000 Makefile.inc1: Fix typo affecting incremental pkgbase builds. Fixes: 4231a5e50404 release: don't keep old packages if the BRANCH changes Sponsored by: Chelsio Communications (cherry picked from commit aee4c9c5b88adc899b2e155a1c144acf96719f1e) --- Makefile.inc1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile.inc1 b/Makefile.inc1 index b2e7be43f2ee..935421ea3b9a 100644 --- a/Makefile.inc1 +++ b/Makefile.inc1 @@ -2043,7 +2043,7 @@ real-update-packages: stage-packages .PHONY continue; \ fi ; \ newsum=$$(pkg query -F ${REPODIR}/${PKG_ABI}/${PKG_VERSION}/$${newpkgname} '%X') ; \ - if [ "${BRANCH_EXT_FROM}" == "${BRANCH_EXT}" -a $${oldsum}" == "$${newsum}" ]; then \ + if [ "${BRANCH_EXT_FROM}" == "${BRANCH_EXT}" -a "$${oldsum}" == "$${newsum}" ]; then \ echo "==> Keeping old ${PKG_NAME_PREFIX}-$${pkgname}-${PKG_VERSION_FROM}.${PKG_EXT}" ; \ rm ${REPODIR}/${PKG_ABI}/${PKG_VERSION}/$${newpkgname} ; \ cp $${pkg} ${REPODIR}/${PKG_ABI}/${PKG_VERSION} ; \ From nobody Thu Jun 27 09:02:45 2024 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 4W8sz962Z6z5PGdf; Thu, 27 Jun 2024 09:02: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4W8sz93tJLz4XXq; Thu, 27 Jun 2024 09:02:45 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1719478965; 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=OLaSi30cFbt6aY8Y8JUCmOVAlelGNPht93RJ2Mw+LeQ=; b=C2QZ4cHAgy3Ed9AvxheOvnX/N9Xoe4QvGcq7PrsC24AhAt8YykTLkiAukLAcXTC+aCmZDw jsHFy+Wq/qBzZUHPSVvOTbPnqMAweJg3yjrFhkozf5KX0aqp9HCuPqBMqNM4fiZ8bsMFwo 6Q/E0gldz+um29qeBSOAvzvMFzeiP24div4IRgH230oXjGCuRHaWPBOvbgJU883TNmIKll i5mYi7MRzvO/rYkjFoeJhGdOH0iefx92e4iAwpa+rBXpZHRBr9OVEXahbtGzI2UEPL2CAj Vs1rEJGfzO1x3P8QU4mNBw5MrjmF1L2vtbwaRAAhwBnyWAyr2uCmIxoKWJrlOw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1719478965; a=rsa-sha256; cv=none; b=DFH2sQKC3FotzWRQbGnbxyWjG0op8zZ48yCD1JTn8sspK92C/U78hbXDTc7FRQ9RJcqnSU KUUbkuMHfjGn71bHVw/QbJZda7gh08DtwmpXi9Tucsqz/KAeIFA9nzwIQfusZxKyH9QeQl Vuq2H/Mc0XppAHfv/mBSI5CmAn5sv5HewJbPabqybwwvYKRerVp5TNgIO0KOCn/+Xu69Mk NC3k2tCyW6jDykLcPJlho9Ovpl9995bA9+L5iphMUhEEWMrL1mMnQQ8R9y2EBbgoNP/0lg bO87YdDInFXW7vrisxmO450E6fXTPjhPW8A6HVoAp1UQFlQJwsX3dcpU2aGfsw== 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=1719478965; 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=OLaSi30cFbt6aY8Y8JUCmOVAlelGNPht93RJ2Mw+LeQ=; b=KVU9nHC7Ljux5hTo+hB5nuoOEBB2C7JtzeOhtdOt79Fb8qs5oAI/21z2Ta+p0ctO1TeX9/ cCU6+PWaymT4ngV4MqUD80UR9nw40q7rLjf6p5u49OtJnvUsU9lRyJ5DWGzDlun6UXxdT6 wgdbkX49t29NLFEzVF9DGM0TGUCPH1IXcGI4Vag+fQKuzub3mGJ23/mxJ5hN4WZXgJy5TI ulf8fddKlH3S0i/2RwXFlgm4hStM9Vxw6eH1ewVJWuvrdlFamKhmh2qXt038DBkNEaaMbx h4pgTYvtH+wVxdUQD5EacDRqsSLmeJP1GE3OBnPlgNPOQvaj9q4zuD5a42k6tQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4W8sz92pMvz1L99; Thu, 27 Jun 2024 09:02:45 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 45R92jvv027499; Thu, 27 Jun 2024 09:02:45 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 45R92jYO027496; Thu, 27 Jun 2024 09:02:45 GMT (envelope-from git) Date: Thu, 27 Jun 2024 09:02:45 GMT Message-Id: <202406270902.45R92jYO027496@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Baptiste Daroussin Subject: git: e91fd8934231 - stable/14 - systat: fix build with newer ncurses 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 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/14 X-Git-Reftype: branch X-Git-Commit: e91fd89342310ec5f3af4206ee649d7b2e7de9f2 Auto-Submitted: auto-generated The branch stable/14 has been updated by bapt: URL: https://cgit.FreeBSD.org/src/commit/?id=e91fd89342310ec5f3af4206ee649d7b2e7de9f2 commit e91fd89342310ec5f3af4206ee649d7b2e7de9f2 Author: Baptiste Daroussin AuthorDate: 2024-06-20 13:10:38 +0000 Commit: Baptiste Daroussin CommitDate: 2024-06-27 09:01:24 +0000 systat: fix build with newer ncurses (cherry picked from commit 35e941ce5520b8ef710bb388bd63460aa0ce63eb) --- usr.bin/systat/netcmds.c | 2 +- usr.bin/systat/sctp.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/usr.bin/systat/netcmds.c b/usr.bin/systat/netcmds.c index 6320dd21562d..b09a14bbf634 100644 --- a/usr.bin/systat/netcmds.c +++ b/usr.bin/systat/netcmds.c @@ -248,7 +248,7 @@ showports(void) if (sp) printw("%s ", sp->s_name); else - printw("%d ", p->port); + printw("%ld ", p->port); } } diff --git a/usr.bin/systat/sctp.c b/usr.bin/systat/sctp.c index 928472dbfdc5..9be137700055 100644 --- a/usr.bin/systat/sctp.c +++ b/usr.bin/systat/sctp.c @@ -277,7 +277,7 @@ showsctp(void) domode(&stats); #define DO(stat, row, col) \ - mvwprintw(wnd, row, col, "%12lu", stats.stat) + mvwprintw(wnd, row, col, "%12u", stats.stat) #define L(row, stat) DO(stat, row, 0) #define R(row, stat) DO(stat, row, 38) L(1, sctps_activeestab); R(1, sctps_outpackets); From nobody Thu Jun 27 09:02:46 2024 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 4W8szB70F5z5PGgf; Thu, 27 Jun 2024 09:02: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4W8szB4rZLz4XvY; Thu, 27 Jun 2024 09:02:46 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1719478966; 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=n5wq8XcQzodcODei4lUGf+ZxHkDkRS8zXmgfGx4d3x0=; b=VnrDgLMTs++X6jQ7NKgIml9Bxcb3+DrZK+cGvGbdr0xe1pvpM0goP3NUUCI4W2vZXMVYk2 +O10iIdMIm8urOcFrDprQOgUxVpC61Zj3TyGjzn8UF+CchmkQk4WF3KA1kd7vKCa9LcB9X 85AWVFDDZn7plyToo/nEyXk2N5wDewKM5KQZhXjEulWUUktG6POE0D1SPKudRKjNKHnylV 4SU325ELE7p6xq/hFbFWKGKsz+AtRIIff4LI2i6GbmKrJMz1+fqC14udgTvg4g19AHVlzc kho1QvoIyMkVLI3Knejrs1Olrq+H463L5vv16YCFncZpFg6bd0p2BNJCCspXDg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1719478966; a=rsa-sha256; cv=none; b=n/acXfS2GvReEdudFcXQt9sS1roLlNAsFXDgYewcxJMsucBEsYXm9COXmp9uMWoeIa4e6P xhSNC2KnawQ8vT/L8znuOypSz93thYizJeICeHzDUXWwbS/pudqjaaxu2ZtVyDe+muj6Vs CVBxIYDiRPYin6hnoxZJk4RCzXMRMDhzjBMI6ofdudyYCTZrLeZv9Hzfyc65cTBqvWGz+b fQuCblM5Z0R1N5O5dP0wZANTwRDTXEHLFT7YGlP7OsitbjSa7jSR4as6o2cBUoPZTxJFXj 0jyVl8kqzYGxdAQDO8Zb8WZbwUEhuPtRGuKp2cn/B2dr8NSw4JoQEAUuEBZq+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=1719478966; 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=n5wq8XcQzodcODei4lUGf+ZxHkDkRS8zXmgfGx4d3x0=; b=tYdA40u+D7yYx1dNx7R65nUZJ+wSnkRkB4hUj4+nA0PtxV+YDI2CybQ3jBQnFp69E5OJZt yKGbUJxuAM6ck3K5WVxevU0BQhg92SRHFDTFjUp9OGVto1qk6Pz7d/LlJ1k6qpKXKBHL9/ oFxCVaq15zqRRMzPjcuWqoXeNtfVS4iyL7XZTWvQ6dc0ALy75mCcj0DXUyM5VbtQOCpWBs oubN/RNVeP4NFMmoIBNTVxRwcH6oAqhet+FXc/0ynWsOmcAnJ0ZxSksrmTcSw4gy5mQdSB 01AeObG9TjVskPNgLmqBOjFYYrdDmiimoeL+ETDxR3khv9DUL7fxg0lPeXM1oA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4W8szB48mWz1L9B; Thu, 27 Jun 2024 09:02:46 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 45R92k0G027556; Thu, 27 Jun 2024 09:02:46 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 45R92k68027553; Thu, 27 Jun 2024 09:02:46 GMT (envelope-from git) Date: Thu, 27 Jun 2024 09:02:46 GMT Message-Id: <202406270902.45R92k68027553@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Baptiste Daroussin Subject: git: d3e5871503aa - stable/14 - ee: fix wprintw usage (highlighted by ncurses 6.5) 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 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/14 X-Git-Reftype: branch X-Git-Commit: d3e5871503aab2e6348e78dc1d0ac718f6ee3df2 Auto-Submitted: auto-generated The branch stable/14 has been updated by bapt: URL: https://cgit.FreeBSD.org/src/commit/?id=d3e5871503aab2e6348e78dc1d0ac718f6ee3df2 commit d3e5871503aab2e6348e78dc1d0ac718f6ee3df2 Author: Baptiste Daroussin AuthorDate: 2024-06-20 13:42:59 +0000 Commit: Baptiste Daroussin CommitDate: 2024-06-27 09:01:25 +0000 ee: fix wprintw usage (highlighted by ncurses 6.5) Reported by: cy (cherry picked from commit 0667538b888c1171932c6cf28b62fc19d393e119) --- contrib/ee/ee.c | 42 +++++++++++++++++++++--------------------- 1 file changed, 21 insertions(+), 21 deletions(-) diff --git a/contrib/ee/ee.c b/contrib/ee/ee.c index 072d26519f4c..2f122981dbe7 100644 --- a/contrib/ee/ee.c +++ b/contrib/ee/ee.c @@ -591,11 +591,11 @@ main(int argc, char *argv[]) { wmove(com_win, 0, 0); werase(com_win); - wprintw(com_win, ree_no_file_msg); + wprintw(com_win, "%s", ree_no_file_msg); wrefresh(com_win); edit_abort(0); } - wprintw(com_win, no_file_string); + wprintw(com_win, "%s", no_file_string); wrefresh(com_win); } else @@ -615,7 +615,7 @@ main(int argc, char *argv[]) if (!nohighlight) wstandout(info_win); wmove(info_win, 5, 0); - wprintw(info_win, separator); + wprintw(info_win, "%s", separator); wmove(info_win, 5, 5); wprintw(info_win, "line %d col %d lines from top %d ", curr_line->line_number, scr_horz, absolute_lin); @@ -1668,7 +1668,7 @@ command_prompt(void) if (result == 0) wprintw(com_win, unkn_cmd_str, cmd_str); else - wprintw(com_win, non_unique_cmd_msg); + wprintw(com_win, "%s", non_unique_cmd_msg); wrefresh(com_win); @@ -1744,7 +1744,7 @@ command(char *cmd_str1) wmove(com_win, 0, 0); wclrtoeol(com_win); if (in_file_name == NULL) - wprintw(com_win, no_file_string); + wprintw(com_win, "%s", no_file_string); else wprintw(com_win, current_file_str, in_file_name); } @@ -2245,7 +2245,7 @@ get_file(char *file_name) { if ((errno == ENOTDIR) || (errno == EACCES) || (errno == EROFS) || (errno == ETXTBSY) || (errno == EFAULT)) { - wprintw(com_win, read_only_msg); + wprintw(com_win, "%s", read_only_msg); ro_flag = TRUE; } } @@ -2282,7 +2282,7 @@ get_file(char *file_name) wclrtoeol(com_win); wprintw(com_win, file_read_lines_msg, in_file_name, curr_line->line_number); if (ro_flag) - wprintw(com_win, read_only_msg); + wprintw(com_win, "%s", read_only_msg); wrefresh(com_win); } else if (can_read) /* not input_file and file is non-zero size */ @@ -2400,7 +2400,7 @@ finish(void) if ((file_name == NULL) || (*file_name == '\0')) { wmove(com_win, 0, 0); - wprintw(com_win, file_not_saved_msg); + wprintw(com_win, "%s", file_not_saved_msg); wclrtoeol(com_win); wrefresh(com_win); clear_com_win = TRUE; @@ -2577,7 +2577,7 @@ search(int display_message) { wmove(com_win, 0, 0); wclrtoeol(com_win); - wprintw(com_win, searching_msg); + wprintw(com_win, "%s", searching_msg); wrefresh(com_win); clear_com_win = TRUE; } @@ -3378,7 +3378,7 @@ menu_op(struct menu_entries menu_list[]) { wmove(com_win, 0, 0); werase(com_win); - wprintw(com_win, menu_too_lrg_msg); + wprintw(com_win, "%s", menu_too_lrg_msg); wrefresh(com_win); clear_com_win = TRUE; return(0); @@ -3630,10 +3630,10 @@ paint_menu(struct menu_entries menu_list[], int max_width, int max_height, { if (list_size > 1) wprintw(menu_win, "%c) ", item_alpha[min((counter - 1), max_alpha_char)]); - wprintw(menu_win, menu_list[counter].item_string); + wprintw(menu_win, "%s", menu_list[counter].item_string); } else - wprintw(menu_win, more_below_str); + wprintw(menu_win, "%s", more_below_str); } else { @@ -3663,7 +3663,7 @@ help(void) wrefresh(help_win); werase(com_win); wmove(com_win, 0, 0); - wprintw(com_win, press_any_key_msg); + wprintw(com_win, "%s", press_any_key_msg); wrefresh(com_win); counter = wgetch(com_win); if (counter == -1) @@ -3790,7 +3790,7 @@ file_op(int arg) if ((string == NULL) || (*string == '\0')) { wmove(com_win, 0, 0); - wprintw(com_win, file_not_saved_msg); + wprintw(com_win, "%s", file_not_saved_msg); wclrtoeol(com_win); wrefresh(com_win); clear_com_win = TRUE; @@ -3925,7 +3925,7 @@ Format(void) wmove(com_win, 0, 0); wclrtoeol(com_win); - wprintw(com_win, formatting_msg); + wprintw(com_win, "%s", formatting_msg); wrefresh(com_win); /* @@ -3971,7 +3971,7 @@ Format(void) wmove(com_win, 0, 0); wclrtoeol(com_win); - wprintw(com_win, formatting_msg); + wprintw(com_win, "%s", formatting_msg); wrefresh(com_win); /* @@ -4046,7 +4046,7 @@ Format(void) wmove(com_win, 0, 0); wclrtoeol(com_win); - wprintw(com_win, formatting_msg); + wprintw(com_win, "%s", formatting_msg); wrefresh(com_win); /* @@ -4270,7 +4270,7 @@ dump_ee_conf(void) if (option == 0) { - wprintw(com_win, conf_not_saved_msg); + wprintw(com_win, "%s", conf_not_saved_msg); wrefresh(com_win); return; } @@ -4293,7 +4293,7 @@ dump_ee_conf(void) init_file = fopen(file_name, "w"); if (init_file == NULL) { - wprintw(com_win, conf_dump_err_msg); + wprintw(com_win, "%s", conf_dump_err_msg); wrefresh(com_win); return; } @@ -4412,7 +4412,7 @@ spell_op(void) command(shell_echo_msg); adv_line(); wmove(com_win, 0, 0); - wprintw(com_win, spell_in_prog_msg); + wprintw(com_win, "%s", spell_in_prog_msg); wrefresh(com_win); command("<>!spell"); /* send contents of buffer to command 'spell' and read the results back into the editor */ @@ -5000,7 +5000,7 @@ restrict_mode(void) return(FALSE); wmove(com_win, 0, 0); - wprintw(com_win, restricted_msg); + wprintw(com_win, "%s", restricted_msg); wclrtoeol(com_win); wrefresh(com_win); clear_com_win = TRUE; From nobody Thu Jun 27 09:03:14 2024 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 4W8szk4zZyz5PGk7; Thu, 27 Jun 2024 09:03: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4W8szk2vtzz4YMq; Thu, 27 Jun 2024 09:03:14 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1719478994; 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=PldrCIifdzkLmINhLFu/Gjf6lVEKf3J9rW8adcgd2nY=; b=AV5QFITmifXlWdHL8cmc1smGzn1J4raLwjGMT4CPhEi7k8Vzs3BE+8T3EJAP/+xfHVQwu9 RBzG6Kdy/nR0N6eDKmqcb4xx72rABVnjdUjIIJ9ZlZtP/DU+XUSl1XutJkNCJLaHks0ep3 USlaxwWXNvAFeDrERE7FKIiwK2PbGT25Z05/gtotQcIw433GlMUCbJ/RPi5wpgG/Qx8TRM TpgoK0Sfx+U0S4rzRcOh8jQ1IgXuUed4WcmHsnpu7r4ZJWovNo2/QwMVFbOGnfZKn+bgJV NrxKu3T3PZppb9BaUTD7YjEzntYidv9KIgkXQWx/5T4Zr7NLz+oa33+5zTa5aQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1719478994; a=rsa-sha256; cv=none; b=NBwyyBWthlvm28ox8gNifzdvGkMOBO9GWADeJqmKOwXS8vNeYAFXIEnAx8owc3anaNW3Ax ZXa99k6Pt1K5Tpqg1Uu2qwwbUiEBbCPhC0wPSWyW88O3mAEnY2THj+nzhpa2JaLUo5f+wB 9Pb7MyJtZwqOqv1j8nMTm4/LCTOg6DBmmj0ljLPnz47KB7JqJAq5F/90PlJvRnzu0/rXTq rmlrGogUuu67G4g3qb3kbOnaElStuJ571wzZHTPcr+OoDAAar6/tSP5nMmXsQzctjzmy9B lJIp4GmLaF1lDeYsgU7K8+Yv2fw6SINgiTtsxXpUfT/Jr/jt7JhgVNYanw/biw== 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=1719478994; 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=PldrCIifdzkLmINhLFu/Gjf6lVEKf3J9rW8adcgd2nY=; b=NsEuZjIyLz7I5ZauAHsmaP6dGXhcJ0H33aYdQCZ+uES47FxAsUm8db33Q4qsIjIFUmhI19 EQ3omxGcWaJ6bZTxfWq2iDcrh/KHZuZLVywyrpBHk1mKtwfYXWjMB8+tFr4LiyFJLgMQhn LFX7myQuafAkrMFLGYZgavzbEVFb0j7f7dTGxhH08VcrCXiUhfQd1HE0AEyOe4UdGROHRM sSe492faaltpsWwBQqPTHNQ1NWfE6GflNQIW5WhkROanMYoTvcgK1COBtf49LdASPiOXHx MIC1AH/c4NhQibsDt0dSP/GLg4mhwEBjvYMFq2+t3qPbNHY+wACU89s913nwCA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4W8szk2WFMz1L9C; Thu, 27 Jun 2024 09:03:14 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 45R93EDD027761; Thu, 27 Jun 2024 09:03:14 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 45R93EBV027758; Thu, 27 Jun 2024 09:03:14 GMT (envelope-from git) Date: Thu, 27 Jun 2024 09:03:14 GMT Message-Id: <202406270903.45R93EBV027758@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Baptiste Daroussin Subject: git: 53b41929560d - stable/13 - systat: fix build with newer ncurses 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 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/13 X-Git-Reftype: branch X-Git-Commit: 53b41929560d9853a7d2b38b4ab205c091869a17 Auto-Submitted: auto-generated The branch stable/13 has been updated by bapt: URL: https://cgit.FreeBSD.org/src/commit/?id=53b41929560d9853a7d2b38b4ab205c091869a17 commit 53b41929560d9853a7d2b38b4ab205c091869a17 Author: Baptiste Daroussin AuthorDate: 2024-06-20 13:10:38 +0000 Commit: Baptiste Daroussin CommitDate: 2024-06-27 09:01:57 +0000 systat: fix build with newer ncurses (cherry picked from commit 35e941ce5520b8ef710bb388bd63460aa0ce63eb) --- usr.bin/systat/netcmds.c | 2 +- usr.bin/systat/sctp.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/usr.bin/systat/netcmds.c b/usr.bin/systat/netcmds.c index 6320dd21562d..b09a14bbf634 100644 --- a/usr.bin/systat/netcmds.c +++ b/usr.bin/systat/netcmds.c @@ -248,7 +248,7 @@ showports(void) if (sp) printw("%s ", sp->s_name); else - printw("%d ", p->port); + printw("%ld ", p->port); } } diff --git a/usr.bin/systat/sctp.c b/usr.bin/systat/sctp.c index 928472dbfdc5..9be137700055 100644 --- a/usr.bin/systat/sctp.c +++ b/usr.bin/systat/sctp.c @@ -277,7 +277,7 @@ showsctp(void) domode(&stats); #define DO(stat, row, col) \ - mvwprintw(wnd, row, col, "%12lu", stats.stat) + mvwprintw(wnd, row, col, "%12u", stats.stat) #define L(row, stat) DO(stat, row, 0) #define R(row, stat) DO(stat, row, 38) L(1, sctps_activeestab); R(1, sctps_outpackets); From nobody Thu Jun 27 09:03:15 2024 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 4W8szl4s0Lz5PGf3; Thu, 27 Jun 2024 09:03: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4W8szl3xLQz4YPk; Thu, 27 Jun 2024 09:03:15 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1719478995; 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=P5Phl9vaF80NcQ8UgiIITMiWugkOfFgMn7GQ/EIQ93g=; b=yadDTXWdSMcjud9HITU0E69HN6KwCkHOQVN9rgNU5wqkLVUroWfnZftwlk7Y48wIXSGmrA VPLs2vEfp/AooZp80A8NrgventhlaXGQASSWvE716z4Fjslcz1ys7Ek/cFwgzlm+58reVK SxgBYlJaVLlJoapd4IWzOAwwG7/7RcWYtmVlw5QvsYOVd30dUHj3obb9qAXZuF2gMyJGhr zvG5mH0iXXiWAjwMMbQrKyN+pBvI/RAeyxwUvPh0YPbnsXMQk5npVzfostwSXjHb0I+ntn AGdJnKMaE8181rew6cjtEyp05wObfOsjHgY2S1v82IOHFVScfqdF317WvMUqGA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1719478995; a=rsa-sha256; cv=none; b=dJ5UXGOYo5yrJ8hOYHDbhb03iQvCrSNLDDDyGwLhMBAFn+PIOrUBBvvaR+kI9nqUB3XHw2 A76OPlyhaev+XfAouIPtDe1RlgNhGZba8LL886tFadT3/uXMP6d+dEn2SnpLROXc3q7trt 9duti0pDVBhZnwT3hLMhyyITIHwuj8ZvIg/BuUdfge2Lnv3NxB7321BTBQkvWZMe6jT0OO kQQNxDJ8IiXsmfLkqstmDOzcOUYvUM00PLEinm+yQmv5MrgT6Vb6r3/pxvr8yIgJtD9ELg WpES6emM+NGFIXMfZUD3rtG28qGuAp49d6qzi/KHvxCAoP0m2YSW/bVqcE/FyA== 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=1719478995; 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=P5Phl9vaF80NcQ8UgiIITMiWugkOfFgMn7GQ/EIQ93g=; b=U3kX6SRp+Wj+70oYMWMzBGBPd+0ZtUmZSrzxDWUKpST1+UIhFw1Raq0vKOe05dPmqvUwet jTRMfWhzQCOnBerGodcow33KvJ3gfb0NriO26CHJGTQyTH+F1OiGkyVdyfwsGupQIFU9Kq UfSsnHvdMTRyBcmVl4HWqWB6h6+wzrjea7FqNrVo0G7eHhLCYsnFRI2NamidL+nAwQ+MlH pAo/AuYFg83/IfzNkzAsc9SrvH+beEv8cVaj7HzSjvGNOK+GJwtiZIWsIdDwdlFlwxf+qt D9IgtkBFwRQd293RvvI1bMdYAiM+5etJgM8/bpH3yUmpP+t0qUS7abGJLL9HGQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4W8szl3XWXz1LgG; Thu, 27 Jun 2024 09:03:15 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 45R93FSD027825; Thu, 27 Jun 2024 09:03:15 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 45R93Fg9027822; Thu, 27 Jun 2024 09:03:15 GMT (envelope-from git) Date: Thu, 27 Jun 2024 09:03:15 GMT Message-Id: <202406270903.45R93Fg9027822@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Baptiste Daroussin Subject: git: 1cac66d0db77 - stable/13 - ee: fix wprintw usage (highlighted by ncurses 6.5) 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 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/13 X-Git-Reftype: branch X-Git-Commit: 1cac66d0db7737a7f1c394b2f50d058bd2a8c8d9 Auto-Submitted: auto-generated The branch stable/13 has been updated by bapt: URL: https://cgit.FreeBSD.org/src/commit/?id=1cac66d0db7737a7f1c394b2f50d058bd2a8c8d9 commit 1cac66d0db7737a7f1c394b2f50d058bd2a8c8d9 Author: Baptiste Daroussin AuthorDate: 2024-06-20 13:42:59 +0000 Commit: Baptiste Daroussin CommitDate: 2024-06-27 09:01:57 +0000 ee: fix wprintw usage (highlighted by ncurses 6.5) Reported by: cy (cherry picked from commit 0667538b888c1171932c6cf28b62fc19d393e119) --- contrib/ee/ee.c | 42 +++++++++++++++++++++--------------------- 1 file changed, 21 insertions(+), 21 deletions(-) diff --git a/contrib/ee/ee.c b/contrib/ee/ee.c index 70a44076f882..5976152414cb 100644 --- a/contrib/ee/ee.c +++ b/contrib/ee/ee.c @@ -595,11 +595,11 @@ char *argv[]; { wmove(com_win, 0, 0); werase(com_win); - wprintw(com_win, ree_no_file_msg); + wprintw(com_win, "%s", ree_no_file_msg); wrefresh(com_win); edit_abort(0); } - wprintw(com_win, no_file_string); + wprintw(com_win, "%s", no_file_string); wrefresh(com_win); } else @@ -619,7 +619,7 @@ char *argv[]; if (!nohighlight) wstandout(info_win); wmove(info_win, 5, 0); - wprintw(info_win, separator); + wprintw(info_win, "%s", separator); wmove(info_win, 5, 5); wprintw(info_win, "line %d col %d lines from top %d ", curr_line->line_number, scr_horz, absolute_lin); @@ -1666,7 +1666,7 @@ command_prompt() if (result == 0) wprintw(com_win, unkn_cmd_str, cmd_str); else - wprintw(com_win, non_unique_cmd_msg); + wprintw(com_win, "%s", non_unique_cmd_msg); wrefresh(com_win); @@ -1742,7 +1742,7 @@ char *cmd_str1; wmove(com_win, 0, 0); wclrtoeol(com_win); if (in_file_name == NULL) - wprintw(com_win, no_file_string); + wprintw(com_win, "%s", no_file_string); else wprintw(com_win, current_file_str, in_file_name); } @@ -2253,7 +2253,7 @@ char *file_name; { if ((errno == ENOTDIR) || (errno == EACCES) || (errno == EROFS) || (errno == ETXTBSY) || (errno == EFAULT)) { - wprintw(com_win, read_only_msg); + wprintw(com_win, "%s", read_only_msg); ro_flag = TRUE; } } @@ -2290,7 +2290,7 @@ char *file_name; wclrtoeol(com_win); wprintw(com_win, file_read_lines_msg, in_file_name, curr_line->line_number); if (ro_flag) - wprintw(com_win, read_only_msg); + wprintw(com_win, "%s", read_only_msg); wrefresh(com_win); } else if (can_read) /* not input_file and file is non-zero size */ @@ -2409,7 +2409,7 @@ finish() /* prepare to exit edit session */ if ((file_name == NULL) || (*file_name == '\0')) { wmove(com_win, 0, 0); - wprintw(com_win, file_not_saved_msg); + wprintw(com_win, "%s", file_not_saved_msg); wclrtoeol(com_win); wrefresh(com_win); clear_com_win = TRUE; @@ -2589,7 +2589,7 @@ int display_message; { wmove(com_win, 0, 0); wclrtoeol(com_win); - wprintw(com_win, searching_msg); + wprintw(com_win, "%s", searching_msg); wrefresh(com_win); clear_com_win = TRUE; } @@ -3381,7 +3381,7 @@ struct menu_entries menu_list[]; { wmove(com_win, 0, 0); werase(com_win); - wprintw(com_win, menu_too_lrg_msg); + wprintw(com_win, "%s", menu_too_lrg_msg); wrefresh(com_win); clear_com_win = TRUE; return(0); @@ -3637,10 +3637,10 @@ int off_start, vert_size; { if (list_size > 1) wprintw(menu_win, "%c) ", item_alpha[min((counter - 1), max_alpha_char)]); - wprintw(menu_win, menu_list[counter].item_string); + wprintw(menu_win, "%s", menu_list[counter].item_string); } else - wprintw(menu_win, more_below_str); + wprintw(menu_win, "%s", more_below_str); } else { @@ -3670,7 +3670,7 @@ help() wrefresh(help_win); werase(com_win); wmove(com_win, 0, 0); - wprintw(com_win, press_any_key_msg); + wprintw(com_win, "%s", press_any_key_msg); wrefresh(com_win); counter = wgetch(com_win); if (counter == -1) @@ -3798,7 +3798,7 @@ int arg; if ((string == NULL) || (*string == '\0')) { wmove(com_win, 0, 0); - wprintw(com_win, file_not_saved_msg); + wprintw(com_win, "%s", file_not_saved_msg); wclrtoeol(com_win); wrefresh(com_win); clear_com_win = TRUE; @@ -3932,7 +3932,7 @@ Format() /* format the paragraph according to set margins */ wmove(com_win, 0, 0); wclrtoeol(com_win); - wprintw(com_win, formatting_msg); + wprintw(com_win, "%s", formatting_msg); wrefresh(com_win); /* @@ -3978,7 +3978,7 @@ Format() /* format the paragraph according to set margins */ wmove(com_win, 0, 0); wclrtoeol(com_win); - wprintw(com_win, formatting_msg); + wprintw(com_win, "%s", formatting_msg); wrefresh(com_win); /* @@ -4053,7 +4053,7 @@ Format() /* format the paragraph according to set margins */ wmove(com_win, 0, 0); wclrtoeol(com_win); - wprintw(com_win, formatting_msg); + wprintw(com_win, "%s", formatting_msg); wrefresh(com_win); /* @@ -4276,7 +4276,7 @@ dump_ee_conf() if (option == 0) { - wprintw(com_win, conf_not_saved_msg); + wprintw(com_win, "%s", conf_not_saved_msg); wrefresh(com_win); return; } @@ -4299,7 +4299,7 @@ dump_ee_conf() init_file = fopen(file_name, "w"); if (init_file == NULL) { - wprintw(com_win, conf_dump_err_msg); + wprintw(com_win, "%s", conf_dump_err_msg); wrefresh(com_win); return; } @@ -4417,7 +4417,7 @@ spell_op() /* check spelling of words in the editor */ command(shell_echo_msg); adv_line(); wmove(com_win, 0, 0); - wprintw(com_win, spell_in_prog_msg); + wprintw(com_win, "%s", spell_in_prog_msg); wrefresh(com_win); command("<>!spell"); /* send contents of buffer to command 'spell' and read the results back into the editor */ @@ -5007,7 +5007,7 @@ restrict_mode() return(FALSE); wmove(com_win, 0, 0); - wprintw(com_win, restricted_msg); + wprintw(com_win, "%s", restricted_msg); wclrtoeol(com_win); wrefresh(com_win); clear_com_win = TRUE; From nobody Thu Jun 27 09:08:22 2024 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 4W8t5g5qBZz5PHBs; Thu, 27 Jun 2024 09:08: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4W8t5g5V9gz4Z08; Thu, 27 Jun 2024 09:08:23 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1719479303; 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=0BQwDq/bO0OlsWnw+xv0s0nZxLfLy7Bo6PR3Zv7YhAY=; b=m4u/iBR2mqJodVs7hpipx3ZVEw7ARItJ/9MZIK1yspRz4wWAc8ox6MFVs5jiHQVovC0Z/+ GxQI6MXba+yUlMh9hxyEg+tISzdCME77jROcOS4swEQEA82crma5h1uBVdWA53pG5ZzUOO Lvf2CuN61qA9TuxN7hCnfrPWfcgFa5qpaG1qu47iV+tKH07O513wzrhv6+1JwAXdHJPTRB br0Tg535EXulC8KL7Pui135Rq5uws4c94oxXXSce9qKH4dvDlbajbOtBUWtsEgT3+8TM7R YhYIjzu32kzm9Kzrm/4woQ52CZ+YT2neV1tWI2mUv2XISGWBIbKG0tu3p7+l9g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1719479303; a=rsa-sha256; cv=none; b=T8mFI94ynLJoVXGVxVTJGyQ8AGruFxVQBYAXXCIw0TvYXtI/6QrDvXSmn9cprpdH3uH+ma xAAPMemDVrGXJA05EtcP1tPhSWAAKvBzjC+2ZkmXK0ITCL9C3NcwODNZrDOZAo1zSp6YZ8 g7E4/Ofdh0pGouo4+ADrZT0wzTLpRJYSxNUh6LcoBuAyJP6KzpGsGMSJeuAvs/hZ3p76RK cONKyfOForE/AKseR2B3KrS1qw3aUKxTtT9POXGeFld2q5H1tCRTg8nOA9rXzuFkbKt7EG 5j0Ped7clzQE77kXqiQi1S3qBM/hUEbJMBR7+VFFHjcBgbQMFE5qCq/+7mcVeA== 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=1719479303; 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=0BQwDq/bO0OlsWnw+xv0s0nZxLfLy7Bo6PR3Zv7YhAY=; b=nvVWjJcQ74dT3B8rRfAdNdbh0IiWnPkXE8+weTFmcCCoMZrUNNEblAiE+MHbmmJDOaGsx6 dCXINunvxwkoqLimLj6bHRepb6gbwr3BWVD8CNcO5wrkyw1DbDf20Rkk7RBe+tWzuOv6BN TaxwsywXDGxhH59iUcop4J2f+QAW6C3TtEd1TGqygMNOj9J20nVr6FkAa9b2vDwMnYwFft oKGKSk3GyOyUmQzxxJFXo0nClk7ZzG0S8wimdlIUp0DmdKuvdBc3660AxFu8KVJmR26mWK MsYbBzm6wMM6WCndmbBnf4K0lqBKe05tIs2zfaE0RqMPRzTDLlU/+KQSqyD53Q== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4W8t5g4w22z1LLn; Thu, 27 Jun 2024 09:08:23 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 45R98NcP028698; Thu, 27 Jun 2024 09:08:23 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 45R98MUU028688; Thu, 27 Jun 2024 09:08:22 GMT (envelope-from git) Date: Thu, 27 Jun 2024 09:08:22 GMT Message-Id: <202406270908.45R98MUU028688@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Baptiste Daroussin Subject: git: 30ef78b46b62 - stable/14 - ncurses: vendor import version 6.5 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 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/14 X-Git-Reftype: branch X-Git-Commit: 30ef78b46b622279c93776140b9cf060817da410 Auto-Submitted: auto-generated The branch stable/14 has been updated by bapt: URL: https://cgit.FreeBSD.org/src/commit/?id=30ef78b46b622279c93776140b9cf060817da410 commit 30ef78b46b622279c93776140b9cf060817da410 Author: Baptiste Daroussin AuthorDate: 2024-06-20 11:15:14 +0000 Commit: Baptiste Daroussin CommitDate: 2024-06-27 09:06:04 +0000 ncurses: vendor import version 6.5 (cherry picked from commit 21817992b3314c908ab50f0bb88d2ee750b9c4ac) --- contrib/ncurses/ANNOUNCE | 909 +- contrib/ncurses/AUTHORS | 6 +- contrib/ncurses/COPYING | 4 +- contrib/ncurses/INSTALL | 316 +- contrib/ncurses/MANIFEST | 15 +- contrib/ncurses/Makefile.in | 25 +- contrib/ncurses/Makefile.os2 | 6 +- contrib/ncurses/NEWS | 1177 ++- contrib/ncurses/README | 41 +- contrib/ncurses/README.emx | 8 +- contrib/ncurses/VERSION | 2 +- contrib/ncurses/aclocal.m4 | 1687 +++- contrib/ncurses/announce.html.in | 1609 ++- contrib/ncurses/config.guess | 1263 ++- contrib/ncurses/config.sub | 828 +- contrib/ncurses/configure | 8956 +++++++++------- contrib/ncurses/configure.in | 310 +- contrib/ncurses/dist.mk | 25 +- contrib/ncurses/doc/hackguide.doc | 48 +- .../doc/html/NCURSES-Programming-HOWTO.html | 7415 -------------- contrib/ncurses/doc/html/announce.html | 2220 ---- contrib/ncurses/doc/html/hackguide.html | 969 -- contrib/ncurses/doc/html/ncurses-intro.html | 3446 ------- contrib/ncurses/doc/ncurses-intro.doc | 182 +- contrib/ncurses/form/Makefile.in | 15 +- contrib/ncurses/form/READ.ME | 8 +- contrib/ncurses/form/fld_def.c | 10 +- contrib/ncurses/form/fld_ftchoice.c | 6 +- contrib/ncurses/form/fld_ftlink.c | 10 +- contrib/ncurses/form/fld_info.c | 12 +- contrib/ncurses/form/fld_just.c | 12 +- contrib/ncurses/form/fld_link.c | 12 +- contrib/ncurses/form/fld_max.c | 8 +- contrib/ncurses/form/fld_move.c | 8 +- contrib/ncurses/form/fld_opts.c | 24 +- contrib/ncurses/form/fld_pad.c | 12 +- contrib/ncurses/form/fld_page.c | 14 +- contrib/ncurses/form/fld_stat.c | 14 +- contrib/ncurses/form/fld_type.c | 12 +- contrib/ncurses/form/fld_user.c | 12 +- contrib/ncurses/form/form.h | 6 +- contrib/ncurses/form/form.priv.h | 18 +- contrib/ncurses/form/frm_cursor.c | 8 +- contrib/ncurses/form/frm_data.c | 23 +- contrib/ncurses/form/frm_def.c | 8 +- contrib/ncurses/form/frm_driver.c | 51 +- contrib/ncurses/form/frm_opts.c | 28 +- contrib/ncurses/form/frm_page.c | 12 +- contrib/ncurses/form/frm_req_name.c | 15 +- contrib/ncurses/form/frm_scale.c | 8 +- contrib/ncurses/form/frm_sub.c | 14 +- contrib/ncurses/form/frm_user.c | 12 +- contrib/ncurses/form/frm_win.c | 14 +- contrib/ncurses/form/fty_enum.c | 46 +- contrib/ncurses/form/fty_generic.c | 6 +- contrib/ncurses/form/fty_int.c | 44 +- contrib/ncurses/form/fty_ipv4.c | 16 +- contrib/ncurses/form/fty_num.c | 20 +- contrib/ncurses/form/fty_regex.c | 35 +- contrib/ncurses/form/llib-lform | 192 +- contrib/ncurses/form/llib-lformt | 192 +- contrib/ncurses/form/llib-lformtw | 198 +- contrib/ncurses/form/llib-lformw | 198 +- contrib/ncurses/include/Caps | 303 +- contrib/ncurses/include/Caps-ncurses | 21 +- contrib/ncurses/include/Caps.aix4 | 297 +- contrib/ncurses/include/Caps.hpux11 | 301 +- contrib/ncurses/include/Caps.keys | 298 +- contrib/ncurses/include/Caps.osf1r5 | 222 +- contrib/ncurses/include/Caps.uwin | 225 +- contrib/ncurses/include/MKkey_defs.sh | 15 +- contrib/ncurses/include/MKncurses_def.sh | 6 +- contrib/ncurses/include/MKterm.h.awk.in | 39 +- contrib/ncurses/include/Makefile.in | 19 +- contrib/ncurses/include/capdefaults.c | 6 +- contrib/ncurses/include/curses.events | 4 +- contrib/ncurses/include/curses.h.in | 116 +- contrib/ncurses/include/curses.tail | 16 +- contrib/ncurses/include/curses.wide | 6 +- contrib/ncurses/include/edit_cfg.sh | 19 +- contrib/ncurses/include/headers | 8 +- contrib/ncurses/include/nc_access.h | 80 + contrib/ncurses/include/nc_alloc.h | 17 +- contrib/ncurses/include/nc_mingw.h | 13 +- contrib/ncurses/include/nc_string.h | 8 +- contrib/ncurses/include/nc_tparm.h | 5 +- contrib/ncurses/include/nc_win32.h | 8 +- contrib/ncurses/include/ncurses_defs | 30 +- contrib/ncurses/include/ncurses_dll.h.in | 10 +- contrib/ncurses/include/ncurses_mingw.h | 14 +- contrib/ncurses/include/term_entry.h | 29 +- contrib/ncurses/include/termcap.h.in | 10 +- contrib/ncurses/include/tic.h | 47 +- contrib/ncurses/include/win32_curses.h | 6 +- contrib/ncurses/install-sh | 671 +- contrib/ncurses/man/MKada_config.in | 139 +- contrib/ncurses/man/MKncu_config.in | 111 +- contrib/ncurses/man/MKterminfo.sh | 18 +- contrib/ncurses/man/Makefile.in | 23 +- contrib/ncurses/man/captoinfo.1m | 274 +- contrib/ncurses/man/clear.1 | 223 +- contrib/ncurses/man/curs_add_wch.3x | 403 +- contrib/ncurses/man/curs_add_wchstr.3x | 115 +- contrib/ncurses/man/curs_addch.3x | 579 +- contrib/ncurses/man/curs_addchstr.3x | 114 +- contrib/ncurses/man/curs_addstr.3x | 156 +- contrib/ncurses/man/curs_addwstr.3x | 157 +- contrib/ncurses/man/curs_attr.3x | 667 +- contrib/ncurses/man/curs_beep.3x | 38 +- contrib/ncurses/man/curs_bkgd.3x | 267 +- contrib/ncurses/man/curs_bkgrnd.3x | 237 +- contrib/ncurses/man/curs_border.3x | 177 +- contrib/ncurses/man/curs_border_set.3x | 256 +- contrib/ncurses/man/curs_clear.3x | 123 +- contrib/ncurses/man/curs_color.3x | 561 +- contrib/ncurses/man/curs_delch.3x | 117 +- contrib/ncurses/man/curs_deleteln.3x | 93 +- contrib/ncurses/man/curs_extend.3x | 85 +- contrib/ncurses/man/curs_get_wch.3x | 346 +- contrib/ncurses/man/curs_get_wstr.3x | 273 +- contrib/ncurses/man/curs_getcchar.3x | 118 +- contrib/ncurses/man/curs_getch.3x | 981 +- contrib/ncurses/man/curs_getstr.3x | 282 +- contrib/ncurses/man/curs_getyx.3x | 108 +- contrib/ncurses/man/curs_in_wch.3x | 73 +- contrib/ncurses/man/curs_in_wchstr.3x | 162 +- contrib/ncurses/man/curs_inch.3x | 97 +- contrib/ncurses/man/curs_inchstr.3x | 137 +- contrib/ncurses/man/curs_initscr.3x | 283 +- contrib/ncurses/man/curs_inopts.3x | 724 +- contrib/ncurses/man/curs_ins_wch.3x | 119 +- contrib/ncurses/man/curs_ins_wstr.3x | 151 +- contrib/ncurses/man/curs_insch.3x | 122 +- contrib/ncurses/man/curs_insstr.3x | 139 +- contrib/ncurses/man/curs_instr.3x | 129 +- contrib/ncurses/man/curs_inwstr.3x | 155 +- contrib/ncurses/man/curs_kernel.3x | 278 +- contrib/ncurses/man/curs_legacy.3x | 132 +- contrib/ncurses/man/curs_memleaks.3x | 113 +- contrib/ncurses/man/curs_mouse.3x | 631 +- contrib/ncurses/man/curs_move.3x | 82 +- contrib/ncurses/man/curs_opaque.3x | 242 +- contrib/ncurses/man/curs_outopts.3x | 216 +- contrib/ncurses/man/curs_overlay.3x | 92 +- contrib/ncurses/man/curs_pad.3x | 302 +- contrib/ncurses/man/curs_print.3x | 55 +- contrib/ncurses/man/curs_printw.3x | 263 +- contrib/ncurses/man/curs_refresh.3x | 148 +- contrib/ncurses/man/curs_scanw.3x | 322 +- contrib/ncurses/man/curs_scr_dump.3x | 171 +- contrib/ncurses/man/curs_scroll.3x | 156 +- contrib/ncurses/man/curs_slk.3x | 445 +- contrib/ncurses/man/curs_sp_funcs.3x | 496 +- contrib/ncurses/man/curs_termattrs.3x | 146 +- contrib/ncurses/man/curs_termcap.3x | 701 +- contrib/ncurses/man/curs_terminfo.3x | 1455 ++- contrib/ncurses/man/curs_threads.3x | 1117 +- contrib/ncurses/man/curs_touch.3x | 109 +- contrib/ncurses/man/curs_trace.3x | 211 +- contrib/ncurses/man/curs_util.3x | 382 +- contrib/ncurses/man/curs_variables.3x | 403 +- contrib/ncurses/man/curs_window.3x | 252 +- contrib/ncurses/man/default_colors.3x | 59 +- contrib/ncurses/man/define_key.3x | 41 +- contrib/ncurses/man/form.3x | 238 +- contrib/ncurses/man/form_cursor.3x | 33 +- contrib/ncurses/man/form_data.3x | 33 +- contrib/ncurses/man/form_driver.3x | 122 +- contrib/ncurses/man/form_field.3x | 57 +- contrib/ncurses/man/form_field_attributes.3x | 81 +- contrib/ncurses/man/form_field_buffer.3x | 79 +- contrib/ncurses/man/form_field_info.3x | 59 +- contrib/ncurses/man/form_field_just.3x | 57 +- contrib/ncurses/man/form_field_new.3x | 62 +- contrib/ncurses/man/form_field_opts.3x | 52 +- contrib/ncurses/man/form_field_userptr.3x | 35 +- contrib/ncurses/man/form_field_validation.3x | 179 +- contrib/ncurses/man/form_fieldtype.3x | 93 +- contrib/ncurses/man/form_hook.3x | 90 +- contrib/ncurses/man/form_new.3x | 42 +- contrib/ncurses/man/form_new_page.3x | 55 +- contrib/ncurses/man/form_opts.3x | 53 +- contrib/ncurses/man/form_page.3x | 71 +- contrib/ncurses/man/form_post.3x | 43 +- contrib/ncurses/man/form_requestname.3x | 44 +- contrib/ncurses/man/form_userptr.3x | 34 +- contrib/ncurses/man/form_variables.3x | 44 +- contrib/ncurses/man/form_win.3x | 60 +- contrib/ncurses/man/infocmp.1m | 611 +- contrib/ncurses/man/infotocap.1m | 104 +- contrib/ncurses/man/key_defined.3x | 31 +- contrib/ncurses/man/keybound.3x | 38 +- contrib/ncurses/man/keyok.3x | 33 +- contrib/ncurses/man/legacy_coding.3x | 90 +- contrib/ncurses/man/make_sed.sh | 43 +- .../man/{man_db.renames => man_db.renames.in} | 143 +- contrib/ncurses/man/manhtml.aliases | 68 +- contrib/ncurses/man/manhtml.externs | 28 +- contrib/ncurses/man/manlinks.sed | 40 +- contrib/ncurses/man/menu.3x | 210 +- contrib/ncurses/man/menu_attributes.3x | 108 +- contrib/ncurses/man/menu_cursor.3x | 33 +- contrib/ncurses/man/menu_driver.3x | 57 +- contrib/ncurses/man/menu_format.3x | 44 +- contrib/ncurses/man/menu_hook.3x | 79 +- contrib/ncurses/man/menu_items.3x | 58 +- contrib/ncurses/man/menu_mark.3x | 46 +- contrib/ncurses/man/menu_new.3x | 42 +- contrib/ncurses/man/menu_opts.3x | 49 +- contrib/ncurses/man/menu_pattern.3x | 45 +- contrib/ncurses/man/menu_post.3x | 46 +- contrib/ncurses/man/menu_requestname.3x | 42 +- contrib/ncurses/man/menu_spacing.3x | 78 +- contrib/ncurses/man/menu_userptr.3x | 32 +- contrib/ncurses/man/menu_win.3x | 60 +- contrib/ncurses/man/mitem_current.3x | 65 +- contrib/ncurses/man/mitem_name.3x | 38 +- contrib/ncurses/man/mitem_new.3x | 42 +- contrib/ncurses/man/mitem_opts.3x | 51 +- contrib/ncurses/man/mitem_userptr.3x | 33 +- contrib/ncurses/man/mitem_value.3x | 43 +- contrib/ncurses/man/mitem_visible.3x | 27 +- contrib/ncurses/man/ncurses.3x | 3402 ++++--- contrib/ncurses/man/new_pair.3x | 104 +- contrib/ncurses/man/panel.3x | 349 +- contrib/ncurses/man/resizeterm.3x | 165 +- contrib/ncurses/man/scr_dump.5 | 427 +- contrib/ncurses/man/tabs.1 | 323 +- contrib/ncurses/man/term.5 | 247 +- contrib/ncurses/man/term.7 | 122 +- contrib/ncurses/man/term_variables.3x | 145 +- contrib/ncurses/man/terminfo.head | 132 +- contrib/ncurses/man/terminfo.tail | 1188 ++- contrib/ncurses/man/tic.1m | 541 +- contrib/ncurses/man/toe.1m | 324 +- contrib/ncurses/man/tput.1 | 1345 ++- contrib/ncurses/man/tset.1 | 463 +- contrib/ncurses/man/user_caps.5 | 231 +- contrib/ncurses/man/wresize.3x | 56 +- contrib/ncurses/menu/Makefile.in | 17 +- contrib/ncurses/menu/READ.ME | 6 +- contrib/ncurses/menu/llib-lmenu | 98 +- contrib/ncurses/menu/llib-lmenut | 98 +- contrib/ncurses/menu/llib-lmenutw | 98 +- contrib/ncurses/menu/llib-lmenuw | 98 +- contrib/ncurses/menu/m_attribs.c | 38 +- contrib/ncurses/menu/m_cursor.c | 10 +- contrib/ncurses/menu/m_driver.c | 18 +- contrib/ncurses/menu/m_format.c | 7 +- contrib/ncurses/menu/m_global.c | 48 +- contrib/ncurses/menu/m_hook.c | 44 +- contrib/ncurses/menu/m_item_cur.c | 16 +- contrib/ncurses/menu/m_item_nam.c | 12 +- contrib/ncurses/menu/m_item_new.c | 34 +- contrib/ncurses/menu/m_item_opt.c | 28 +- contrib/ncurses/menu/m_item_top.c | 16 +- contrib/ncurses/menu/m_item_val.c | 18 +- contrib/ncurses/menu/m_item_vis.c | 8 +- contrib/ncurses/menu/m_items.c | 18 +- contrib/ncurses/menu/m_new.c | 18 +- contrib/ncurses/menu/m_pad.c | 14 +- contrib/ncurses/menu/m_pattern.c | 12 +- contrib/ncurses/menu/m_post.c | 64 +- contrib/ncurses/menu/m_req_name.c | 15 +- contrib/ncurses/menu/m_scale.c | 10 +- contrib/ncurses/menu/m_sub.c | 12 +- contrib/ncurses/menu/m_win.c | 12 +- contrib/ncurses/misc/Makefile.in | 32 +- contrib/ncurses/misc/csort | 6 +- contrib/ncurses/misc/gen-pkgconfig.in | 24 +- contrib/ncurses/misc/gen_edit.sh | 12 +- contrib/ncurses/misc/magic | 6 +- contrib/ncurses/misc/makedef.cmd | 8 +- contrib/ncurses/misc/makellib | 40 +- contrib/ncurses/misc/ncu2openbsd | 1288 +++ contrib/ncurses/misc/ncurses-config.in | 32 +- contrib/ncurses/misc/run_tic.in | 43 +- contrib/ncurses/misc/shlib | 8 +- contrib/ncurses/misc/tdlint | 24 +- contrib/ncurses/misc/terminfo.src | 10094 ++++++++++--------- contrib/ncurses/mk-0th.awk | 12 +- contrib/ncurses/mk-1st.awk | 100 +- contrib/ncurses/mk-2nd.awk | 6 +- contrib/ncurses/mk-hdr.awk | 8 +- contrib/ncurses/ncurses/Makefile.in | 50 +- contrib/ncurses/ncurses/README.IZ | 6 +- contrib/ncurses/ncurses/base/MKlib_gen.sh | 23 +- contrib/ncurses/ncurses/base/MKunctrl.awk | 7 +- contrib/ncurses/ncurses/base/key_defined.c | 7 +- contrib/ncurses/ncurses/base/keyok.c | 6 +- contrib/ncurses/ncurses/base/lib_addch.c | 35 +- contrib/ncurses/ncurses/base/lib_addstr.c | 32 +- contrib/ncurses/ncurses/base/lib_bkgd.c | 4 +- contrib/ncurses/ncurses/base/lib_clreol.c | 8 +- contrib/ncurses/ncurses/base/lib_color.c | 82 +- contrib/ncurses/ncurses/base/lib_delwin.c | 38 +- contrib/ncurses/ncurses/base/lib_dft_fgbg.c | 8 +- contrib/ncurses/ncurses/base/lib_echo.c | 8 +- contrib/ncurses/ncurses/base/lib_endwin.c | 28 +- contrib/ncurses/ncurses/base/lib_erase.c | 6 +- contrib/ncurses/ncurses/base/lib_freeall.c | 11 +- contrib/ncurses/ncurses/base/lib_getch.c | 63 +- contrib/ncurses/ncurses/base/lib_getstr.c | 35 +- contrib/ncurses/ncurses/base/lib_insnstr.c | 9 +- contrib/ncurses/ncurses/base/lib_instr.c | 8 +- contrib/ncurses/ncurses/base/lib_mouse.c | 153 +- contrib/ncurses/ncurses/base/lib_mvwin.c | 8 +- contrib/ncurses/ncurses/base/lib_newterm.c | 7 +- contrib/ncurses/ncurses/base/lib_newwin.c | 8 +- contrib/ncurses/ncurses/base/lib_nl.c | 8 +- contrib/ncurses/ncurses/base/lib_overlay.c | 16 +- contrib/ncurses/ncurses/base/lib_pad.c | 12 +- contrib/ncurses/ncurses/base/lib_refresh.c | 24 +- contrib/ncurses/ncurses/base/lib_restart.c | 17 +- contrib/ncurses/ncurses/base/lib_screen.c | 61 +- contrib/ncurses/ncurses/base/lib_set_term.c | 51 +- contrib/ncurses/ncurses/base/lib_slk.c | 8 +- contrib/ncurses/ncurses/base/lib_slkinit.c | 7 +- contrib/ncurses/ncurses/base/lib_slkrefr.c | 6 +- contrib/ncurses/ncurses/base/lib_wattron.c | 8 +- contrib/ncurses/ncurses/base/lib_window.c | 10 +- contrib/ncurses/ncurses/base/new_pair.c | 6 +- contrib/ncurses/ncurses/base/resizeterm.c | 14 +- contrib/ncurses/ncurses/base/safe_sprintf.c | 36 +- contrib/ncurses/ncurses/base/tries.c | 7 +- contrib/ncurses/ncurses/base/vsscanf.c | 11 +- contrib/ncurses/ncurses/base/wresize.c | 10 +- contrib/ncurses/ncurses/curses.priv.h | 508 +- contrib/ncurses/ncurses/llib-lncurses | 1420 +-- contrib/ncurses/ncurses/llib-lncursest | 1422 +-- contrib/ncurses/ncurses/llib-lncursestw | 1888 ++-- contrib/ncurses/ncurses/llib-lncursesw | 1886 ++-- contrib/ncurses/ncurses/llib-ltic | 54 +- contrib/ncurses/ncurses/llib-ltict | 54 +- contrib/ncurses/ncurses/llib-ltictw | 52 +- contrib/ncurses/ncurses/llib-lticw | 52 +- contrib/ncurses/ncurses/llib-ltinfo | 372 +- contrib/ncurses/ncurses/llib-ltinfot | 374 +- contrib/ncurses/ncurses/llib-ltinfotw | 370 +- contrib/ncurses/ncurses/llib-ltinfow | 368 +- contrib/ncurses/ncurses/new_pair.h | 13 +- contrib/ncurses/ncurses/report_offsets.c | 59 +- contrib/ncurses/ncurses/term.priv.h | 364 + contrib/ncurses/ncurses/tinfo/MKcaptab.sh | 5 +- contrib/ncurses/ncurses/tinfo/MKfallback.sh | 7 +- contrib/ncurses/ncurses/tinfo/MKkeys_list.sh | 10 +- contrib/ncurses/ncurses/tinfo/access.c | 127 +- contrib/ncurses/ncurses/tinfo/add_tries.c | 7 +- contrib/ncurses/ncurses/tinfo/alloc_entry.c | 206 +- contrib/ncurses/ncurses/tinfo/alloc_ttype.c | 122 +- contrib/ncurses/ncurses/tinfo/captoinfo.c | 16 +- contrib/ncurses/ncurses/tinfo/comp_error.c | 23 +- contrib/ncurses/ncurses/tinfo/comp_expand.c | 16 +- contrib/ncurses/ncurses/tinfo/comp_hash.c | 21 +- contrib/ncurses/ncurses/tinfo/comp_parse.c | 140 +- contrib/ncurses/ncurses/tinfo/comp_scan.c | 84 +- contrib/ncurses/ncurses/tinfo/db_iterator.c | 24 +- contrib/ncurses/ncurses/tinfo/doalloc.c | 11 +- contrib/ncurses/ncurses/tinfo/entries.c | 30 +- contrib/ncurses/ncurses/tinfo/free_ttype.c | 18 +- contrib/ncurses/ncurses/tinfo/init_keytry.c | 8 +- contrib/ncurses/ncurses/tinfo/lib_cur_term.c | 17 +- contrib/ncurses/ncurses/tinfo/lib_data.c | 28 +- contrib/ncurses/ncurses/tinfo/lib_kernel.c | 48 +- contrib/ncurses/ncurses/tinfo/lib_longname.c | 7 +- contrib/ncurses/ncurses/tinfo/lib_napms.c | 7 +- contrib/ncurses/ncurses/tinfo/lib_options.c | 6 +- contrib/ncurses/ncurses/tinfo/lib_print.c | 9 +- contrib/ncurses/ncurses/tinfo/lib_raw.c | 60 +- contrib/ncurses/ncurses/tinfo/lib_setup.c | 278 +- contrib/ncurses/ncurses/tinfo/lib_termcap.c | 6 +- contrib/ncurses/ncurses/tinfo/lib_tgoto.c | 16 +- contrib/ncurses/ncurses/tinfo/lib_tparm.c | 681 +- contrib/ncurses/ncurses/tinfo/lib_tputs.c | 50 +- contrib/ncurses/ncurses/tinfo/lib_win32con.c | 1294 ++- contrib/ncurses/ncurses/tinfo/lib_win32util.c | 28 +- contrib/ncurses/ncurses/tinfo/make_hash.c | 6 +- contrib/ncurses/ncurses/tinfo/make_keys.c | 12 +- contrib/ncurses/ncurses/tinfo/obsolete.c | 99 +- contrib/ncurses/ncurses/tinfo/parse_entry.c | 78 +- contrib/ncurses/ncurses/tinfo/read_entry.c | 110 +- contrib/ncurses/ncurses/tinfo/read_termcap.c | 36 +- contrib/ncurses/ncurses/tinfo/strings.c | 6 +- contrib/ncurses/ncurses/tinfo/tinfo_driver.c | 19 +- contrib/ncurses/ncurses/tinfo/trim_sgr0.c | 14 +- contrib/ncurses/ncurses/tinfo/write_entry.c | 118 +- contrib/ncurses/ncurses/trace/lib_trace.c | 99 +- contrib/ncurses/ncurses/trace/lib_traceatr.c | 26 +- contrib/ncurses/ncurses/trace/lib_tracechr.c | 16 +- contrib/ncurses/ncurses/trace/lib_tracedmp.c | 8 +- contrib/ncurses/ncurses/trace/trace_buf.c | 10 +- contrib/ncurses/ncurses/trace/varargs.c | 12 +- contrib/ncurses/ncurses/trace/visbuf.c | 12 +- contrib/ncurses/ncurses/tty/MKexpanded.sh | 9 +- contrib/ncurses/ncurses/tty/hardscroll.c | 47 +- contrib/ncurses/ncurses/tty/hashmap.c | 11 +- contrib/ncurses/ncurses/tty/lib_mvcur.c | 59 +- contrib/ncurses/ncurses/tty/lib_tstp.c | 24 +- contrib/ncurses/ncurses/tty/lib_twait.c | 25 +- contrib/ncurses/ncurses/tty/lib_vidattr.c | 6 +- contrib/ncurses/ncurses/tty/tty_update.c | 41 +- contrib/ncurses/ncurses/wcwidth.h | 18 +- contrib/ncurses/ncurses/widechar/lib_add_wch.c | 18 +- contrib/ncurses/ncurses/widechar/lib_cchar.c | 14 +- contrib/ncurses/ncurses/widechar/lib_erasewchar.c | 34 +- contrib/ncurses/ncurses/widechar/lib_get_wch.c | 6 +- contrib/ncurses/ncurses/widechar/lib_get_wstr.c | 53 +- contrib/ncurses/ncurses/widechar/lib_ins_wch.c | 13 +- contrib/ncurses/ncurses/widechar/lib_key_name.c | 19 +- contrib/ncurses/ncurses/widechar/lib_pecho_wchar.c | 6 +- contrib/ncurses/ncurses/widechar/lib_unget_wch.c | 6 +- contrib/ncurses/ncurses/widechar/lib_vid_attr.c | 6 +- contrib/ncurses/ncurses/win32con/gettimeofday.c | 6 +- contrib/ncurses/ncurses/win32con/win32_driver.c | 12 +- contrib/ncurses/ncurses/win32con/win_driver.c | 97 +- contrib/ncurses/panel/Makefile.in | 17 +- contrib/ncurses/panel/llib-lpanel | 22 +- contrib/ncurses/panel/llib-lpanelt | 22 +- contrib/ncurses/panel/llib-lpaneltw | 22 +- contrib/ncurses/panel/llib-lpanelw | 22 +- contrib/ncurses/panel/p_bottom.c | 6 +- contrib/ncurses/panel/p_new.c | 8 +- contrib/ncurses/panel/p_show.c | 6 +- contrib/ncurses/panel/p_user.c | 6 +- contrib/ncurses/progs/MKtermsort.sh | 37 +- contrib/ncurses/progs/Makefile.in | 61 +- contrib/ncurses/progs/capconvert | 45 +- contrib/ncurses/progs/clear.c | 6 +- contrib/ncurses/progs/dump_entry.c | 86 +- contrib/ncurses/progs/dump_entry.h | 7 +- contrib/ncurses/progs/infocmp.c | 163 +- contrib/ncurses/progs/modules | 10 +- contrib/ncurses/progs/progs.priv.h | 153 +- contrib/ncurses/progs/reset_cmd.c | 305 +- contrib/ncurses/progs/reset_cmd.h | 8 +- contrib/ncurses/progs/tabs.c | 223 +- contrib/ncurses/progs/tic.c | 622 +- contrib/ncurses/progs/toe.c | 85 +- contrib/ncurses/progs/tparm_type.c | 13 +- contrib/ncurses/progs/tparm_type.h | 6 +- contrib/ncurses/progs/tput.c | 195 +- contrib/ncurses/progs/tset.c | 39 +- contrib/ncurses/progs/tty_settings.c | 12 +- contrib/ncurses/test/back_ground.c | 300 - contrib/ncurses/test/dup_field.c | 394 - contrib/ncurses/test/move_field.c | 524 - contrib/ncurses/test/test_tparm.c | 388 - lib/ncurses/config.mk | 4 +- lib/ncurses/tinfo/Makefile | 5 + lib/ncurses/tinfo/ncurses_cfg.h | 60 +- usr.bin/ncurses/Makefile | 6 +- 451 files changed, 48795 insertions(+), 50440 deletions(-) diff --git a/contrib/ncurses/ANNOUNCE b/contrib/ncurses/ANNOUNCE index e0603d622394..6abf551c684d 100644 --- a/contrib/ncurses/ANNOUNCE +++ b/contrib/ncurses/ANNOUNCE @@ -1,4 +1,4 @@ - Announcing ncurses 6.2 + Announcing ncurses 6.5 Overview @@ -40,19 +40,19 @@ Overview The ncurses distribution is available at ncurses' homepage: - ftp://ftp.invisible-island.net/ncurses/ or + https://invisible-island.net/archives/ncurses/ or https://invisible-mirror.net/archives/ncurses/ . - It is also available via anonymous FTP at the GNU distribution site + It is also available at the GNU distribution site - ftp://ftp.gnu.org/gnu/ncurses/ . + https://ftp.gnu.org/gnu/ncurses/ . Release Notes - These notes are for ncurses 6.2, released February 12, 2020. + These notes are for ncurses 6.5, released April 27, 2024. This release is designed to be source-compatible with ncurses 5.0 - through 6.1; providing extensions to the application binary interface + through 6.4; providing extensions to the application binary interface (ABI). Although the source can still be configured to support the ncurses 5 ABI, the reason for the release is to reflect improvements to the ncurses 6 ABI and the supporting utility programs. @@ -60,340 +60,192 @@ Release Notes There are, of course, numerous other improvements, listed in this announcement. - The most important bug-fixes/improvements dealt with user-defined - capabilities in terminal descriptions. The release notes also mention - some other bug-fixes, but are focused on new features and improvements - to existing features since ncurses 6.1 release. + The most important bug-fixes/improvements dealt with robustness + issues. The release notes also mention some other bug-fixes, but are + focused on new features and improvements to existing features since + ncurses 6.4 release. Library improvements New features - There are several new features: - * O_EDGE_INSERT_STAY tells the form library to optionally delay - cursor movement on a field edge/boundary - * O_INPUT_FIELD extension to form library allows a dynamic field to - shrink if the new limit is smaller than the current field size. - * added exit_curses and exit_terminfo to replace internal symbols - for leak-checking. - * added curses_trace, to replace trace(). - - Additionally, to improve performance other changes (and extensions) - are provided in this release: - * mouse decoding now handles shift/control/alt logic when decoding - xterm's 1006 mode - * ncurses now defines a limit for wgetnstr, wgetn_wstr when length - is negative or "too large". - * reordered loop-limit checks in winsnstr in case the string has no - terminating null and only the number of characters is used. - * there is now no buffer-size limit when reading the $TERMCAP - variable. - * the $TERMCAP variable may be interpreted as a fallback to a - terminfo entry - * mvcur now decides whether to use hard-tabs, using xt, tbc and hts - as clues. - * extended colors are improved by modifying an internal call to - vid_puts to pass extended color pairs e.g., from tty_update.c and - lib_mvcur.c - * the initialization functions now avoid relying upon persistent - data for the result from getenv - * scrolling is improved: - + a limit check in newline_forces_scroll handles the case where - the row is inside scroll-margins, but not at the end. - + improved loop limits in _nc_scroll_window handle a case where - the scrolled data is a pad which is taller than the window. + These are new features: + * The low-level terminfo and termcap interfaces are used both by the + higher-level curses library, as well as by many applications. + The functions which convert parameterized terminal capability + strings for output to the terminal (tiparm and tparm) analyze the + capability string to determine which parameters are strings (i.e., + addresses), versus numbers (not addresses). + The library's analysis of a capability string may differ from the + calling application's design if environment variables are used to + point to an invalid terminal database. This is a longstanding + problem with all implementations of terminfo, dating from the + early 1980s. + Two new functions address this problem: by providing a function + which allows the calling application to tell ncurses how many + string-parameters to expect: + + tiscan_s helps applications check formatting capabilities + that would be passed to tiparm_s. + + tiparm_s provides applications a way to tell ncurses what the + expected parameters are for a capability. + * The ncurses library supports a compile-time feature (enabled with + the configure --enable-check-size option) which simplifies + initialization with terminals which do not negotiate window + (screen) size. This is done in setupterm, by providing for using + ANSI cursor-position report (in user6/user7 terminfo capabilities) + to obtain the screen size if neither environment variables or + ioctl is used. + The ncurses test-program with options "-E -T" demonstrates this + feature. + * add functions to query tty-flags in SCREEN + + This release drops compatibility with obsolete versions of tack, e.g., + pre-1.08 Other improvements - These are revised features: - * used "const" in some prototypes rather than NCURSES_CONST where - X/Open Curses was updated to do this, e.g., wscanw, newterm, the - terminfo interface. Also use "const" for consistency in the - termcap interface, which was withdrawn by X/Open Curses in Issue 5 - (2007). As of Issue 7, X/Open Curses still lacks "const" for - certain return values, e.g., keyname. - * modified wbkgd and wbkgrnd to improve compatibility with SVr4 - curses, changing the way the window rendition is updated when the - background character is modified - * improved terminfo write/read by modifying the fourth item of the - extended header to denote the number of valid strings in the - extended string table (see term(5)). - * modified the initialization checks for mouse so that the - xterm+sm+1006 block will work with terminal descriptions not - mentioning xterm. - - These were done to limit or ultimately deprecate features: - * deprecated safe-sprintf, since the vsnprintf function, which does - what was needed, was standardized long ago. - * marked vwprintw and vwscanw as deprecated; recommend using - vw_printw and vw_scanw, respectively. - * added deprecation warnings for internal functions called by older - versions of tack. - * removed unused _nc_import_termtype2 function. - These are improvements to existing features: - * check parameter of set_escdelay, return ERR if negative. - * check parameter of set_tabsize, return ERR if not greater than - zero - * correct a status-check in _nc_read_tic_entry() so that if reading - a hex/b64 $TERMINFO, and the $TERM does not match, fall-through to - the compiled-in search list. - * amend check for repeat_char to handle a case where setlocale() was - called after initscr - * move macro for is_linetouched inside NCURSES_NOMACROS ifndef. - * use _nc_copy_termtype2 rather than direct assignment in setupterm, - in case it is called repeatedly using fallback terminfo - descriptions - * improve workaround for Solaris wcwidth versus line-drawing - characters - * add checks in repair_subwindows to keep the current position and - scroll-margins inside the resized subwindow. - * correct a buffer-limit in write_entry.c for systems that use - caseless filenames. - * improved build-time utility report_offsets: - + add categories, e.g., "w" for wide-character, "t" for threads - to make the report more readable. Reorganized the structures - reported to make the categories more apparent. - + add NCURSES_GLOBALS and NCURSES_PRESCREEN to report to show - how similar the different libtinfo configurations are. - * modified some header files to ensure that those include necessary - files except for the previously-documented cases - * added some traces in initialization to show whether a fallback - entry is used. - * made minor optimization to reduce calls to _nc_reserve_pairs + * In addition to the new, safer function tiparm_s, ncurses adds + checks to make the older tiparm, tparm and tgoto functions safer: + + the terminfo functions tiparm and tparm ensure that the + capability string comes from the terminal description which + ncurses loads, rather than from random data which the + application happens to have. + + the tgoto function disallows capabilities which its analysis + shows will attempt to use string parameters. + + ncurses uses internal functions which correspond to tiparm, + and tgoto which ensure that the capability strings which are + passed to these functions come from the loaded terminal + description. + * improve check in lib_tparm.c, ensuring that a char* fits into a + TPARM_ARG + * modify _nc_syserr_abort to use _nc_env_access, rather than only + checking root uid + * improve thread lock in lib_trace.c + * modify flushinp to use file descriptors in SCREEN, rather than + from TERMINAL, and check if they are for a terminal, like SVr4 + * modify mcprint to use file descriptor in SCREEN, for consistency + * modify internal function _nc_read_file_entry to show relevant + filename in warnings + * improve checks in internal function convert_string for corrupt + terminfo entry + * review/improve handling of out-of-memory conditions + * limit delays to 30 seconds, i.e., padding delays in terminfo, as + well as napms and delay_output functions + * fix reallocation loop for vsnprintf in _nc_sprintf_string by + copying the va_list variable + * modify delscreen to limit the windows which it creates to just + those associated with the screen + * modify endwin to return an error if it is called again without an + intervening screen update + * modify wenclose to handle pads + * eliminate use of PATH_MAX in lib_trace.c + * provide for any CCHARW_MAX greater than 1 These are corrections to existing features: - * fix a special case in PutAttrChar where a cell is marked as - alternate-character set, but the terminal does not actually - support the given graphic character. This would happen in an older - terminal such as vt52, which lacks most line-drawing capability. - * corrected flag for "seq" method of db 1.8.5 interface, needed by - toe on some of the BSDs. - * modify comparison in make_hash.c to correct a special case in - collision handling for Caps-hpux11 - * add extended_slk_color{,_sp} symbols to the appropriate - package/*.{map,sym} files - * modify lib_setup to avoid calling pthread_self() without first - verifying that the address is valid, i.e., for weak symbols - * add a couple of broken-linker symbols to the list of versioned - symbols to help with link-time optimization versus weak symbols. + * correct loop termination condition in waddnstr and waddnwstr + * improve parsing in internal function _nc_msec_cost, allowing a + single decimal point + * amend parameter check for entire string versus specific length in + winsnstr and wins_nwstr to match Solaris; make similar correction + to wins_nwstr + * correct internal function wadd_wch_literal when adding a + non-spacing character to a double-width character + * correct definition of Charable macro for non-wide ncurses library + . Program improvements - Several improvements were made to the utility programs: - - clear - - + improved logic for clearing with the E3 extension, in case - the terminal scrolls content onto its saved-lines before - actually clearing the display, by clearing the saved-lines - after clearing the display + Several improvements were made to the utility programs. Some were done + to make the infocmp option "-u" option help refactor the terminal + database. infocmp - + omit filtering of "OTxx" names which are used for obsolete - capabilities, when the output is sorted by long-names. This - change helps when making a table of the short/long capability - names. + + add limit checks for processing extended capabilities with + the "-u" option + + correct initial alignment of extended capabilities, so that + the "-u" option can be used for more than two terminal types + + modify "-u" option to not report cancels for strings which + were already cancelled in a use'd chunk. + + correct an assignment "-u" for detecting if a boolean is + unset in a base entry and set in a use'd chunk, i.e., if it + was cancelled. tic - + added check for consistent alternate character set - capabilities. - + added check for paired indn/rin. - + added check for terminals with parm_dch vs parm_ich. - + added check for the case where setf/setb are given using - different strings, but provide identical results to - setaf/setab. - + corrected check for ich1. - + changed a too-large terminal entry from a fatal error to a - warning. - - toe - - + ignores any hex/b64 $TERMINFO value in the list of terminfo - databases. - - tset - - + replace check in reset command for obsolete "pt" capability - using tbc and hts capabilities as clues - + modify reset to allow for tabstops at intervals other than 8. - + change reset's behavior for margins to simply clear - soft-margins if possible, rather than clearing and then - setting them according to the terminal's width. - - tput - - + add "x" to getopt string so that "tput -x clear" works. - - Several changes were made to the generated ncurses*config scripts and - the analogous ".pc" files to reduce differences between the - configurations they report: - * modified the ncurse*-config and pc-files to more closely match for - the -I and -l options. - * filtered out linker-specs from the --libs report. - * amended the ncurses*-config and pc-files to take into account the - rpath hack which differed between those files. - * modified generated ncurses*config and ncurses.pc, ncursesw.pc, - etc., to list helper libraries such as gpm for static linking. + + correct limit-check when dumping tc/use clause via "-I" + + check return value of _nc_save_str, in special case where + extended capabilities are processed but the terminal + description was not initialized + + modify check for multiply defined aliases to report problems + within the current runtime rather than for conflicts with + pre-existing terminal descriptions. + + disallow using $TERMINFO or $HOME/.terminfo when "-o" option + is used + + tput and tset + + + add "-v" option to tput, to show warnings + + modify reset command to avoid altering clocal if the terminal + uses a modem + + modify reset feature to avoid 1-second sleep if running in a + pseudo-terminal Examples Along with the library and utilities, improvements were made to the - ncurses-examples. Most of this activity aimed at improving the - test-packages. A few changes are more generally useful, e.g., for the - main ncurses test-program, and for analyzing traces using the - tracemunch script: - * improve recovery from error when reading command-character in - test/ncurses.c, showing the relevant error message and not exiting - on EINTR. - * improve tracemunch, by keeping track of TERMINAL* values, and if - tracing was first turned on after initialization, attempt to show - distinct screen, window and terminal names anyway. - * modify tracemunch to accept filename parameters in addition to use - as a pipe/filter. - * update tracemunch to work with perl 5.26.2, which changed the - rules for escaping regular expressions. - * add some checks in tracemunch for undefined variables. - * modify TurnOn/TurnOff macros (in lib_vidattr.c and lib_vid_attr.c) - to avoid expansion of "CUR" in trace. - - There are other new demo/test programs and reusable examples: - - color_content - Demonstrate the color_content and extended_color_content - functions. - - demo_tabs - A simple demo of tabs in curses. - - dump_window - A portable curses screen-dump, used to compare ncurses screen - contents with Solaris. - - pair_content - Demonstrate the pair_content and extended_pair_content - functions. - - report_hashing - Check hash-tables used for terminfo and termcap names. - - parse_rgb - Sample implementation of the ncurses RGB extension from - user_caps.5, used in picsmap and savescreen programs. - - A variety of improvements were made to existing programs, both new - features as well as options added to make the set of programs more - consistent. - * add "-l" option to test/background, to dump screen contents in a - form that lets different curses implementations be compared. - * add "@" command to test/ncurses F-test, to allow rapid jump to - different character pages. - * added enum, regex examples to test/demo_forms - * amend Scaled256() macro in test/picsmap.c to cover the full range - 0..1000 - * corrected pathname used in Ada95 sample programs for explain.txt, - to work with test-packages, and used an awk script to split the - resulting pathname when it would be too long for a single line. - * ignore interrupted system-call in test/ncurses's command-line, - e.g., if the terminal were resized. - * improved ifdef's for TABSIZE variable, to help with AIX/HPUX - ports. + ncurses-examples: + * modify test_tparm to account for extended capabilities + * corrected mouse mask in test/testcurs.c + * modify test/clip_printw.c to optionally test non-wrapped updates + * modify test/test_mouse.c to use curses api for raw/noraw + * modify test/clip_printw.c to optionally test non-wrapped updates + + There is one new demo/test programs: + + test/test_endwin.c + This program shows the return-status from endwin with different + combinations of endwin (repeated), initscr, newterm. Terminal database There are several new terminal descriptions: - - alacritty, domterm, kitty, mintty, mintty-direct, ms-terminal, - n7900, nsterm-build309, nsterm-direct, screen5, ti703, ti707, - ti703-w, ti707-w vscode, vscode-direct, xterm-mono, xterm.js + * ansi+apparrows + * contour + * linux+kbs for terminals which imitate xterm's behavior with Linux + * rio, rio-direct + * mostlike + * ms-vt100-16color, winconsole + * vt100+noapp, vt100+noapp+pc, xterm+app+pc, xterm+decedit from + xterm #389 + * putty+cursor to reflect amending of modified cursor-keys in 2021 + * wezterm There are many changes to existing terminal descriptions. Some were - updates to several descriptions: - * use ansi+rep in a dozen places - * add rs1 to konsole, mlterm - * improve several flash capabilities with trailing mandatory delays - * drop ich1 from rxvt-basic, Eterm and mlterm to improve - compatibility with old non-curses programs - * add/use xterm+keypad in xterm-new - * use xterm+sl-twm for consistency, nine places - * improve xm example in xterm+x11mouse and xterm+sm_1006. - - while others affected specific descriptions. These were retested, to - take into account changes by their developers: - - terminator, st - - while these are specific fixes based on reviewing documentation, user - reports, or warnings from tic: - - adds200: - - + fix typo - - gnome-256color - - + base entry on "gnome", not "vte", for consistency - - interix - - + trim unnecessary setf/setb - - linux-16color - - + accommodate Linux console driver incompatibility introduced - in early 2018 - - nsterm-256color: - - + add nsterm-build309 to replace nsterm-256color, assigning the - latter as an alias of nsterm, to make mouse work with - nsterm-256color - - regent40: - - + renumber function-keys to match manual - - regent60: - - + add cd (clr_eos) - + corrected acsc - + add shifted function-keys - - tvi950: - - + added function-key definitions to agree with Televideo 950 - manual - + corrected acsc - + remove bogus kf0 - + add bel - - tvi955: - - + fix typo - - vi200: - - + add acsc string, including right/down-arrow - - wy50: - - + corrected acsc - - wy50 and wy60: - - + add shifted function-keys as kF1 to kF16 - - xterm+x11hilite: - - + eliminate unused p5 parameter. - - A few entries use extensions (user-defined terminal capabilities): - * use xterm+sm+1006 (aka "SGR 1006 mouse") for konsole-base and - putty - * add Smol/Rmol user-defined capability to tmux and vte-2018 - * add Smulx user-defined capability to tmux, vte-2018 + updates to several descriptions, using the infocmp "-u" option in a + script to determine which building-block entries could be used to + replace multiple capability settings (and trim redundant information). + + Other changes include: + * document XF, kxIN and kxOUT + * add note on sun regarding wscons/cmdtool/shelltool + * remove DECCOLM+DECSCLM from foot + * add xterm+focus to foot+base + * add ecma+strikeout to putty + * use CSI 3J in vte-2017 + * use oldxterm+sm+1006 in vte-2014 + * modify xgterm to work around line-drawing bug *** 164498 LINES SKIPPED *** From nobody Thu Jun 27 09:08:24 2024 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 4W8t5j1zmMz5PHC4; Thu, 27 Jun 2024 09:08: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4W8t5h6YrPz4YsL; Thu, 27 Jun 2024 09:08:24 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1719479304; 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=t1rutC+9tIxwRTapXzmLs9JMm3jMXYIN9Q42EUUe8Mk=; b=cPh9VDPRRsnnQ3qphfI5kJucQMJB1Gj2sgcdVdsjbCb0mRLsCXNH2mdZqpCqXyHICuwiOC XR0T5kKSJ6yLl7k4JA/jmhP4tTNgsadpRoSzegx3EHUEHhhM9U6vmpsCSYPOguSIB33nWE 6QI3iAHjcaQ7faSp4F0HnQSDg4r4Ie9AfCeXRHwZtMbj56s3AGnzQjn2J8llhWPJPMQz7a RNcaE6es41W2hCiTuaA4Opv5ygCLlX3YtQxsOLIpRZCckAR1+hkos/mIJI1izmEI9Y4KLT ZpOr5odYAL6c1jBrml5CQqZ7rcf3l4zmemZHsrUFz8N+lclAdzm/Gd3RUQ6Jlg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1719479304; a=rsa-sha256; cv=none; b=q18bJSBo3kPa1eIAlb+HEd8cSVfNy4hMeDaY95Fnp+mu0aGh3fnf6vM5TgQknuJg8I4Sxb 3BoXbWUnzNk6jbPqWPKOPize/vIqLEAnKXvd0XwIVOZyS9/pdbEG7DLD5MtG/s+l3Bt7ru ZYDS/mLgn+2RiYtH3Pjd9rvN2taQpi5Th4z/jzcEd2emSXE6aG6TunBzxHuaRou1NOC7d7 tcKYt9Y+G3Cz8+cVGdUZJinBnWa3x/MeIcCJEwbotwKiuerymWMhtZEl+SW/xdK75F9okX kEWldz4ee/uaNxlnKYgsZw11sJSGldAeyJ7LQaopEuG/IoI99gD01PFG0PgDzw== 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=1719479304; 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=t1rutC+9tIxwRTapXzmLs9JMm3jMXYIN9Q42EUUe8Mk=; b=abj52UISlqXqI2tXzAxbVTggU8Snxc7OeNcH78+CZOtHeNWas0d+EJw3WQ1tooivgTTHhA lKtjTLSX1SS8vFgvM9T2SbIn43I2ip3mVAZ/kg6K1P4G6x3uKeGulWANXbM3h+cYwnaoTw zbM7kzzMFlXrimr1cahcgfcuamZPBTVM1b74ugC7OcxoYD7w7nzT59sAjG5wQbUIhazt/R dTXIDcNd2a0TaMLcRNVK+gHQ7/f8yK/PWFrauD4HOiCLdah49yUL/6qW6spyTQ36+Qm+8m V/5sKTshWOG/fIiQYlTXyRqO6caPgJHg352YFubb5rwG39yrh6QmeWQne+MpEg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4W8t5h5ZTvz1LgH; Thu, 27 Jun 2024 09:08:24 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 45R98OGJ028755; Thu, 27 Jun 2024 09:08:24 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 45R98O0x028752; Thu, 27 Jun 2024 09:08:24 GMT (envelope-from git) Date: Thu, 27 Jun 2024 09:08:24 GMT Message-Id: <202406270908.45R98O0x028752@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Baptiste Daroussin Subject: git: 80cd5ab568e2 - stable/14 - ncurses: readd 2 html files in the doc (fix MK_HTML=yes) 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 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/14 X-Git-Reftype: branch X-Git-Commit: 80cd5ab568e26f185cd2dad3a7766514cf4a6443 Auto-Submitted: auto-generated The branch stable/14 has been updated by bapt: URL: https://cgit.FreeBSD.org/src/commit/?id=80cd5ab568e26f185cd2dad3a7766514cf4a6443 commit 80cd5ab568e26f185cd2dad3a7766514cf4a6443 Author: Baptiste Daroussin AuthorDate: 2024-06-20 13:33:23 +0000 Commit: Baptiste Daroussin CommitDate: 2024-06-27 09:06:23 +0000 ncurses: readd 2 html files in the doc (fix MK_HTML=yes) Reported by: Michael Butler (cherry picked from commit 8d9900a313593adeeaae295b4aea982cb14cb8a5) --- contrib/ncurses/doc/html/hackguide.html | 962 ++++++++ contrib/ncurses/doc/html/ncurses-intro.html | 3390 +++++++++++++++++++++++++++ 2 files changed, 4352 insertions(+) diff --git a/contrib/ncurses/doc/html/hackguide.html b/contrib/ncurses/doc/html/hackguide.html new file mode 100644 index 000000000000..2b9445538dc8 --- /dev/null +++ b/contrib/ncurses/doc/html/hackguide.html @@ -0,0 +1,962 @@ + + + + + + A Hacker's Guide to Ncurses Internals + + + + +

A Hacker's Guide to NCURSES

+ +

A Hacker's Guide to NCURSES

+ +
+

Contents

+ + +
+ +

Abstract

+ +

This document is a hacker's tour of the + ncurses library and utilities. It discusses + design philosophy, implementation methods, and the conventions + used for coding and documentation. It is recommended reading for + anyone who is interested in porting, extending or improving the + package.

+ +

Objective of the + Package

+ +

The objective of the ncurses package is to + provide a free software API for character-cell terminals and + terminal emulators with the following characteristics:

+ +
    +
  • Source-compatible with historical curses implementations + (including the original BSD curses and System V curses.
    • + +
  • Conformant with the XSI Curses standard issued as part of + XPG4 by X/Open.
    • + +
  • High-quality — stable and reliable code, wide + portability, good packaging, superior documentation.
    • + +
  • Featureful — should eliminate as much of the drudgery + of C interface programming as possible, freeing programmers to + think at a higher level of design.
    • +
+ +

These objectives are in priority order. So, for example, + source compatibility with older version must trump featurefulness + — we cannot add features if it means breaking the portion + of the API corresponding to historical curses versions.

+ +

Why System V Curses?

+ +

We used System V curses as a model, reverse-engineering their + API, in order to fulfill the first two objectives.

+ +

System V curses implementations can support BSD curses + programs with just a recompilation, so by capturing the System V + API we also capture BSD's.

+ +

More importantly for the future, the XSI Curses standard + issued by X/Open is explicitly and closely modeled on System V. + So conformance with System V took us most of the way to + base-level XSI conformance.

+ +

How to Design + Extensions

+ +

The third objective (standards conformance) requires that it + be easy to condition source code using ncurses + so that the absence of nonstandard extensions does not break the + code.

+ +

Accordingly, we have a policy of associating with each + nonstandard extension a feature macro, so that ncurses client + code can use this macro to condition in or out the code that + requires the ncurses extension.

+ +

For example, there is a macro + NCURSES_MOUSE_VERSION which XSI Curses does not + define, but which is defined in the ncurses + library header. You can use this to condition the calls to the + mouse API calls.

+ +

Portability and + Configuration

+ +

Code written for ncurses may assume an + ANSI-standard C compiler and POSIX-compatible OS interface. It + may also assume the presence of a System-V-compatible + select(2) call.

+ +

We encourage (but do not require) developers to make the code + friendly to less-capable UNIX environments wherever possible.

+ +

We encourage developers to support OS-specific optimizations + and methods not available under POSIX/ANSI, provided only + that:

+ +
    +
  • All such code is properly conditioned so the build process + does not attempt to compile it under a plain ANSI/POSIX + environment.
    • + +
  • Adding such implementation methods does not introduce + incompatibilities in the ncurses API between + platforms.
    • +
+ +

We use GNU autoconf(1) as a tool to deal with + portability issues. The right way to leverage an OS-specific + feature is to modify the autoconf specification files + (configure.in and aclocal.m4) to set up a new feature macro, + which you then use to condition your code.

+ +

Documentation + Conventions

+ +

There are three kinds of documentation associated with this + package. Each has a different preferred format:

+ +
    +
  • Package-internal files (README, INSTALL, TO-DO etc.)
    • + +
  • Manual pages.
    • + +
  • Everything else (i.e., narrative documentation).
    • +
+ +

Our conventions are simple:

+ +
    +
  1. Maintain package-internal files in plain + text. The expected viewer for them is more(1) or + an editor window; there is no point in elaborate mark-up.
    2. + +
  2. Mark up manual pages in the man macros. + These have to be viewable through traditional man(1) + programs.
    3. + +
  3. Write everything else in HTML. +
    4. +
+ +

When in doubt, HTMLize a master and use lynx(1) to + generate plain ASCII (as we do for the announcement + document).

+ +

The reason for choosing HTML is that it is (a) well-adapted + for on-line browsing through viewers that are everywhere; (b) + more easily readable as plain text than most other mark-ups, if + you do not have a viewer; and (c) carries enough information that + you can generate a nice-looking printed version from it. Also, of + course, it make exporting things like the announcement document + to WWW pretty trivial.

+ +

How to Report Bugs

+ +

The reporting address for + bugs is bug-ncurses@gnu.org. This is a + majordomo list; to join, write to + bug-ncurses-request@gnu.org with a message + containing the line:

+ + 
+             subscribe <name>@<host.domain>
+
+

The ncurses code is maintained by a small group + of volunteers. While we try our best to fix bugs promptly, we + simply do not have a lot of hours to spend on elementary + hand-holding. We rely on intelligent cooperation from our users. + If you think you have found a bug in ncurses, there + are some steps you can take before contacting us that will help + get the bug fixed quickly.

+ +

In order to use our bug-fixing time efficiently, we put people + who show us they have taken these steps at the head of our queue. + This means that if you do not, you will probably end up at the + tail end and have to wait a while.

+ +
    +

  1. Develop a recipe to reproduce the bug. +

    Bugs we can reproduce are likely to be fixed very quickly, + often within days. The most effective single thing you can do + to get a quick fix is develop a way we can duplicate the bad + behavior — ideally, by giving us source for a small, + portable test program that breaks the library. (Even better + is a keystroke recipe using one of the test programs provided + with the distribution.)

    +
    2. + +

  2. Try to reproduce the bug on a different terminal type. +

    In our experience, most of the behaviors people report as + library bugs are actually due to subtle problems in terminal + descriptions. This is especially likely to be true if you are + using a traditional asynchronous terminal or PC-based + terminal emulator, rather than xterm or a UNIX console + entry.

    + +

    It is therefore extremely helpful if you can tell us + whether or not your problem reproduces on other terminal + types. Usually you will have both a console type and xterm + available; please tell us whether or not your bug reproduces + on both.

    + +

    If you have xterm available, it is also good to collect + xterm reports for different window sizes. This is especially + true if you normally use an unusual xterm window size — + a surprising number of the bugs we have seen are either + triggered or masked by these.

    +
    3. + +

  3. Generate and examine a trace file for the broken behavior. +

    Recompile your program with the debugging versions of the + libraries. Insert a trace() call with the + argument set to TRACE_UPDATE. (See "Writing Programs with + NCURSES" for details on trace levels.) Reproduce your + bug, then look at the trace file to see what the library was + actually doing.

    + +

    Another frequent cause of apparent bugs is application + coding errors that cause the wrong things to be put on the + virtual screen. Looking at the virtual-screen dumps in the + trace file will tell you immediately if this is happening, + and save you from the possible embarrassment of being told + that the bug is in your code and is your problem rather than + ours.

    + +

    If the virtual-screen dumps look correct but the bug + persists, it is possible to crank up the trace level to give + more and more information about the library's update actions + and the control sequences it issues to perform them. The test + directory of the distribution contains a tool for digesting + these logs to make them less tedious to wade through.

    + +

    Often you will find terminfo problems at this stage by + noticing that the escape sequences put out for various + capabilities are wrong. If not, you are likely to learn + enough to be able to characterize any bug in the + screen-update logic quite exactly.

    +
    4. + +

  4. Report details and symptoms, not just interpretations. +

    If you do the preceding two steps, it is very likely that + you will discover the nature of the problem yourself and be + able to send us a fix. This will create happy feelings all + around and earn you good karma for the first time you run + into a bug you really cannot characterize and fix + yourself.

    + +

    If you are still stuck, at least you will know what to + tell us. Remember, we need details. If you guess about what + is safe to leave out, you are too likely to be wrong.

    + +

    If your bug produces a bad update, include a trace file. + Try to make the trace at the least voluminous level + that pins down the bug. Logs that have been through + tracemunch are OK, it does not throw away any information + (actually they are better than un-munched ones because they + are easier to read).

    + +

    If your bug produces a core-dump, please include a + symbolic stack trace generated by gdb(1) or your local + equivalent.

    + +

    Tell us about every terminal on which you have reproduced + the bug — and every terminal on which you cannot. + Ideally, send us terminfo sources for all of these (yours + might differ from ours).

    + +

    Include your ncurses version and your OS/machine type, of + course! You can find your ncurses version in the + curses.h file.

    +
    5. +
+ +

If your problem smells like a logic error or in cursor + movement or scrolling or a bad capability, there are a couple of + tiny test frames for the library algorithms in the progs + directory that may help you isolate it. These are not part of the + normal build, but do have their own make productions.

+ +

The most important of these is mvcur, a test + frame for the cursor-movement optimization code. With this + program, you can see directly what control sequences will be + emitted for any given cursor movement or scroll/insert/delete + operations. If you think you have got a bad capability + identified, you can disable it and test again. The program is + command-driven and has on-line help.

+ +

If you think the vertical-scroll optimization is broken, or + just want to understand how it works better, build + hashmap and read the header comments of + hardscroll.c and hashmap.c; then try it + out. You can also test the hardware-scrolling optimization + separately with hardscroll.

+ +

A Tour of the Ncurses + Library

+ +

Library Overview

+ +

Most of the library is superstructure — fairly trivial + convenience interfaces to a small set of basic functions and data + structures used to manipulate the virtual screen (in particular, + none of this code does any I/O except through calls to more + fundamental modules described below). The files

+ +
+ lib_addch.c lib_bkgd.c lib_box.c lib_chgat.c lib_clear.c + lib_clearok.c lib_clrbot.c lib_clreol.c lib_colorset.c + lib_data.c lib_delch.c lib_delwin.c lib_echo.c lib_erase.c + lib_gen.c lib_getstr.c lib_hline.c lib_immedok.c lib_inchstr.c + lib_insch.c lib_insdel.c lib_insstr.c lib_instr.c + lib_isendwin.c lib_keyname.c lib_leaveok.c lib_move.c + lib_mvwin.c lib_overlay.c lib_pad.c lib_printw.c lib_redrawln.c + lib_scanw.c lib_screen.c lib_scroll.c lib_scrollok.c + lib_scrreg.c lib_set_term.c lib_slk.c lib_slkatr_set.c + lib_slkatrof.c lib_slkatron.c lib_slkatrset.c lib_slkattr.c + lib_slkclear.c lib_slkcolor.c lib_slkinit.c lib_slklab.c + lib_slkrefr.c lib_slkset.c lib_slktouch.c lib_touch.c + lib_unctrl.c lib_vline.c lib_wattroff.c lib_wattron.c + lib_window.c +
+ +

are all in this category. They are very unlikely to need + change, barring bugs or some fundamental reorganization in the + underlying data structures.

+ +

These files are used only for debugging support:

+ +
+ lib_trace.c lib_traceatr.c lib_tracebits.c lib_tracechr.c + lib_tracedmp.c lib_tracemse.c trace_buf.c +
+ +

It is rather unlikely you will ever need to change these, + unless you want to introduce a new debug trace level for some + reason.

+ +

There is another group of files that do direct I/O via + tputs(), computations on the terminal capabilities, or + queries to the OS environment, but nevertheless have only fairly + low complexity. These include:

+ +
+ lib_acs.c lib_beep.c lib_color.c lib_endwin.c + lib_initscr.c lib_longname.c lib_newterm.c lib_options.c + lib_termcap.c lib_ti.c lib_tparm.c lib_tputs.c lib_vidattr.c + read_entry.c. +
+ +

They are likely to need revision only if ncurses is being + ported to an environment without an underlying terminfo + capability representation.

+ +

These files have serious hooks into the tty driver and signal + facilities:

+ +
+ lib_kernel.c lib_baudrate.c lib_raw.c lib_tstp.c + lib_twait.c +
+ +

If you run into porting snafus moving the package to another + UNIX, the problem is likely to be in one of these files. The file + lib_print.c uses sleep(2) and also falls in this + category.

+ +

Almost all of the real work is done in the files

+ +
+ hardscroll.c hashmap.c lib_addch.c lib_doupdate.c + lib_getch.c lib_mouse.c lib_mvcur.c lib_refresh.c lib_setup.c + lib_vidattr.c +
+ +

Most of the algorithmic complexity in the library lives in + these files. If there is a real bug in ncurses + itself, it is probably here. We will tour some of these files in + detail below (see The Engine Room).

+ +

Finally, there is a group of files that is actually most of + the terminfo compiler. The reason this code lives in the + ncurses library is to support fallback to + /etc/termcap. These files include

+ +
+ alloc_entry.c captoinfo.c comp_captab.c comp_error.c + comp_hash.c comp_parse.c comp_scan.c parse_entry.c + read_termcap.c write_entry.c +
+ +

We will discuss these in the compiler tour.

+ +

The Engine Room

+ +

Keyboard Input

+ +

All ncurses input funnels through the function + wgetch(), defined in lib_getch.c. This + function is tricky; it has to poll for keyboard and mouse events + and do a running match of incoming input against the set of + defined special keys.

+ +

The central data structure in this module is a FIFO queue, + used to match multiple-character input sequences against + special-key capabilities; also to implement pushback via + ungetch().

+ +

The wgetch() code distinguishes between function + key sequences and the same sequences typed manually by doing a + timed wait after each input character that could lead a function + key sequence. If the entire sequence takes less than 1 second, it + is assumed to have been generated by a function key press.

+ +

Hackers bruised by previous encounters with variant + select(2) calls may find the code in + lib_twait.c interesting. It deals with the problem + that some BSD selects do not return a reliable time-left value. + The function timed_wait() effectively simulates a + System V select.

+ +

Mouse Events

+ +

If the mouse interface is active, wgetch() polls + for mouse events each call, before it goes to the keyboard for + input. It is up to lib_mouse.c how the polling is + accomplished; it may vary for different devices.

+ +

Under xterm, however, mouse event notifications come in via + the keyboard input stream. They are recognized by having the + kmous capability as a prefix. This is kind of + klugey, but trying to wire in recognition of a mouse key prefix + without going through the function-key machinery would be just + too painful, and this turns out to imply having the prefix + somewhere in the function-key capabilities at terminal-type + initialization.

+ +

This kluge only works because kmous is not + actually used by any historic terminal type or curses + implementation we know of. Best guess is it is a relic of some + forgotten experiment in-house at Bell Labs that did not leave any + traces in the publicly-distributed System V terminfo files. If + System V or XPG4 ever gets serious about using it again, this + kluge may have to change.

+ +

Here are some more details about mouse event handling:

+ +

The lib_mouse() code is logically split into a + lower level that accepts event reports in a device-dependent + format and an upper level that parses mouse gestures and filters + events. The mediating data structure is a circular queue of event + structures.

+ +

Functionally, the lower level's job is to pick up primitive + events and put them on the circular queue. This can happen in one + of two ways: either (a) _nc_mouse_event() detects a + series of incoming mouse reports and queues them, or (b) code in + lib_getch.c detects the kmous + prefix in the keyboard input stream and calls _nc_mouse_inline to + queue up a series of adjacent mouse reports.

+ +

In either case, _nc_mouse_parse() should be + called after the series is accepted to parse the digested mouse + reports (low-level events) into a gesture (a high-level or + composite event).

+ +

Output and Screen Updating

+ +

With the single exception of character echoes during a + wgetnstr() call (which simulates cooked-mode line + editing in an ncurses window), the library normally does all its + output at refresh time.

+ +

The main job is to go from the current state of the screen (as + represented in the curscr window structure) to the + desired new state (as represented in the newscr + window structure), while doing as little I/O as possible.

+ +

The brains of this operation are the modules + hashmap.c, hardscroll.c and + lib_doupdate.c; the latter two use + lib_mvcur.c. Essentially, what happens looks like + this:

+ +
    +
  • +

    The hashmap.c module tries to detect vertical + motion changes between the real and virtual screens. This + information is represented by the oldindex members in the + newscr structure. These are modified by vertical-motion and + clear operations, and both are re-initialized after each + update. To this change-journalling information, the hashmap + code adds deductions made using a modified Heckel algorithm + on hash values generated from the line contents.

    +
    • + +
  • +

    The hardscroll.c module computes an optimum + set of scroll, insertion, and deletion operations to make the + indices match. It calls _nc_mvcur_scrolln() in + lib_mvcur.c to do those motions.

    +
    • + +
  • +

    Then lib_doupdate.c goes to work. Its job is + to do line-by-line transformations of curscr + lines to newscr lines. Its main tool is the + routine mvcur() in lib_mvcur.c. + This routine does cursor-movement optimization, attempting to + get from given screen location A to given location B in the + fewest output characters possible.

    +
    • +
+ +

If you want to work on screen optimizations, you should use + the fact that (in the trace-enabled version of the library) + enabling the TRACE_TIMES trace level causes a report + to be emitted after each screen update giving the elapsed time + and a count of characters emitted during the update. You can use + this to tell when an update optimization improves efficiency.

+ +

In the trace-enabled version of the library, it is also + possible to disable and re-enable various optimizations at + runtime by tweaking the variable + _nc_optimize_enable. See the file + include/curses.h.in for mask values, near the + end.

+ +

The Forms and Menu Libraries

+ +

The forms and menu libraries should work reliably in any + environment you can port ncurses to. The only portability issue + anywhere in them is what flavor of regular expressions the + built-in form field type TYPE_REGEXP will recognize.

+ +

The configuration code prefers the POSIX regex facility, + modeled on System V's, but will settle for BSD regexps if the + former is not available.

+ +

Historical note: the panels code was written primarily to + assist in porting u386mon 2.0 (comp.sources.misc v14i001-4) to + systems lacking panels support; u386mon 2.10 and beyond use it. + This version has been slightly cleaned up for + ncurses.

+ +

A Tour of the Terminfo Compiler

+ +

The ncurses implementation of + tic is rather complex internally; it has to do a + trying combination of missions. This starts with the fact that, + in addition to its normal duty of compiling terminfo sources into + loadable terminfo binaries, it has to be able to handle termcap + syntax and compile that too into terminfo entries.

+ +

The implementation therefore starts with a table-driven, + dual-mode lexical analyzer (in comp_scan.c). The + lexer chooses its mode (termcap or terminfo) based on the first + “,” or “:” it finds in each entry. The + lexer does all the work of recognizing capability names and + values; the grammar above it is trivial, just "parse entries till + you run out of file".

+ +

Translation of + Non-use Capabilities

+ +

Translation of most things besides use + capabilities is pretty straightforward. The lexical analyzer's + tokenizer hands each capability name to a hash function, which + drives a table lookup. The table entry yields an index which is + used to look up the token type in another table, and controls + interpretation of the value.

+ +

One possibly interesting aspect of the implementation is the + way the compiler tables are initialized. All the tables are + generated by various awk/sed/sh scripts from a master table + include/Caps; these scripts actually write C + initializers which are linked to the compiler. Furthermore, the + hash table is generated in the same way, so it doesn't have to be + generated at compiler startup time (another benefit of this + organization is that the hash table can be in shareable text + space).

+ +

Thus, adding a new capability is usually pretty trivial, just + a matter of adding one line to the include/Caps + file. We will have more to say about this in the section on + Source-Form Translation.

+ +

Use Capability Resolution

+ +

The background problem that makes tic tricky + is not the capability translation itself, it is the resolution of + use capabilities. Older versions would not + handle forward use references for this reason + (that is, a using terminal always had to follow its use target in + the source file). By doing this, they got away with a simple + implementation tactic; compile everything as it blows by, then + resolve uses from compiled entries.

+ +

This will not do for ncurses. The problem is + that that the whole compilation process has to be embeddable in + the ncurses library so that it can be called by + the startup code to translate termcap entries on the fly. The + embedded version cannot go promiscuously writing everything it + translates out to disk — for one thing, it will typically + be running with non-root permissions.

+ +

So our tic is designed to parse an entire + terminfo file into a doubly-linked circular list of entry + structures in-core, and then do use resolution + in-memory before writing everything out. This design has other + advantages: it makes forward and back use-references equally easy + (so we get the latter for free), and it makes checking for name + collisions before they are written out easy to do.

+ +

And this is exactly how the embedded version works. But the + stand-alone user-accessible version of tic + partly reverts to the historical strategy; it writes to disk (not + keeping in core) any entry with no use + references.

+ +

This is strictly a core-economy kluge, implemented because the + terminfo master file is large enough that some core-poor systems + swap like crazy when you compile it all in memory...there have + been reports of this process taking three hours, + rather than the twenty seconds or less typical on the author's + development box.

+ +

So. The executable tic passes the + entry-parser a hook that immediately writes out the + referenced entry if it has no use capabilities. The compiler main + loop refrains from adding the entry to the in-core list when this + hook fires. If some other entry later needs to reference an entry + that got written immediately, that is OK; the resolution code + will fetch it off disk when it cannot find it in core.

+ +

Name collisions will still be detected, just not as cleanly. + The write_entry() code complains before overwriting + an entry that postdates the time of tic's first + call to write_entry(), Thus it will complain about + overwriting entries newly made during the tic + run, but not about overwriting ones that predate it.

+ +

Source-Form + Translation

+ +

Another use of tic is to do source + translation between various termcap and terminfo formats. There + are more variants out there than you might think; the ones we + know about are described in the captoinfo(1) + manual page.

+ +

The translation output code (dump_entry() in + ncurses/dump_entry.c) is shared with the + infocmp(1) utility. It takes the same internal + representation used to generate the binary form and dumps it to + standard output in a specified format.

+ +

The include/Caps file has a header comment + describing ways you can specify source translations for + nonstandard capabilities just by altering the master table. It is + possible to set up capability aliasing or tell the compiler to + plain ignore a given capability without writing any C code at + all.

+ +

For circumstances where you need to do algorithmic + translation, there are functions in parse_entry.c + called after the parse of each entry that are specifically + intended to encapsulate such translations. This, for example, is + where the AIX box1 capability get translated to + an acsc string.

+ +

Other Utilities

+ +

The infocmp utility is just a wrapper around + the same entry-dumping code used by tic for + source translation. Perhaps the one interesting aspect of the + code is the use of a predicate function passed in to + dump_entry() to control which capabilities are + dumped. This is necessary in order to handle both the ordinary + De-compilation case and entry difference reporting.

+ +

The tput and clear utilities + just do an entry load followed by a tputs() of a + selected capability.

+ +

Style Tips for Developers

+ +

See the TO-DO file in the top-level directory of the source + distribution for additions that would be particularly useful.

+ +

The prefix _nc_ should be used on library public + functions that are not part of the curses API in order to prevent + pollution of the application namespace. If you have to add to or + modify the function prototypes in curses.h.in, read + ncurses/MKlib_gen.sh first so you can avoid breaking XSI + conformance. Please join the ncurses mailing list. See the + INSTALL file in the top level of the distribution for details on + the list.

+ +

Look for the string FIXME in source files to tag + minor bugs and potential problems that could use fixing.

+ +

Do not try to auto-detect OS features in the main body of the + C code. That is the job of the configuration system.

+ +

To hold down complexity, do make your code data-driven. + Especially, if you can drive logic from a table filtered out of + include/Caps, do it. If you find you need to augment + the data in that file in order to generate the proper table, that + is still preferable to ad-hoc code — that is why the fifth + field (flags) is there.

+ +

Have fun!

+ +

Porting Hints

+ +

The following notes are intended to be a first step towards + DOS and Macintosh ports of the ncurses libraries.

+ +

The following library modules are “pure curses”; + they operate only on the curses internal structures, do all + output through other curses calls (not including + tputs() and putp()) and do not call any + other UNIX routines such as signal(2) or the stdio library. Thus, + they should not need to be modified for single-terminal + ports.

+ +
+ lib_addch.c lib_addstr.c lib_bkgd.c lib_box.c lib_clear.c + lib_clrbot.c lib_clreol.c lib_delch.c lib_delwin.c lib_erase.c + lib_inchstr.c lib_insch.c lib_insdel.c lib_insstr.c + lib_keyname.c lib_move.c lib_mvwin.c lib_newwin.c lib_overlay.c + lib_pad.c lib_printw.c lib_refresh.c lib_scanw.c lib_scroll.c + lib_scrreg.c lib_set_term.c lib_touch.c lib_tparm.c lib_tputs.c + lib_unctrl.c lib_window.c panel.c +
+ +

This module is pure curses, but calls outstr():

+ +
+ lib_getstr.c +
+ +

These modules are pure curses, except that they use + tputs() and putp():

+ +
+ lib_beep.c lib_color.c lib_endwin.c lib_options.c + lib_slk.c lib_vidattr.c +
+ +

This modules assist in POSIX emulation on non-POSIX + systems:

+ +
+
sigaction.c
+ +
signal calls
+
+ +

The following source files will not be needed for a + single-terminal-type port.

+ +
+ alloc_entry.c captoinfo.c clear.c comp_captab.c + comp_error.c comp_hash.c comp_main.c comp_parse.c comp_scan.c + dump_entry.c infocmp.c parse_entry.c read_entry.c tput.c + write_entry.c +
+ +

The following modules will use + open()/read()/write()/close()/lseek() on files, but no other OS + calls.

+ +
+
lib_screen.c
+ +
used to read/write screen dumps
+ +
lib_trace.c
+ +
used to write trace data to the logfile
+
+ +

Modules that would have to be modified for a port start + here:

+ +

The following modules are “pure curses” but + contain assumptions inappropriate for a memory-mapped port.

+ +
+
lib_longname.c
+ +
assumes there may be multiple terminals
+ +
lib_acs.c
+ +
assumes acs_map as a double indirection
+ +
lib_mvcur.c
+ +
assumes cursor moves have variable cost
+ +
lib_termcap.c
+ +
assumes there may be multiple terminals
+ +
lib_ti.c
+ +
assumes there may be multiple terminals
+
+ +

The following modules use UNIX-specific calls:

+ +
+
lib_doupdate.c
+ +
input checking
+ +
lib_getch.c
+ +
read()
+ +
lib_initscr.c
+ +
getenv()
+ +
lib_newterm.c
+ +
lib_baudrate.c
+ +
lib_kernel.c
+ +
various tty-manipulation and system calls
+ +
lib_raw.c
+ +
various tty-manipulation calls
+ +
lib_setup.c
+ +
various tty-manipulation calls
+ +
lib_restart.c
+ +
various tty-manipulation calls
+ +
lib_tstp.c
+ +
signal-manipulation calls
+ +
lib_twait.c
+ +
gettimeofday(), select().
+
+ +
+ +
+ Eric S. Raymond <esr@snark.thyrsus.com> +
+ (Note: This is not the bug + address!) *** 3398 LINES SKIPPED *** From nobody Thu Jun 27 09:08:25 2024 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 4W8t5k4BNZz5PHM7; Thu, 27 Jun 2024 09:08: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4W8t5k0p74z4Ybx; Thu, 27 Jun 2024 09:08:26 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1719479306; 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=9ZUpsbFfaO/Cwypq/xwTX4UvwYAMyHviJ4+ut11uruo=; b=XSmquZQpGyBUq83m5Zqudb9uSH9TwhCcaoiU3hWfhZD9sP5PQzit3SOrBnY3/vcx5XJL48 KEuMPwnumWL3KpNxchL0RFAU3nJz7TDedSTOHr0BAH5FrR79hlG+Kvt2oNIJCF4DqazwC9 AWtUfb2c1D0PbfFf9y6e1EXeL1NVHQnDov2ETSrpOaFf+83Ki8KHvy8faB3H4lOEvaX/1l AetwllGfGf76y7ShO81+ykILqKXwjrztYb20a3O47HAit0wj6Nxl8qvJ81JXtulmohQ5gi WIugG58mFWyTvNSD9n931udWPzt6/dUMa1NJBsA+/Yz7voy+lfe65/wDXZuUAg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1719479306; a=rsa-sha256; cv=none; b=bglizp7U8WzrJ0KjBQMTVkukpw3f9GipATkDgSJ05K4KlK6lsBYmx/ifJp7thvek9c7cI3 Ba1kDAANOCiE2rYIppofPmJq2acITot7BBp/TWFCzcbL7f7Kf0z3SnBtc3WDyXgrRHYd9V FcGyB90agu90mWrweRbjJzoKmNZv06aSWlq2O7M6gxAGaqaW/j/D6f+LHEXBSOSP8k+Cc1 bI7hL9IqCozXbVHgrxkIBF+cXBHlkcmkBOGY9yT4z0njBBoGkDetoeuecRbDPczSd51G0x YqguDTyieInXliILXtuiyRWahRHs+cB4MRhryeNF57prboR220DwhwGm1LvCpQ== 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=1719479306; 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=9ZUpsbFfaO/Cwypq/xwTX4UvwYAMyHviJ4+ut11uruo=; b=FwbtqtDc0FqA1Hu3k4r3YTFIoXUkgd59sU3zQ0oIAj8ymskG1+qk1UEd/M6BgwXhM5vyVg xbxpnC8jGK3D6SUVewHCFk/cQYbUbaWXArBV4PcUM25LKDKYd8ivXPnCrudBaAiKLlOYT8 6IF5fAGC6S2NDzMIkdGvgPggAQIa7LsVylTEZs1unXe4dO1usB7brmQWr+WlM3Ik8e4fpf E6AtXRalCN+8igPLK/pnNQcRfBLU6FFIQuFOHYg1FptaURnVgdgwJBqh449KztQBOv4hJ0 qJkCbK310G9n5Hjef9O+XwMvxiELIwATVA0UTIWfBoCeCxKOjo7gK8SJ1i4WTQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4W8t5j6rNYz1LLp; Thu, 27 Jun 2024 09:08:25 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 45R98PdU028800; Thu, 27 Jun 2024 09:08:25 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 45R98PNi028797; Thu, 27 Jun 2024 09:08:25 GMT (envelope-from git) Date: Thu, 27 Jun 2024 09:08:25 GMT Message-Id: <202406270908.45R98PNi028797@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Baptiste Daroussin Subject: git: 2b9196bd3a42 - stable/14 - ncurses: reinstantiate bsd specific code 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 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/14 X-Git-Reftype: branch X-Git-Commit: 2b9196bd3a423cf9ef0b7cf5050ace66fed8f261 Auto-Submitted: auto-generated The branch stable/14 has been updated by bapt: URL: https://cgit.FreeBSD.org/src/commit/?id=2b9196bd3a423cf9ef0b7cf5050ace66fed8f261 commit 2b9196bd3a423cf9ef0b7cf5050ace66fed8f261 Author: Baptiste Daroussin AuthorDate: 2024-06-20 18:26:14 +0000 Commit: Baptiste Daroussin CommitDate: 2024-06-27 09:06:37 +0000 ncurses: reinstantiate bsd specific code This fixes ncurses 6.5 badly reading termcap (cherry picked from commit e402155e1ad7ec92a1fbd1712ce86c2ca43e1823) --- lib/ncurses/tinfo/ncurses_cfg.h | 3 +++ 1 file changed, 3 insertions(+) diff --git a/lib/ncurses/tinfo/ncurses_cfg.h b/lib/ncurses/tinfo/ncurses_cfg.h index ced59c68e93c..33890f300310 100644 --- a/lib/ncurses/tinfo/ncurses_cfg.h +++ b/lib/ncurses/tinfo/ncurses_cfg.h @@ -60,6 +60,9 @@ #define HAVE_LONG_FILE_NAMES 1 #define MIXEDCASE_FILENAMES 1 #define STDC_HEADERS 1 +#define USE_GETCAP 1 +#define USE_BSD_TPUTS 1 +#define HAVE_BSD_CGETENT 1 #define HAVE_SYS_TYPES_H 1 #define HAVE_SYS_STAT_H 1 #define HAVE_STDLIB_H 1 From nobody Thu Jun 27 15:30:54 2024 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 4W92b25ZHWz5PtbK; Thu, 27 Jun 2024 15:30: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4W92b258NYz49wb; Thu, 27 Jun 2024 15:30:54 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1719502254; 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=cYvtJzbTGbbKVTfEgxq4Ae+DsCbHd8Tg8/K8a6dDi7o=; b=or1czDQAjQ5EdhFjfab3e3+5pAu0EHcSsR0bE2IeDKDJSQcQ3neonofqvPZWY75ABuxn1n nMI5ny5G5shj3QV1dLkjFUxC0GVAt3OWLM+e/sqq3hIncgWvNavn02eU40NGV3XtUBQw3H 6D0jVZkRDVsYCUtH9nb9ZyJejbKamiv29fOY9P1GZw30gyuJlwQyxEBlEA4JP8hM+MpUKo 2aMhmWweSSNvmJBHx4Oam+gZnF5cbj8mcuUVf+02M6Y1qF++VpN8fpwBOanrFF9faYcxaB gaPaSNKYzAJMGvbm3Z4L5aTwtJpVp6gGfT3CCrGf9W9bxnyGA68bM+7D8CxdVQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1719502254; a=rsa-sha256; cv=none; b=JlugB2upDzbY/fxv9PYJ+tNzU8Mf/U3WF4Ta0klSThbkwKEu/O0qLT/8/vrUSR3aP7bx/s EwS5ZqFiQQ7q0jxQDGeio727RBqfv5lRUTmjMgQ4nUgi4n+MEOZKre9c8E8YRh5TiNc50r 16IJ89kEVq9yyJ0/H5UuSr+OcqVSU0Emc0L8nF+T55yjl/IYTM/w+N7m7gc+tgj+EWTjIX i0O+MKH7ndSEOITXD4PcEoAqQ9G0nL/9GDo6afXDxjPI06Up2C0bevs6JnpRPO+ojS9n/b TnSoWi8AMK3LIdjOaz4HN3K8JzLv7FGBjyeyWkXhdEnCEsbp371pSn8ydBeI7g== 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=1719502254; 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=cYvtJzbTGbbKVTfEgxq4Ae+DsCbHd8Tg8/K8a6dDi7o=; b=ZjXGSDSyLY+hcIwGKhwKKhp6PC1GNLEsO2GgxBHdb2UZlxf1msONmVlnQow5dzomR+lCyO ACROi+kisH/Vq10VQqUqK+IIP5lv7448zf+dUAZ3lI087gt0njjKXBLwlEIkVLPe8bBgTo 96HFxant9KRoNw6l6bNyCsg7OCiszlkrGf9XypJlJPEtKEFfgqIIosnJ5ILgpd2o76McvT /vxlrACRd1NXLVkDH2olzjkVcF9yMMrBuFsjQyDsvQ8aL2fF53JEOjRLhuNGwXNAtpy6lT Ew8zjSVsc4dq2wbL86uMyxAg8BM9/4FEECZ6AKb32E3Gu1Fz1c518KiMJwmUtA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4W92b24mQYzHlm; Thu, 27 Jun 2024 15:30:54 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 45RFUs7q078382; Thu, 27 Jun 2024 15:30:54 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 45RFUsIl078379; Thu, 27 Jun 2024 15:30:54 GMT (envelope-from git) Date: Thu, 27 Jun 2024 15:30:54 GMT Message-Id: <202406271530.45RFUsIl078379@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: aebd6d5b1fc4 - stable/14 - arcmsr: Use device_set_descf() 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 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: aebd6d5b1fc43826fe688d0ea1b6fd4cd11492b7 Auto-Submitted: auto-generated The branch stable/14 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=aebd6d5b1fc43826fe688d0ea1b6fd4cd11492b7 commit aebd6d5b1fc43826fe688d0ea1b6fd4cd11492b7 Author: Mark Johnston AuthorDate: 2024-06-05 14:13:26 +0000 Commit: Mark Johnston CommitDate: 2024-06-27 15:27:41 +0000 arcmsr: Use device_set_descf() No functional change intended. MFC after: 1 week (cherry picked from commit 4f0ff49fee00dee624e13b2d305cf9dfee395b7d) --- sys/dev/arcmsr/arcmsr.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/sys/dev/arcmsr/arcmsr.c b/sys/dev/arcmsr/arcmsr.c index ea37da30db93..6de4372a67ea 100644 --- a/sys/dev/arcmsr/arcmsr.c +++ b/sys/dev/arcmsr/arcmsr.c @@ -5238,7 +5238,6 @@ static int arcmsr_probe(device_t dev) { u_int32_t id; u_int16_t sub_device_id; - static char buf[256]; char x_type[]={"unknown"}; char *type; int raid6 = 1; @@ -5313,9 +5312,8 @@ static int arcmsr_probe(device_t dev) } if(type == x_type) return(ENXIO); - sprintf(buf, "Areca %s Host Adapter RAID Controller %s\n%s\n", - type, raid6 ? "(RAID6 capable)" : "", ARCMSR_DRIVER_VERSION); - device_set_desc_copy(dev, buf); + device_set_descf(dev, "Areca %s Host Adapter RAID Controller %s\n%s\n", + type, raid6 ? "(RAID6 capable)" : "", ARCMSR_DRIVER_VERSION); return (BUS_PROBE_DEFAULT); } /* From nobody Thu Jun 27 15:30:55 2024 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 4W92b40GDTz5Ptgr; Thu, 27 Jun 2024 15:30:56 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4W92b365cNz4BN4; Thu, 27 Jun 2024 15:30:55 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1719502255; 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=SXl0AGw1+aSVwJPA+xUy6cGhiHTtm3agon4q6WPSWxk=; b=C+oKP/mMIvU8bdajc7xRc2aQqlqo6IZErAAwzN0B1TkC4mYOszvCCuQ0o2gfYrbudo5eJg WaFW5k+BU1U/KMhszWCmcfxW+XP2hCScOFh5bakA7m7mGTCaPZgNbxsUtRR3jFk1IeDl4b CmTX6FnrJVfc0hvstExKeDAjuyyK58MXgsr/SRX7wrx7UaZccza8o++mNs5GCuxfFFP6tA AE+vk6/g3EPrcdqObEO1iEQjEkDCs1fpH48xX7BpyjAK75ExYExrnlC+6g4f0q1ZclaPHW yNpDz6K16QZEsPBXUjGemF1/4XL+83NFgUR0TWbACxh/fzl0oPS59J8CrajxsA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1719502255; a=rsa-sha256; cv=none; b=otrw92PSMTJMgYV1CD3HwfTXvHl/Wu5F4z0DRTbyKZ/5l2WwT+yU57xLQzBr3Vm7ddiC21 PkwdKxxuQN35lSv2Y0NjXqZp9+RvOL0dFn8GKktgErSV0O5y3LEFuD7KZKV2nR+214hmG6 KEZ1KGGy9I3J7M4bbE0u7WmYRQHVQ4rgAl5A1WxWr6NJ0wf/WFPjm57agwJeL/XYZ+rTYc kSn+6yCbwjbocdsuWnF+vJB5sMPPfJG/vMUjfNYAY9BWhHwIzaG529QtKE101JFNCubeYQ 64MtRRZJm3uf7xqweEUuevMTrmiKbmoIyy3j/C41IkS5rLEnR+j/v/gm50kubA== 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=1719502255; 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=SXl0AGw1+aSVwJPA+xUy6cGhiHTtm3agon4q6WPSWxk=; b=lyZGe+Qh8y9MkYviEdrbAxlLylF/rOiE89bCtxh0mSQx+3UYle64hiAZFGwOjuVNtohr0r naDx8bo2Bn0VoWd+kF/9eqU9TBkLOBAaIgbRCB7xAu40rBMh86D5qtjndKo5M1H3IlRKg4 fuAgo4ciK68ofQ8jOqIFFdcXw/oQGPGGLGzY+P0B6EHNcI4pQ5gDZT1QDLBl1UTrWmF+kh MMcWndyJssCztLv+myLjV523VsM21nDj91dDJWSaRqgedVnH7dqJ0M2UBuJVI9+TxFlWNK +szz/+MoI8uFEAtA52EUKKLRlbSPbP0t9f3PSFgp9c7nIedLIsOS8iEA4VazFQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4W92b35hfQzJ0S; Thu, 27 Jun 2024 15:30:55 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 45RFUtYs078423; Thu, 27 Jun 2024 15:30:55 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 45RFUtcm078420; Thu, 27 Jun 2024 15:30:55 GMT (envelope-from git) Date: Thu, 27 Jun 2024 15:30:55 GMT Message-Id: <202406271530.45RFUtcm078420@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: 0d96ceb1e1a8 - stable/14 - cavium/thunder: Use device_set_desc() 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 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 0d96ceb1e1a87348083a72fbd085e181b6583d17 Auto-Submitted: auto-generated The branch stable/14 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=0d96ceb1e1a87348083a72fbd085e181b6583d17 commit 0d96ceb1e1a87348083a72fbd085e181b6583d17 Author: Mark Johnston AuthorDate: 2024-06-05 14:14:00 +0000 Commit: Mark Johnston CommitDate: 2024-06-27 15:27:41 +0000 cavium/thunder: Use device_set_desc() No functional change intended. MFC after: 1 week (cherry picked from commit 5823a09f79499d426f9f57131be756ddc9be3ff9) --- sys/arm64/cavium/thunder_pcie_pem.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/arm64/cavium/thunder_pcie_pem.c b/sys/arm64/cavium/thunder_pcie_pem.c index a1bd54d9744d..2841486c1442 100644 --- a/sys/arm64/cavium/thunder_pcie_pem.c +++ b/sys/arm64/cavium/thunder_pcie_pem.c @@ -735,7 +735,7 @@ thunder_pem_probe(device_t dev) if ((pci_vendor_id == THUNDER_PEM_VENDOR_ID) && (pci_device_id == THUNDER_PEM_DEVICE_ID)) { - device_set_desc_copy(dev, THUNDER_PEM_DESC); + device_set_desc(dev, THUNDER_PEM_DESC); return (0); } From nobody Thu Jun 27 15:30:56 2024 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 4W92b51Dbzz5Ptnv; Thu, 27 Jun 2024 15:30: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4W92b50Byyz49rL; Thu, 27 Jun 2024 15:30:57 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1719502257; 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=6EO3wVkxD1SWMW9K91EVegw8u/UZwwnMY6tg29HYb/M=; b=uEvVUU3Itu+cZVNL6zDT6HrsNURYERRKVg2hwCLo1L6JZUJkVPPeQJGEaW4kQl/MGm5ddk jZc6K0Zxv/ddIQfc57hK4Kuxa3SuxP0DfLiPVo6sPvtrklPyx7YEUoDUJFiE52Vc9ExYHz iPbkpRc2stZgRLkvvnPj7Mcc3WT3cGINj2w6/J4CpkDaLk98E+7QDE9bmwg14rCkteVB2V /SEUqap8by53n3EjwFwhMcSK6Y0wdR2DDHMocTfSrWUaUBhT2+AuyLrdUMj5S+rP4U/q9z V5tlU2G3Lrken53ABnuQbLqjpq5fTezB4MlqIAKxtej2NMHLJ1iRVKeoPTYFmA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1719502257; a=rsa-sha256; cv=none; b=YPEnCt/nVnwothlvSqdjX2NhKsKM7Yn6lhwMmsxCoCdLtqLH+5ybeldELUg4HiwoZKCf4Z DTupxIsQ9AlrmeSJIkK044dPSN6/sUdTHIgH/UL24XuitMlqCypWjQwTxCtxTqLyKuANOe 5K8EWAlqBJshiepUm2hyeM1qo9ThRhoknhjLX2QCTlvNvkrcRL4pGpVuv7QDpEd8CrviEJ xuhgsCR44fo6a4aYPjvIzHssco0QlCtW7ZD2IgfIqS8VM8wYhb3iDNlYaOnbI5IvUgHQ43 r6P/AandEEKzIn8Q6Clu0gqViXEd2MxHtluhps7TV1k6bXFmP9e9z/3LBQ5MYQ== 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=1719502257; 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=6EO3wVkxD1SWMW9K91EVegw8u/UZwwnMY6tg29HYb/M=; b=yX0zE5ibIkDT7zuA+52vZFx6T5JHFP8DTut0gpIFrg+nlQP6/+p556ydaFhwXgAIpZ5CJJ h62b/mYx+tl/uqfPGOuYTiG8uOitHQq2I6yqG/BEQJIfiMMrTRphAe6h8Z2JbNa1lk2icr 0xO8+V1Jov2sp++wsV3u2Mmq2UAUbzOqVlijcuYlMITpAdPcANKSZZT1yD096fgHFUy6wR MR+d18tlzDKagTEi27PPfJRagcCg/VEE4ApC/G3r4mJvHEj6xIwuu6rqaBAyiSRSIZ6Csc oq6sBSQ83j8zwrki0711RMYTtqci4st1mmIio2nfTlBson0ePJ8fdXGLWN+m7Q== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4W92b46glWzJ0T; Thu, 27 Jun 2024 15:30:56 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 45RFUuqR078460; Thu, 27 Jun 2024 15:30:56 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 45RFUuvI078457; Thu, 27 Jun 2024 15:30:56 GMT (envelope-from git) Date: Thu, 27 Jun 2024 15:30:56 GMT Message-Id: <202406271530.45RFUuvI078457@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: 55156b1fc397 - stable/14 - amdsbwd: Use device_set_descf() 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 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 55156b1fc397274fa9985ecfa60dd2c69549baf3 Auto-Submitted: auto-generated The branch stable/14 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=55156b1fc397274fa9985ecfa60dd2c69549baf3 commit 55156b1fc397274fa9985ecfa60dd2c69549baf3 Author: Mark Johnston AuthorDate: 2024-06-05 14:15:36 +0000 Commit: Mark Johnston CommitDate: 2024-06-27 15:27:41 +0000 amdsbwd: Use device_set_descf() No functional change intended. MFC after: 1 week (cherry picked from commit 1878529d2fc861ba2f14ec3c15bf373221883e41) --- sys/dev/amdsbwd/amdsbwd.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/sys/dev/amdsbwd/amdsbwd.c b/sys/dev/amdsbwd/amdsbwd.c index b04aa8564ccd..1dfe6c1b11bf 100644 --- a/sys/dev/amdsbwd/amdsbwd.c +++ b/sys/dev/amdsbwd/amdsbwd.c @@ -376,7 +376,6 @@ static void amdsbwd_probe_fch41(device_t dev, struct resource *pmres, uint32_t *addr) { uint8_t val; - char buf[36]; /* * Enable decoding of watchdog MMIO address. @@ -414,9 +413,8 @@ amdsbwd_probe_fch41(device_t dev, struct resource *pmres, uint32_t *addr) amdsbwd_verbose_printf(dev, "AMDFCH41_PM_DECODE_EN3 value = %#04x\n", val); #endif - snprintf(buf, sizeof(buf), "%s FCH Rev 41h+ Watchdog Timer", + device_set_descf(dev, "%s FCH Rev 41h+ Watchdog Timer", cpu_vendor_id == CPU_VENDOR_HYGON ? "Hygon" : "AMD"); - device_set_desc_copy(dev, buf); } static int From nobody Thu Jun 27 15:30:57 2024 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 4W92b6371cz5PtmP; Thu, 27 Jun 2024 15:30:58 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4W92b61QWhz49x5; Thu, 27 Jun 2024 15:30:58 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1719502258; 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=D/kWh/Tc0rXSt9Pz6JG5uYJXEA8z8bNRZduojGHN7iY=; b=EzcO9AZJ9KQ3XRttzoHVsvLeuk3m2Nt1MEoRXcj1ev7j9loCdtaHpn1X9lcttPULGT92jy ImtjtHCFDNefnnelUuXkJ1+zi4dv9UwwBEB6bGQtX3VM1Hnnvf/8ETw7tAhxpyQkJfaQ70 YTR6O3qEaCKaWJf+jxaT+dSFIxqe3JWOQArBxr6Wwd4wJO9BLR9A5yZfjDb3hf3jPVPbT4 EJMm50JtqksV3Eyt71/pcsjrRrBdMO3oZMhS5D7nduTAyXiEp3ZGpof3G7MqKBCWsQWj9U koFkh2YOXjyZFsVi3rzehUcbvwzDyGLERzfGG2Y6jnfiI+5JatgUnm85CP/NkA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1719502258; a=rsa-sha256; cv=none; b=STOE0t1SRYyMLns/Hw6MfPTWfw6ms7mfzyG+i0UFdzEwKMnjs+pMm53PxmjSY2uJN+UaHT 2ZWILS2NZ0BEc5M/Uglk42P4Tv0oiRdPcK63jZtGGCy9ZW9L2iH9Kh9n/6sZfcracUdi8e 6v622RbpY0h0mMWdkudNrYBBlpiwqZn9+goK+tgd0PW0qo/c8IyGMj05lOrZVDVXKqi1q3 gZ4BkkcR+2j3B4CTmikaTx+WAcYedJtLdWrxyJbO2NOqRWXecOj4wSXDs5XmVS19cqdR7R i1O3KgJpEF4Iv9j7oJViXV8llg/GFvYSu1uJFtX1KGNQf63rl3gtn6/6ThWZ/g== 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=1719502258; 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=D/kWh/Tc0rXSt9Pz6JG5uYJXEA8z8bNRZduojGHN7iY=; b=JBdfkpjfLWTUL77WnXXjU/ZIPqMOGmJZxv8YG1WFpKo+KIAJn6soxVW/IoSOj6wCAyfQL3 je6dASlj8MC5cxI8evzVV+PW5mXONL3ASqpk3hrhN4d/ASOSC0iWIhh1uHRcITYxE/pHV7 S6fynWbHWbWIT8pcCAumd4pzmOqToaKfpdpRQ2YINF46ElguXYFw3QE4R3yt5L14EnD19x Pzurp8aXNnYtn5pbwZ0ikN5vYkbFrkVJmsOGxFXhAxScfipZh/Wg3DDRw8Vsufk593YCYd 4sI2xAhEMKhGl9p6m1v7/evwXN8egUB/GpvLUmd8otq/aYd5qwWw7U4cLs0sFw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4W92b60W5NzHQ7; Thu, 27 Jun 2024 15:30:58 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 45RFUvH0078499; Thu, 27 Jun 2024 15:30:57 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 45RFUvBi078496; Thu, 27 Jun 2024 15:30:57 GMT (envelope-from git) Date: Thu, 27 Jun 2024 15:30:57 GMT Message-Id: <202406271530.45RFUvBi078496@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: b8ddd59d9d16 - stable/14 - amdsmn: Use device_set_descf() 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 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: b8ddd59d9d166f0712b1739fe342558663eed78f Auto-Submitted: auto-generated The branch stable/14 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=b8ddd59d9d166f0712b1739fe342558663eed78f commit b8ddd59d9d166f0712b1739fe342558663eed78f Author: Mark Johnston AuthorDate: 2024-06-05 14:16:22 +0000 Commit: Mark Johnston CommitDate: 2024-06-27 15:27:41 +0000 amdsmn: Use device_set_descf() No functional change intended. MFC after: 1 week (cherry picked from commit 48ef9cff9c2934d8a13eb8624c02050cd8f00595) --- sys/dev/amdsmn/amdsmn.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/sys/dev/amdsmn/amdsmn.c b/sys/dev/amdsmn/amdsmn.c index 36e3c5a5cae7..5af8d9aca7bd 100644 --- a/sys/dev/amdsmn/amdsmn.c +++ b/sys/dev/amdsmn/amdsmn.c @@ -186,7 +186,6 @@ static int amdsmn_probe(device_t dev) { uint32_t family; - char buf[64]; if (resource_disabled("amdsmn", 0)) return (ENXIO); @@ -203,9 +202,8 @@ amdsmn_probe(device_t dev) default: return (ENXIO); } - snprintf(buf, sizeof(buf), "AMD Family %xh System Management Network", + device_set_descf(dev, "AMD Family %xh System Management Network", family); - device_set_desc_copy(dev, buf); return (BUS_PROBE_GENERIC); } From nobody Thu Jun 27 15:30:59 2024 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 4W92b815hdz5PtmQ; Thu, 27 Jun 2024 15:31:00 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4W92b71rRrz49v5; Thu, 27 Jun 2024 15:30:59 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1719502259; 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=rqR/K/yY0ky1Dk3Km0SeFURx+meeA8J5CAmX0muM83E=; b=ih978VNXXGU6TydsID0+h9PXKjduEPjYKyHe8HqYobr1FrSY4mTBEQEaEHt1t85z51u56n PR+TMtqAeDAfUDVOqyJi4nU2C51XN8r3uaHXIx4p6lnetgAwjanJkT2bdjkmVH7xkclG7x 0jo9uyUu0+6PHg1Wb5XxjeFvRsV12+jnA6nOYzSfv6mT7i9xtEmpqNlhHf9B7Bz3OjG2PH Awt/oZ9WCCLPr6r75MSpp6oVu4MTB1ULUO2eeBXUK8Lo1Cxf4Cjcdpf3rr6VEE+jdG5oOt oTirkmdVkkuT1sSgeMpEQq+O4Qe39igL3tna8kKeEXtflZ862DK0x0/7PvXznA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1719502259; a=rsa-sha256; cv=none; b=MMs5/4d5ChjnNer+ZSDZiqHrwZRG18uLPqnlLXfvHQ0VcvKhcFH7GIBNE+X/ZIs63sOXSX yS0slEdM2GHJKLBDELbnKSfiZuOSXlmYTYAbw0/t1BTd+0MJRE0iwrF8e272Wr3zsKTnTj 2iG21tv9yOLNW7KgTlMH6hu3EL8xGW9N5JEzlGpWUaJiGN/PVg1CO3tBYKyOhTdFpkV+jt OtqyQFcbXAhOdbDvYPrN0Nv7/cXsJtsyv9QzgMp1fL9h3Go/8e2dpiAaR5wfMuqpGiNKSm NKpnSMHmgixLRy4TRC1edCxkL+Ztmfm6coOtAeLzzElY92gVow7wo2jJWkh1UA== 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=1719502259; 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=rqR/K/yY0ky1Dk3Km0SeFURx+meeA8J5CAmX0muM83E=; b=lf1VsX7pgVYPhd9XitMbrhHp80E3DheL7DAVVz22lZnyplvK8pW7knQ7VJKH3H6HA5aMcu J5Lh0/YxvDZ/iVOeptQYmlor6TqokwQWC2GtsHGBDqUwXjwJoHwtQpeGLVAOHo91xkMg+0 QOqeAz/vaBqqO1f1OBC/y5BKkUnIUgAQLJJEOOIanuXOcKLFbIdwXMEPCQ4LTDu1ZcSkCs v/J3+Dh1iE2ETyMbeyNHR2EeXQR1yycpBuaynWjyGN0NifPQycvXSiaFQMb75bPnlJ+RoD o5KhIIJEr+cec3hE+uo+QSsEfEjU9WIvsV7gM1lrRAsO5OvsYPiXxsaeK+4emw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4W92b71D6pzHQ8; Thu, 27 Jun 2024 15:30:59 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 45RFUx1F078537; Thu, 27 Jun 2024 15:30:59 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 45RFUxB3078534; Thu, 27 Jun 2024 15:30:59 GMT (envelope-from git) Date: Thu, 27 Jun 2024 15:30:59 GMT Message-Id: <202406271530.45RFUxB3078534@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: e416932e18a0 - stable/14 - netmap: Use device_set_descf() 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 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: e416932e18a0c4c8b485689a79224d2f0c98fbb2 Auto-Submitted: auto-generated The branch stable/14 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=e416932e18a0c4c8b485689a79224d2f0c98fbb2 commit e416932e18a0c4c8b485689a79224d2f0c98fbb2 Author: Mark Johnston AuthorDate: 2024-06-05 14:17:14 +0000 Commit: Mark Johnston CommitDate: 2024-06-27 15:27:41 +0000 netmap: Use device_set_descf() No functional change intended. MFC after: 1 week (cherry picked from commit 44d36c9731c172977ad8a95a09c0d6fbddcc9b2f) --- sys/dev/netmap/netmap_freebsd.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/sys/dev/netmap/netmap_freebsd.c b/sys/dev/netmap/netmap_freebsd.c index a4a0124471c0..cf3578ddc7fe 100644 --- a/sys/dev/netmap/netmap_freebsd.c +++ b/sys/dev/netmap/netmap_freebsd.c @@ -864,16 +864,12 @@ nm_os_pt_memdev_iounmap(struct ptnetmap_memdev *ptn_dev) static int ptn_memdev_probe(device_t dev) { - char desc[256]; - if (pci_get_vendor(dev) != PTNETMAP_PCI_VENDOR_ID) return (ENXIO); if (pci_get_device(dev) != PTNETMAP_PCI_DEVICE_ID) return (ENXIO); - snprintf(desc, sizeof(desc), "%s PCI adapter", - PTNETMAP_MEMDEV_NAME); - device_set_desc_copy(dev, desc); + device_set_descf(dev, "%s PCI adapter", PTNETMAP_MEMDEV_NAME); return (BUS_PROBE_DEFAULT); } From nobody Thu Jun 27 15:31:00 2024 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 4W92b84mdNz5Ptnx; Thu, 27 Jun 2024 15:31:00 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4W92b82MyJz4B8Q; Thu, 27 Jun 2024 15:31:00 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1719502260; 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=qAX85gQ89giO6sAsB6EzOZTLZkfBct8COIf9aXvhTy8=; b=uqQoXy0dM5+2haQ2MzhneyPSmYo77u2I6JGitjyQQ+nl1Q3t3NFDwDsULy01nmHK6g7Ee3 6kZx3QJZGuDBSP5cq3kJe5vEwPtiVR1dSSo8XFwj4xCP0LL6k+x8MVc9hRRDNvpcSYgR50 8d+KAn9rTWak7UGpkf2S43zLZWlicexYhpMdqsbnSF6GpnAz5wYYjtm0PES1Vzl08y1YMe Ua0CgRZaIIy1bjBX6SD0STNWCOazfDUi7sGWQY2WimNmG8wq3/1i57t4BSUpYwflXPmvl7 sdCTVm2QILeCBq+Oj5PtxGT0p7dHWKn25ZDfSrr6NEzN0v70XM4k0cdCFYWlXA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1719502260; a=rsa-sha256; cv=none; b=sOkAMVgo0GUNSxkjF+WKyMRHfX1JNcxCvKjQQ7JXFswLu8n3sgO0t4p7bbE20awWIdrm5i toyVt/ckrS+onfm118x53FnOdK6YALls14yzBzIUiBgyo1uBSmEX424/fzBnJhpCDBEvFB /vbgTu+vtmqMc2q7D76C1sDf4Q+OJ2+EEFHko3+SZy6YvEnZ1BxJvwA4/jTNrwuBs3Cc0Z Lpuic2GFmcYYJGB5lLTtgqEo23xGxt1OAP54/Wuc9nM2slc7qiNUTEJu8XXSem8xVG8D99 QF3BsPOIl6Gld4grf4gVAF807lnqZnNuyq5FcRrQerqOS6CN4y+yEULyiqnNPw== 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=1719502260; 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=qAX85gQ89giO6sAsB6EzOZTLZkfBct8COIf9aXvhTy8=; b=C/+mn1YiYV4poz83r5zgrbeOk+dAmz4KmSXB9Jk6HN/WK8y2iRD2SwL1/j97zQ65c/fTZf UqmcqKWyIJiAfB5+nIj+BV/Jfz3VdRfPu0yXJYrEmvw1Wr8jKZ/HB9t+GGWgERwIZcc93j Drq8O9zTZG4h8XMpLl2tzY142HFa8eCNIN4yJ0yt0pdB37gHkOTONdpd8MP6zN8Ji/HBUf 5rfBTVvcBFUTfs9ifxbeO8wTOYTUbcGPgRP4Uxd8jlbgktFld8BT5KkDLG2GekBKuamqol FGFjFqfoDG47TfxUnVMwpSgxwvJhlSH4EwXeaFgSpapiHMVNpDc2+8o+bQy0Gw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4W92b81pTkzHQ9; Thu, 27 Jun 2024 15:31:00 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 45RFV03B078580; Thu, 27 Jun 2024 15:31:00 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 45RFV0So078577; Thu, 27 Jun 2024 15:31:00 GMT (envelope-from git) Date: Thu, 27 Jun 2024 15:31:00 GMT Message-Id: <202406271531.45RFV0So078577@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: b86ba6cdf113 - stable/14 - iicbus: Use device_set_descf() 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 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: b86ba6cdf11385330f7d84022bc477ead676ee2a Auto-Submitted: auto-generated The branch stable/14 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=b86ba6cdf11385330f7d84022bc477ead676ee2a commit b86ba6cdf11385330f7d84022bc477ead676ee2a Author: Mark Johnston AuthorDate: 2024-06-05 14:19:06 +0000 Commit: Mark Johnston CommitDate: 2024-06-27 15:27:41 +0000 iicbus: Use device_set_descf() No functional change intended. MFC after: 1 week (cherry picked from commit 48f5a429c95513465327f722a8df52cb48eeb473) --- sys/dev/iicbus/iichid.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/sys/dev/iicbus/iichid.c b/sys/dev/iicbus/iichid.c index ff443afbf30a..222f20842a04 100644 --- a/sys/dev/iicbus/iichid.c +++ b/sys/dev/iicbus/iichid.c @@ -1037,7 +1037,6 @@ iichid_probe(device_t dev) { struct iichid_softc *sc; ACPI_HANDLE handle; - char buf[80]; uint16_t config_reg; int error, reg; @@ -1097,10 +1096,8 @@ iichid_probe(device_t dev) sc->probe_result = BUS_PROBE_DEFAULT; done: - if (sc->probe_result <= BUS_PROBE_SPECIFIC) { - snprintf(buf, sizeof(buf), "%s I2C HID device", sc->hw.name); - device_set_desc_copy(dev, buf); - } + if (sc->probe_result <= BUS_PROBE_SPECIFIC) + device_set_descf(dev, "%s I2C HID device", sc->hw.name); return (sc->probe_result); } From nobody Thu Jun 27 15:31:01 2024 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 4W92b96Wjlz5PttX; Thu, 27 Jun 2024 15:31: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4W92b935ZRz4BnW; Thu, 27 Jun 2024 15:31:01 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1719502261; 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=b8QvfAGbGFiQEfNsnqgylmSB9jOwMIlyiJD6EhSWvA4=; b=EbUUpTok7kU9dSaGAKWeCKoI9cpLqHVr1zyktlHYjH35pECwCmPuSk78OW9aPgG21a9tez dCni5jClxfK3ztnadMXKZWESW76wwQWv59tNOHpFiWElsXPr5pRqG/SfXDbzEoS2p/iTNu EqrDaOVKlMzLHQHUqnCLeDO4AXOAS/P0/gpONE5Xh19L6olbddsG2bED+TlD1f5kL3KveG 6hnkSp/WLuHrm67t8S8wwnKB7oIQa+njmiPPJuL0xcO4XXF1fPIcsO4z/GhAYsp/dIR/1Z dfFKBJdKGP0Bu0B/4my2XJxMf4nVIku6loHMTBtYPk7gKu2qWOixaR+kb8uyiQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1719502261; a=rsa-sha256; cv=none; b=i6HwVFe66rBbt+NvIQJCE8CJJ3pmgH3iPl+1qMaGl0z5cV8XiCeHdV46oBrC5UhhJOs3jk Pv++g39TYXNOBOIn6PGlX5ZLfER6qEFx0mvAG16nw0yzDPMq9GZYJ4JEJGlxJMJJXhztoL fHVMqDxobyQq2eDWz5u0aCnn38C3M8UxhgZIIV7Q0KYozI63WSPNBmsiQPnSTeST0pNyYE 8lnYDdhxcMdNFHdF3jEcyYNz9jFHqSfvYSqSdPEtlDa1iHtyJDDSLzq6yHzzUqTqZ6s429 Q9oUT60bIIn+pSF4MrBE4IV4DveLj+c4KE70yhWFsTVSPuDLy3luihVD5YweMQ== 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=1719502261; 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=b8QvfAGbGFiQEfNsnqgylmSB9jOwMIlyiJD6EhSWvA4=; b=RLCpvgG4FgmvyTxsUff0tY1XodbWnET4hFV8bcge0tLQ7KWVIbNlR4SXm4UTScT/7urFU1 k+5z7gGXvliBXjJLs+OYyod3MUZntJTiu30V8SYU401ZWKsUJ/eYTKS8rE858e8f4H3i9Q QmG/GVgUQzUfSOiPgvIEfpxWktFFBdkscu08o7CRQ+BtaR6K11ZiQWTKRuVaOZaoNoXCn4 bDXZ9mstGP3GznEb7VXCKL9aWAHUK3Hh3Df8pSkOaD+e4ee7Iq+DXfxHXeI8a1pX7xCf3x lEHPOlJ4jHOC+i6tqxyhurnkJOxHpQuMA/+2ZFKMnn7/1pjaYW1I3aXmAQ8EPA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4W92b92WbBzHpY; Thu, 27 Jun 2024 15:31:01 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 45RFV1kQ078616; Thu, 27 Jun 2024 15:31:01 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 45RFV1vU078613; Thu, 27 Jun 2024 15:31:01 GMT (envelope-from git) Date: Thu, 27 Jun 2024 15:31:01 GMT Message-Id: <202406271531.45RFV1vU078613@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: 50d188a80585 - stable/14 - wbwd: Use device_set_descf() 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 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 50d188a805851febb238f4fce82f9d7f98249edb Auto-Submitted: auto-generated The branch stable/14 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=50d188a805851febb238f4fce82f9d7f98249edb commit 50d188a805851febb238f4fce82f9d7f98249edb Author: Mark Johnston AuthorDate: 2024-06-05 14:19:51 +0000 Commit: Mark Johnston CommitDate: 2024-06-27 15:27:41 +0000 wbwd: Use device_set_descf() No functional change intended. (cherry picked from commit eb634b9f4f48c29753e177f3340d03f73a75dbe5) --- sys/dev/wbwd/wbwd.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/sys/dev/wbwd/wbwd.c b/sys/dev/wbwd/wbwd.c index 4fe77c1874be..9aeaa2014eda 100644 --- a/sys/dev/wbwd/wbwd.c +++ b/sys/dev/wbwd/wbwd.c @@ -462,7 +462,6 @@ wb_watchdog_fn(void *private, u_int cmd, int *error) static int wb_probe(device_t dev) { - char buf[128]; struct wb_softc *sc; int j; uint8_t devid; @@ -479,10 +478,9 @@ wb_probe(device_t dev) for (j = 0; j < nitems(wb_devs); j++) { if (wb_devs[j].device_id == devid) { sc->chip = wb_devs[j].chip; - snprintf(buf, sizeof(buf), + device_set_descf(dev, "%s (0x%02x/0x%02x) Watchdog Timer", wb_devs[j].descr, devid, revid); - device_set_desc_copy(dev, buf); return (BUS_PROBE_SPECIFIC); } } From nobody Thu Jun 27 15:31:02 2024 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 4W92bB6Qy8z5Ptdy; Thu, 27 Jun 2024 15:31: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4W92bB4Z8rz4BKg; Thu, 27 Jun 2024 15:31:02 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1719502262; 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=PKZTvhuvknwgTba/mnxUOw6Q6YLQxfX/6VD8uk3QTfU=; b=Ww/oL+k+QP48bbtxOLAG7bGRiHsfFsYt37Tda25X6eFYxWt7htN3qyCJT4qGm5sMiUDQiA sAD2UAGXctpvnYGwcHtN94QLkupnMe+PqEHI6JaRYd/sRI5vUHUBHHfZsjz+2KuJi8peN2 1L2moUkr42pyl7/mKJry4Y4jxrwpiUFysuIVMmQl8jZDjt/3+HSBbFlNjN4hf4VjWiuMKJ p9YfNgGl2oPb8VXUB+NZqrObjRFcYiQ2+JJI/05gkvGtDWv7iVa9uz5Cp64pTL3bDSFVdv jvgdwfwIbPaMr0xzc1t2yp52B+XFjEQUj66p7+bNWZ+6kKvMrZO/37k5oPyO2A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1719502262; a=rsa-sha256; cv=none; b=EDkDxzzR/CKvq3zYTbxc9+ZP3iWHr+eEwE9XMWnZnSCDDfuHVHXjdnrodQlc11zB90yIGo qr/4PJ6Hq5gJL+yhOM556VC03Lcy09q+MujxMHIZ00iwSI/5UO6vMMqQ3+SwfcrAHuDZ1M 1cXwih2XqoP31/jhRK1QhrP1Z+B+aNE4FnGpesJIlhJDqDwLpGgCA0Z9/7EBZaMZrYXF2m NtAxIsRlg8KrU1tGdCIj6/50/pVtjoMR1l0u+UprZ1zLPnvtsUa6F2jfU1O2l5j67/ry5/ n2mbva16tE0oHpexoLXGxTnbCiRfQyA717ELWOBpKUGl2zkVA3r8DCWN8HUArA== 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=1719502262; 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=PKZTvhuvknwgTba/mnxUOw6Q6YLQxfX/6VD8uk3QTfU=; b=poJHmKPoQgg4MAiYE91KPXzBhPmtazXl6DSEQwmBEezXEwFFrPEJ5SK4LTai6pZBDB4Gfg 9Bvn6qr8EkjQc4SneOndkz/tStKQp3VBCi0XDhe182JGjIFIn0gTJW1VmryIIdVlF656k+ Bw8uMwwm6fBs8hPgk1JXMF3FA5ta2XgkZh3XlejWLblspJS/ob52pUu4U20cgGQviJVYzR VNFpD0BB2NMWWJnNTA5YHhRqhpT+1G+fZ93v70plrLWQIUNsWCgncMKm9tTforhPv4AG9G jLmf9WWjg5O2q8No62xy1EyKX9+mCyPQQ13dvDjYLsEZCQOKUBvP/SxsVF6kPA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4W92bB3HGXzJ3h; Thu, 27 Jun 2024 15:31:02 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 45RFV2bm078652; Thu, 27 Jun 2024 15:31:02 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 45RFV2BC078649; Thu, 27 Jun 2024 15:31:02 GMT (envelope-from git) Date: Thu, 27 Jun 2024 15:31:02 GMT Message-Id: <202406271531.45RFV2BC078649@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: 363ef77c07fb - stable/14 - mpc85xx: Use device_set_desc() 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 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 363ef77c07fb8c0e4822c1a4561c8974897ac96c Auto-Submitted: auto-generated The branch stable/14 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=363ef77c07fb8c0e4822c1a4561c8974897ac96c commit 363ef77c07fb8c0e4822c1a4561c8974897ac96c Author: Mark Johnston AuthorDate: 2024-06-05 14:20:12 +0000 Commit: Mark Johnston CommitDate: 2024-06-27 15:27:41 +0000 mpc85xx: Use device_set_desc() No functional change intended. MFC after: 1 week (cherry picked from commit aaa878e956761167f8115a32698c8b424fd341c6) --- sys/powerpc/mpc85xx/fsl_sata.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/powerpc/mpc85xx/fsl_sata.c b/sys/powerpc/mpc85xx/fsl_sata.c index 16a8ec963b27..9279a8d43810 100644 --- a/sys/powerpc/mpc85xx/fsl_sata.c +++ b/sys/powerpc/mpc85xx/fsl_sata.c @@ -317,7 +317,7 @@ fsl_sata_probe(device_t dev) !ofw_bus_is_compatible(dev, "fsl,pq-sata")) return (ENXIO); - device_set_desc_copy(dev, "Freescale Integrated SATA Controller"); + device_set_desc(dev, "Freescale Integrated SATA Controller"); return (BUS_PROBE_DEFAULT); } From nobody Thu Jun 27 15:31:03 2024 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 4W92bD13bkz5Ptr4; Thu, 27 Jun 2024 15:31: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4W92bC4lg0z4C99; Thu, 27 Jun 2024 15:31:03 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1719502263; 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=gmIwhnOx61R4gB6RMBw/LeJ6lud/9kiY5ZDt8IaqpME=; b=mpDE4LGnI6w28p/Ux4f5yXsB3Vj+TY03ZrrBrv/xZxmyPfQLq48l/zgohjZTIbKbS9GRKt oowOmpXus9tTUKY+xNNqS+eYi+L2qsncQ+6GF2GqEz5X1x+XzzwYZ/gbUIhcz4bF4ofA7L 2lwzVClNRHEQwCSE/F5yTMPnwPSUio93/32GkNbu+Qe7Gd7gA8i12JoqhKWLczWheASEIH IellDGdTcr6JOF0tu15hIlMvYmQ2vn9k1S1Z/qtJpagLH+U6LGOQJBlvgJhhCNw04R21Gr tcMogNDLbwSDIxeju7DLVfwWv0ph8StnuGT3/niwZBEEyuV3fiyIpE1bD41dpw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1719502263; a=rsa-sha256; cv=none; b=w4w/iP6ieJNu3Yf4d9N5Ar2lR6I+BKAlXWv16d8n0t8khbKYt8V55cYxVrwll6T9QwOuVK HF5BhNPY0lrnPO3la+aeyjl6YIk/RiRSDM9mUfBE7yKt8K0PjhFhzNF86mLbWR8v6bnMQK DaLoaFgqi6sOJa28R4+R0WYjo0ScAerW5tCgF/yOCdAvXiluThqZltk5HML6CQSwSORSRD 8T5vA7iFBlbOVjMdWjnw6W7jqeoXDiTo/aqiA+WhfL2YvqmCYShq822KspJTIXzIAY1lkP 7BHRvpTSoTxwrGztVJeRKjCWKHz08+9q/OTUE+ICeUSn4LxRnwuM/vCAWUKzsw== 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=1719502263; 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=gmIwhnOx61R4gB6RMBw/LeJ6lud/9kiY5ZDt8IaqpME=; b=HJxcjSdYk7+Khztv965LP6CHFj8aBl6mZX5FfZappntRsyR1Am89c+WiMX40rQe85OA69H sDrz0caoj1m1bUaANCfUvNOqGf6/y+nG2OpBM7M1HhoTVCEeS1GL0TTcvCev0YzqOFTILO V+MuKXSf3A5b/GICV7nRe24TrHKEKuD1Ve141lrgPGPD5aCi8nhVs7zS6p8PFQd5VIFKGb w0zq9+qSaHtKhfgpT/NOhbCL0nG5R3XZTtGjftyB3n5Erq0/SaC3zDLWhkgC7TK1JFhfI3 JHt1n+Z4V4TpEcM3GCCtf1NKH1SiPwdp5Sp0zi2dg308nPFSveBqA5kyySjjuA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4W92bC4MtRzJ7H; Thu, 27 Jun 2024 15:31:03 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 45RFV3P0078688; Thu, 27 Jun 2024 15:31:03 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 45RFV3G6078685; Thu, 27 Jun 2024 15:31:03 GMT (envelope-from git) Date: Thu, 27 Jun 2024 15:31:03 GMT Message-Id: <202406271531.45RFV3G6078685@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: 57d8375451c7 - stable/14 - msk: Use device_set_descf() 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 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 57d8375451c7eb53049f45064afd60bd4c311391 Auto-Submitted: auto-generated The branch stable/14 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=57d8375451c7eb53049f45064afd60bd4c311391 commit 57d8375451c7eb53049f45064afd60bd4c311391 Author: Mark Johnston AuthorDate: 2024-06-05 14:20:58 +0000 Commit: Mark Johnston CommitDate: 2024-06-27 15:27:41 +0000 msk: Use device_set_descf() No functional change intended. MFC after: 1 week (cherry picked from commit 443f33481e461ae1f36e0110537131b972ec6a37) --- sys/dev/msk/if_msk.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/sys/dev/msk/if_msk.c b/sys/dev/msk/if_msk.c index 4b6954e7d067..ea6157cbbec6 100644 --- a/sys/dev/msk/if_msk.c +++ b/sys/dev/msk/if_msk.c @@ -1565,7 +1565,6 @@ static int msk_probe(device_t dev) { struct msk_softc *sc; - char desc[100]; sc = device_get_softc(device_get_parent(dev)); /* @@ -1574,11 +1573,10 @@ msk_probe(device_t dev) * mskc_attach() will create a second device instance * for us. */ - snprintf(desc, sizeof(desc), + device_set_descf(dev, "Marvell Technology Group Ltd. %s Id 0x%02x Rev 0x%02x", model_name[sc->msk_hw_id - CHIP_ID_YUKON_XL], sc->msk_hw_id, sc->msk_hw_rev); - device_set_desc_copy(dev, desc); return (BUS_PROBE_DEFAULT); } From nobody Thu Jun 27 15:31:04 2024 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 4W92bG2gHsz5PtkZ; Thu, 27 Jun 2024 15:31: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4W92bD6n2Kz4C9y; Thu, 27 Jun 2024 15:31:04 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1719502265; 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=ETp47ZbetvtbQ3ooPNN8XmKGrjey66uT12um0nZjTH8=; b=S1OnvjcqT1uqG1qZkMkKIezqWhKhiJW1VtFPB81Sf2rWb6t2X1hzzdngxXyt59KxSj3xyg bQrxYLR7Sl9dU6yr6aOBiuuzuGDSUvVNMr7QAz3mqfhT7MrsMN7j/CqlpfTTwRzKP8QMDX rzx62rN8xxm8rsUBEPw3NRRkV1OU9oqZc4YTbEGFmoWND2Jdv7Yqv5EC7eseJ2+j7XrRgw c7f5cLd8tXrfSTsCQUskOwqE5fvX635/9mQqxeEMmqaSbppinSuEBVx9KFHE3BI/9d0GKZ mttIwPPcsiavDzda2Vk3vx5Kf+j0KDqqDcyLPnCy6jdJhcEcCWyhr/LdvjqZSw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1719502265; a=rsa-sha256; cv=none; b=NRpmxR8EWyT7Is0hzdwxokShjN5GPhSpYgUbFXAEYUKOe9OaIgMGHNOdDklUCAZRq/0MXy PVW15Le9Ifc74R8e03VZcEBwKYPN7XFbTDNDPkv6UJLYZp194zcR3Nk75P+dN4wvT3oh/z uL2vuYQ5f9e6wkEGr6/d6A484Pqz6WEPvhOKDS7hHYM1rnZXOlHtqkbHYb1hAJpbAJA4rR mLFg1VKm9UA7Nz6yN4E3z2b/FTf7TDcVB5gAkUMr3P6HK4I2taRVLYfOK3dIMnwOLH91yn THHwgeSudwmeQ0206ko6LfyT1TJuvxlCFPMFh9MwrmZphH/2h2DUPbGB1cGI5Q== 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=1719502264; 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=ETp47ZbetvtbQ3ooPNN8XmKGrjey66uT12um0nZjTH8=; b=aonf7PASlx0c7E0YDQC/F0VCsX5ZkL5rXJrfNFfvPdk3ylwQ1mSyq+iy25kryKIr6j501S Pld3DFfB1CSpU995bC/cSze6eXKLXDvmNInuU4FaR8jVHAvBSNtwLohuHCTh9MB2qDTKn3 JvqX32PKRCjP2qeB7zUx3tS+FD5l6JVTYZXJRlC62W7nWQUJlzw5wBIO2rD7fis0PuEHp8 XdYNKr6nqbZdCSaCpnGeZ2SJRNrbI3gz2n2U+IWqyfGsnLTLbsKGtZg6xgq4OJ8OFzPUIf cvzCpghcY/6k9LIqPUU6UAxkattjY+6SP5/7kJaVivbWp83kyaGePvTvY8cwIg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4W92bD5NmNzHgW; Thu, 27 Jun 2024 15:31:04 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 45RFV4xg078724; Thu, 27 Jun 2024 15:31:04 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 45RFV4D7078721; Thu, 27 Jun 2024 15:31:04 GMT (envelope-from git) Date: Thu, 27 Jun 2024 15:31:04 GMT Message-Id: <202406271531.45RFV4D7078721@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: d0983e084ba2 - stable/14 - liquidio: Use device_set_descf() 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 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: d0983e084ba20799ed59deb69f77e10a25d7ef87 Auto-Submitted: auto-generated The branch stable/14 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=d0983e084ba20799ed59deb69f77e10a25d7ef87 commit d0983e084ba20799ed59deb69f77e10a25d7ef87 Author: Mark Johnston AuthorDate: 2024-06-05 14:26:22 +0000 Commit: Mark Johnston CommitDate: 2024-06-27 15:27:41 +0000 liquidio: Use device_set_descf() No functional change intended. MFC after: 1 week (cherry picked from commit 1794a0a87e0cecee1ef63fcf4f0a8a6cf6945dc8) --- sys/dev/liquidio/lio_main.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/sys/dev/liquidio/lio_main.c b/sys/dev/liquidio/lio_main.c index bec510af0c65..aa52612dda04 100644 --- a/sys/dev/liquidio/lio_main.c +++ b/sys/dev/liquidio/lio_main.c @@ -200,7 +200,6 @@ lio_probe(device_t dev) uint16_t device_id; uint16_t subdevice_id; uint8_t revision_id; - char device_ver[256]; vendor_id = pci_get_vendor(dev); if (vendor_id != PCI_VENDOR_ID_CAVIUM) @@ -216,9 +215,8 @@ lio_probe(device_t dev) (device_id == tbl->device_id) && (subdevice_id == tbl->subdevice_id) && (revision_id == tbl->revision_id)) { - sprintf(device_ver, "%s, Version - %s", - lio_strings[tbl->index], LIO_VERSION); - device_set_desc_copy(dev, device_ver); + device_set_descf(dev, "%s, Version - %s", + lio_strings[tbl->index], LIO_VERSION); return (BUS_PROBE_DEFAULT); } From nobody Thu Jun 27 15:31:05 2024 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 4W92bH070Zz5Ptx8; Thu, 27 Jun 2024 15:31: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4W92bG07GYz4Brg; Thu, 27 Jun 2024 15:31:06 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1719502266; 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=NSj46aadkt36ZaSCJDokCiUH8/XM4+RZc66TJOT5HBo=; b=fWcp5h3fQoYbDcvxpmu9ZqOXLW4+Ifgb8wIdbHeBPp6w1VWftzpZ5o3UU0uAFJvw9XrW09 ThIopFM+20AWjELCN8mhjElOIKTdSC6eAoDkZJxC/0iHmMnGoRHAeHmf1+SnN2x/SrN06x 6PPbACdmKKVMpZfyUgAnbcS5NJRxCn53I3FLdCmIILVq2lF/UGp8kKT5foHnzupPd1wMLM 2tNMWOBaxe3EtEndsaI3t7BluZwevYf8tv1jF6nnnQoR7s7x4iAwfMZd8ThMcY3GUbk4J/ cF0M09wk4IAAWOpHAtGH7rGl4zeF6ZYXVg4fTVwR4h1PX/kWl526Fyd+zT4kEg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1719502266; a=rsa-sha256; cv=none; b=VYNXH/EcewPMKuS6WD5L7L0hYfiVRq1p7MTjWlIrlXx59kEeF+u5QAhtqcB1M+xSejzh6X w12yBE6S6am8LmLIFUSXSpkC1GgsqrGm1ZFWr6AHjYPev7hGuAIU5RvAa4FFQjck6WIPMK KV2YnQP7lyE0jzyMc8sYBrkjM5gUz6ACvT5v+K3Bpy8f7fmkItqX4dThA3botuMCBcfX2/ NTdMcY0zKSu4tjIX8L7LL2opGDGk3CQhQPy9DXTNW6ulNNWIvWswi7lCv5mHSe7Sd1fa8h jiXaoBKPNEes5JJN8BKJB7AwZIjS7BQtPcd7SySucTyjRJ2Lw0wmR5nUUaWunA== 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=1719502266; 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=NSj46aadkt36ZaSCJDokCiUH8/XM4+RZc66TJOT5HBo=; b=xG78LLfFNPIrGf9NWYATmPOIfstpeUbKvo30XoVSPMZ+ZhPkO4z9Q+HXtac30rJV2ev2V5 tsa4xV1NWiwmlRJ1IZAiMuL7trX/Mp2ZKS9nTMuzstHwtFLLSGLcvws0wJ4SHsFhebaYTQ odr2TREjCIlFdIEO+IKYyFeALvCHKEyt7oxczOL0pJGCOYDUrBTul5XiEIVz0kEC1bBFbJ PlrJfXovsQmFoaMCeK+4G0yqjyR74mbG4xS/N3DWfDL/9LTAHwQ71/sMub5MXWS7pw6ZI5 DeYaJKULL/00eCHXFN3AeXfRtCsW5TiaDp7+JNBFh2zYieYI3vUbeM73qu4Eng== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4W92bF6f18zHgX; Thu, 27 Jun 2024 15:31:05 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 45RFV5Eb078762; Thu, 27 Jun 2024 15:31:05 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 45RFV5pk078759; Thu, 27 Jun 2024 15:31:05 GMT (envelope-from git) Date: Thu, 27 Jun 2024 15:31:05 GMT Message-Id: <202406271531.45RFV5pk078759@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: 14dbc9a4b4d4 - stable/14 - bce: Use device_set_descf() 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 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 14dbc9a4b4d44a1cd8503255a4aa2a99365731fc Auto-Submitted: auto-generated The branch stable/14 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=14dbc9a4b4d44a1cd8503255a4aa2a99365731fc commit 14dbc9a4b4d44a1cd8503255a4aa2a99365731fc Author: Mark Johnston AuthorDate: 2024-06-05 19:22:32 +0000 Commit: Mark Johnston CommitDate: 2024-06-27 15:27:41 +0000 bce: Use device_set_descf() No functional change intended. MFC after: 1 week (cherry picked from commit c0bd6ec3bb2414d23f3013766b79eed51b31f696) --- sys/dev/bce/if_bce.c | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) diff --git a/sys/dev/bce/if_bce.c b/sys/dev/bce/if_bce.c index 33158b75486c..2564d0c1dac6 100644 --- a/sys/dev/bce/if_bce.c +++ b/sys/dev/bce/if_bce.c @@ -671,7 +671,6 @@ bce_probe(device_t dev) { const struct bce_type *t; struct bce_softc *sc; - char *descbuf; u16 vid = 0, did = 0, svid = 0, sdid = 0; t = bce_devs; @@ -695,19 +694,10 @@ bce_probe(device_t dev) if ((vid == t->bce_vid) && (did == t->bce_did) && ((svid == t->bce_svid) || (t->bce_svid == PCI_ANY_ID)) && ((sdid == t->bce_sdid) || (t->bce_sdid == PCI_ANY_ID))) { - descbuf = malloc(BCE_DEVDESC_MAX, M_TEMP, M_NOWAIT); - - if (descbuf == NULL) - return(ENOMEM); - - /* Print out the device identity. */ - snprintf(descbuf, BCE_DEVDESC_MAX, "%s (%c%d)", + device_set_descf(dev, "%s (%c%d)", t->bce_name, (((pci_read_config(dev, PCIR_REVID, 4) & 0xf0) >> 4) + 'A'), (pci_read_config(dev, PCIR_REVID, 4) & 0xf)); - - device_set_desc_copy(dev, descbuf); - free(descbuf, M_TEMP); return(BUS_PROBE_DEFAULT); } t++; From nobody Thu Jun 27 15:31:06 2024 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 4W92bH4YyMz5Ptth; Thu, 27 Jun 2024 15:31: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4W92bH1YWDz4CMV; Thu, 27 Jun 2024 15:31:07 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1719502267; 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=IGe7A75tX6JUJ2VigcLiN/PXlzjKhbE99rFEPzlPhjo=; b=rW1LNPWSAriP1R2U9I5czTPEzMa02/577ky73BFFPV9QawZsI6OfI+r4ibSc/dLWx3K8o7 pYrk8GQA8UzU+gOHi47ODoRVYEEu0J/aatQSSvH02E9xwKm9GmrMftPFVolca9arrUuUxI afHCH4sLGW+c9jwIzJ/qRcqXYee3ZPCOAnw955QugL6VXcZzanvC9iDmY6wsUJf1sRmEds Zjj+RC/aLdkMpD2CIsO5bLdChBGyhVO6PxKLeM0+7sAXcJ6IsbgWks00ObCCs1+sTzwtUH GnCGpVmnCCTssv0ixFYimV5+o+OG1jQkeDaTk7aIHDmpMd5i84vH9HVdA8yudA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1719502267; a=rsa-sha256; cv=none; b=gzvmj0QzEbKJnJSw50YP+Gg3njS94JYDEIOrX5ROg0vq/a6sJ2esUWtFN+rvm6pOk0yos4 RaqJHa3MWew+DNQlsUGU4HFfsgSriulgkBGx7AXdaa51oIcleO8QYyUFzlYv5UytNcaUYo q24ZWtLxHq/MKRaWcL+GWCfc84bNYwYGLtKOHCltM5K0e6ZQcCej2ku2SaVvHNF86wlosq 1arzJ3JlY3wDX5JbQzTDBg/EesXAMwB20M9PUeIXxXjWlDGL8C0uw89AzqkzKPONyDeBPp ZoGy+GfilLR6RvgBYwmA87DIQLaDEGTgnD9MS09IE1QnhsnVZj5r4pWtoEJx4g== 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=1719502267; 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=IGe7A75tX6JUJ2VigcLiN/PXlzjKhbE99rFEPzlPhjo=; b=IdUJo7ZiIZcDXkAtVBwRHIuVtHdjQVW2lbGubMEybueOz9VhSm/M+PyUuE79kcyK/FxxYW ZlJIO3c5qN7k5ndCUveDznCN6USqlL/PKupB08NsicpD4KsCCEBwHfc8IuW/M7IE6Jhmv2 w7vKL+EjSL2lU0T7tyHVZA4uwLwtT9gjSWBuBUFPxRjSoaHhMMnjkzjTLDNh0Zxsrl2h6+ r4RZqdAEyGfWTTVFdCDQ0CrXAojvPKmAKEk2NhQ2eZxR3YZ2COXQGkrlRCWkaMjlWHvVvJ dRn2r4xVzUwLe7lTAdezmfMa2wHhorBLXdyQSObicECN6WKaWKflcWFeL4Ya7Q== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4W92bH0W1JzJBD; Thu, 27 Jun 2024 15:31:07 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 45RFV6js078802; Thu, 27 Jun 2024 15:31:06 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 45RFV6VZ078799; Thu, 27 Jun 2024 15:31:06 GMT (envelope-from git) Date: Thu, 27 Jun 2024 15:31:06 GMT Message-Id: <202406271531.45RFV6VZ078799@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: 9f74e5edafdc - stable/14 - bge: Use device_set_descf() 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 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 9f74e5edafdc91469ab72f4900e46e27cfe72f54 Auto-Submitted: auto-generated The branch stable/14 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=9f74e5edafdc91469ab72f4900e46e27cfe72f54 commit 9f74e5edafdc91469ab72f4900e46e27cfe72f54 Author: Mark Johnston AuthorDate: 2024-06-05 19:23:26 +0000 Commit: Mark Johnston CommitDate: 2024-06-27 15:27:41 +0000 bge: Use device_set_descf() No functional change intended. MFC after: 1 week (cherry picked from commit 50505c853c6cf1a4e8fac54d20c43f0f91ff0c67) --- sys/dev/bge/if_bge.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/sys/dev/bge/if_bge.c b/sys/dev/bge/if_bge.c index a646ed226d3c..3e43b8e31442 100644 --- a/sys/dev/bge/if_bge.c +++ b/sys/dev/bge/if_bge.c @@ -2699,7 +2699,6 @@ bge_chipid(device_t dev) static int bge_probe(device_t dev) { - char buf[96]; char model[64]; const struct bge_revision *br; const char *pname; @@ -2727,9 +2726,8 @@ bge_probe(device_t dev) br != NULL ? br->br_name : "NetXtreme/NetLink Ethernet Controller"); } - snprintf(buf, sizeof(buf), "%s, %sASIC rev. %#08x", + device_set_descf(dev, "%s, %sASIC rev. %#08x", model, br != NULL ? "" : "unknown ", id); - device_set_desc_copy(dev, buf); return (BUS_PROBE_DEFAULT); } t++; From nobody Thu Jun 27 15:31:08 2024 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 4W92bJ4Mlyz5PtxF; Thu, 27 Jun 2024 15:31: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4W92bJ21Ggz4CMq; Thu, 27 Jun 2024 15:31:08 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1719502268; 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=6gqtvgCZ/tzZqan8sTXagkbAGalkKteBsjyVe7kslCI=; b=jRec4R37m9KluX8iWRJA7MijYSFLOwFpXWjBEA4Cg7791aevTty6rDyJw6BDBGctYWdHna UcbKppsLUZXruv81vXUlZBaXIXSvepCFQAjJjj7rG49H7pd9PNAICy3a4hnzzS6NvJVpJy P1kRVV3Pe3Qy84h0Yc8MIZOPsUMRX71/dRW4pbLPbNeSSpRH2cu0MxNdkjoTeRcswD7dC7 8xh+fFjYhCSKcADa4ECsHM0cWLGXqrnsQekgPjhJMFpJMWA0tJKXUl9+AacCQiKoNG+Koq IniCSToZNUmutrt0K0jj6F+zN/KVdX8kwU19+yltYVt/aJVRR2PGuUlGblcHkA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1719502268; a=rsa-sha256; cv=none; b=soaIixefS7M/vxM/e+o8Uwoy3eC8769Sd+i5bODFYX8M3so8tYRe6s20zPmOH8uYoTmqgD /amL4oEI39n4VIblfepaaBSjfnXXwA+VdxtvZ52K4ODm7HWYSV5/rvNhFtlJTvo1mFYG8M fklSeQaLni2LXlWBgZt7Oa8q47p3+RHMvZDxW4VaDEiPZOKoc27PRpwbFtvgLBIx0FnCot DJ1J7AL1GtJ4zu+wkI/7hMYhopR9romIMvlm30gZZjZuX8SBlESvqXcgKzorP9FiWN7SIl /C/RYwc9nid+RBa3KoaR4iRlBOC03/PO4BoTnfADkf5IkZ7SDQehqiWIrO0EWQ== 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=1719502268; 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=6gqtvgCZ/tzZqan8sTXagkbAGalkKteBsjyVe7kslCI=; b=V4bqpiVGuDoAf6FAKikslYjuvKXRzFk3F1vLTZmU4AaMbVWQKjfs6F2oMJYxXqyDZZ9Aak /3E3vKsQ1+xoB9/pp9RN/3uyh1mcy9ZxW+qJzaoiltXbr02y846WBAlua9TqUv4Rpu5M6W R1qgDZA1NRop84Q2jf2KGchQDG+u6Vzf5JDw1LWV/SRmaW64qhdgpx7PI5vqnbVws2p637 O79Fmr0TH32+FSz/nzCoPF9gnpp/Mxkz8VheNBnYCwMoe3+sIh/A9h4LawTvZA/i91ZmGF 0+HchKUAW46HkhTx9bjIJoeMej9lOOEnqukhvogD0yNYQ4CBDoyiM45aSjOtEg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4W92bJ1crjzJ65; Thu, 27 Jun 2024 15:31:08 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 45RFV8fC078838; Thu, 27 Jun 2024 15:31:08 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 45RFV8Dm078835; Thu, 27 Jun 2024 15:31:08 GMT (envelope-from git) Date: Thu, 27 Jun 2024 15:31:08 GMT Message-Id: <202406271531.45RFV8Dm078835@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: 4fcaee7a5f4a - stable/14 - bxe: Use device_set_descf() 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 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 4fcaee7a5f4ac12aeb9513755a816bd5b2953fa3 Auto-Submitted: auto-generated The branch stable/14 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=4fcaee7a5f4ac12aeb9513755a816bd5b2953fa3 commit 4fcaee7a5f4ac12aeb9513755a816bd5b2953fa3 Author: Mark Johnston AuthorDate: 2024-06-05 19:24:16 +0000 Commit: Mark Johnston CommitDate: 2024-06-27 15:27:41 +0000 bxe: Use device_set_descf() No functional change intended. MFC after: 1 week (cherry picked from commit 9da1b6dc161bfd7b494ba472cde33af49ef8196f) --- sys/dev/bxe/bxe.c | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/sys/dev/bxe/bxe.c b/sys/dev/bxe/bxe.c index 86e396bad4ae..8524deeb354e 100644 --- a/sys/dev/bxe/bxe.c +++ b/sys/dev/bxe/bxe.c @@ -2489,7 +2489,6 @@ static int bxe_probe(device_t dev) { struct bxe_device_type *t; - char *descbuf; uint16_t did, sdid, svid, vid; /* Find our device structure */ @@ -2506,20 +2505,12 @@ bxe_probe(device_t dev) if ((vid == t->bxe_vid) && (did == t->bxe_did) && ((svid == t->bxe_svid) || (t->bxe_svid == PCI_ANY_ID)) && ((sdid == t->bxe_sdid) || (t->bxe_sdid == PCI_ANY_ID))) { - descbuf = malloc(BXE_DEVDESC_MAX, M_TEMP, M_NOWAIT); - if (descbuf == NULL) - return (ENOMEM); - - /* Print out the device identity. */ - snprintf(descbuf, BXE_DEVDESC_MAX, + device_set_descf(dev, "%s (%c%d) BXE v:%s", t->bxe_name, (((pci_read_config(dev, PCIR_REVID, 4) & 0xf0) >> 4) + 'A'), (pci_read_config(dev, PCIR_REVID, 4) & 0xf), BXE_DRIVER_VERSION); - - device_set_desc_copy(dev, descbuf); - free(descbuf, M_TEMP); return (BUS_PROBE_DEFAULT); } t++; From nobody Thu Jun 27 15:31:10 2024 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 4W92bL5DLxz5Ptp9; Thu, 27 Jun 2024 15:31: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4W92bL47hYz4CRQ; Thu, 27 Jun 2024 15:31:10 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1719502270; 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=n0IgeZschpdKCI2wQ2pd7zPPfAX2W9j+Ic4Yc1ukFbM=; b=h0iaN+9tsQPbDBJmJoPkaVEmgRUEki2GojstXl+I+tuK9iA2ESkrwuSLRySDXv8Af+8hwc AEziBj9KnS6W46MGYRQfx20ej6RNQS7WVefMFbUwZkKlLqp5gt63UdZ20AQuTWh8kf4Ygp Rq69IpyERVDnYRQkX8UaCjgyQacbvLjNOre/G7zTciGJ0m74zOZh+fCxWrKCPrVygpWNNO 035OrQjDAzIyPNwa4YLxrBZehoxcrvX10l81KLXhD06tQ+MWaJIMrTkQJEyDvNvXqU6fgE 7bxiB2CWZG8/rwpu0/UMYddPkjw4UF87vb1w95v9nRvZo2kF+qnFZD3kUc7+PA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1719502270; a=rsa-sha256; cv=none; b=Z7JXSwThqNC+gJ9IiAXbSOQuT2/XW3KyWChIC5Fh2EfycvvZ+pf8A0FuwkTSfbcUjslVDT 6Gl58YOIPRdHJbVHG3t1VR+uKC+sUWpM5qyCeEUf+L1UGERpI/xZvMyA9005UGRmztwZn0 csvOPDuSAijsHMxFC+O0Qxl7ZMTurdfaDmakPhIwTWOGWK5ujmnBAIMGrGpoMx+N8MOe99 tjXnQe+pMSPcvXAuRresJ34t+zQ/BIbXxXW3wElMze7hcKBgV1OGcnH6nPtKCVhTkWE9Jt T0ndnUuQ6w/8bmdnwG98WgaUxZys6xEpvVKWuX5p8jVBc6j7Hty3oSsT2AEjXA== 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=1719502270; 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=n0IgeZschpdKCI2wQ2pd7zPPfAX2W9j+Ic4Yc1ukFbM=; b=wLlwwxc5dqVJvQQsEzOHiTnq67IwJ3ksvSdnAW9MS0qNUqbccwC4IKpwZ21qJcJc8fFFHf ihx+cg3wFLmWtLRYsp61VGcrdVqFAxifX8NHNmvEIfVTdasIT8DTAPnXqDzrP6gkWAy1Fp 5HkgDE0Cz8JFZmtqevD8jaA44cShuC30DtemlcEEBzcuzYsOozH2EsWEG3qQlnvXYeCWr/ byuK7ODcwE78mwrxM5zc9O8S+IJAEzoCKt4aDzjurfzBql67/85HgNG1HCOSiFYG6kv8te vpz17eo3Q7YeMHJXDAtrE6k2/xBbcP7LplzfLIoo+gaZuwnmlCgCJLVYRMWA3Q== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4W92bL3lPbzJ68; Thu, 27 Jun 2024 15:31:10 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 45RFVAN8078910; Thu, 27 Jun 2024 15:31:10 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 45RFVAXs078907; Thu, 27 Jun 2024 15:31:10 GMT (envelope-from git) Date: Thu, 27 Jun 2024 15:31:10 GMT Message-Id: <202406271531.45RFVAXs078907@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: 2e382b3bc8e7 - stable/14 - superio: Use device_set_descf() 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 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 2e382b3bc8e75583e2b260e88d5b38ccbfd1112b Auto-Submitted: auto-generated The branch stable/14 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=2e382b3bc8e75583e2b260e88d5b38ccbfd1112b commit 2e382b3bc8e75583e2b260e88d5b38ccbfd1112b Author: Mark Johnston AuthorDate: 2024-06-05 19:25:58 +0000 Commit: Mark Johnston CommitDate: 2024-06-27 15:27:41 +0000 superio: Use device_set_descf() No functional change intended. MFC after: 1 week (cherry picked from commit 76a79178187f5a3ac05733e068c0860b14fd8632) --- sys/dev/superio/superio.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/sys/dev/superio/superio.c b/sys/dev/superio/superio.c index 6333cb06a7c1..ff05d378ce92 100644 --- a/sys/dev/superio/superio.c +++ b/sys/dev/superio/superio.c @@ -616,12 +616,9 @@ superio_detect(device_t dev, bool claim, struct siosc *sc) if (superio_table[i].descr != NULL) { device_set_desc(dev, superio_table[i].descr); } else if (sc->vendor == SUPERIO_VENDOR_ITE) { - char descr[64]; - - snprintf(descr, sizeof(descr), + device_set_descf(dev, "ITE IT%4x SuperIO (revision 0x%02x)", sc->devid, sc->revid); - device_set_desc_copy(dev, descr); } return (0); } From nobody Thu Jun 27 15:31:09 2024 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 4W92bK5NQ4z5PtxH; Thu, 27 Jun 2024 15:31: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4W92bK2pLrz4CQB; Thu, 27 Jun 2024 15:31:09 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1719502269; 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=MNlk2mASKQG4LQdJNKOKRJS2e7hVXDxJ1Z3z53q2AnY=; b=C/N1cFdqSO2EK9fCD7k6INWp0ahFbjUB1ouDIL37a4m5n4Zyl3yJQw3WFGSFFMzBxinof7 nKIpQuzig+txEVo4J4xhIkJq1qLf2bwpdoas78ACE0o8NNFHToLUl2LeH0jUp+3PVpEy2d ee9IR+eaZvXQ+9K0VdQGZxt8LmHDg0N/SFceSWyGGylUzjC9HaqyR8/3D/b1S0cSeHbv1G rcmW3gUlutCToAXpRs1NsRqBHhAOrPxyiXoGemW98YKpgUAMZryrXk8djSyT9epkzADvlp 151TBBz2hR/SYY9/PlBNKGs5aQr1A/4si/De5mxqJW8x+BToqjjCMQBzaqL+ZQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1719502269; a=rsa-sha256; cv=none; b=lZnxoQ1il3eycakE5S+m77Rb4woI8h18JlbY1W3ZJK5Xh18So8udES2kP57hHFHdjZCtuh cdqcOY59SIbbjrV/h8/CUo/YrszPPDkS+fIElR6zbuWq2QARfPU1ss7133DetPdQpeCx3t Y3yZxSpZu+HPiOkyVlEeLXm0EXxQVlobaPYANm6XJxWZPqb9YlV9a7SgnlFu25chBhI+UZ vaBbp+m0CBrN+ZLimvDcLevBNuD89TDBbGa5vtarvIVAmg6/AKEiHL9qw4bXRM6bwJq4du NIHcVNmIbhwv1raxjI6CWAGk+IBRS5YGiG8CJcE2wR5VgANgQ6tOVCyq8Do+Yw== 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=1719502269; 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=MNlk2mASKQG4LQdJNKOKRJS2e7hVXDxJ1Z3z53q2AnY=; b=vw+iwmw5EJQ6OnrxzPK2GX/3FLQuNFvV0HvE8SZ6jar5XC8LcWEzPN8rW9j6pTSAzP/a5N tTyS8l8gUCh9R4i6PyIXO+mTLnTshXbfEJ/eVglCcoGP10WMyKUXfst5AwujbRJEY7bHOn z4EDrOqBCWAzpXoWJznyxzJ49MqGEWp/q4k3A0KhnYWucRBWJasZTNLvrnBqtkDnXZTKZ8 UJ/3fNv0d/Z0MD8SsMmfDQyZjm2vZjUjFXQG+0DiFsZo1h6+2gtn6EvpidIyrWpeVnA+Oc SSfeUVohC0UpRMoBja+uDP102AAkjh/KmwNfCfMRqFxosEUIOGiGdh+IjR+pWA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4W92bK2Q2fzHcq; Thu, 27 Jun 2024 15:31:09 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 45RFV9Tq078874; Thu, 27 Jun 2024 15:31:09 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 45RFV9gp078871; Thu, 27 Jun 2024 15:31:09 GMT (envelope-from git) Date: Thu, 27 Jun 2024 15:31:09 GMT Message-Id: <202406271531.45RFV9gp078871@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: da334b4f5431 - stable/14 - hidbus: Use device_set_descf() 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 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: da334b4f5431599addb7bf88f5a7764b809422d0 Auto-Submitted: auto-generated The branch stable/14 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=da334b4f5431599addb7bf88f5a7764b809422d0 commit da334b4f5431599addb7bf88f5a7764b809422d0 Author: Mark Johnston AuthorDate: 2024-06-05 19:25:05 +0000 Commit: Mark Johnston CommitDate: 2024-06-27 15:27:41 +0000 hidbus: Use device_set_descf() No functional change intended. MFC after: 1 week (cherry picked from commit 3f795763e45326489ab707c369b8daea495f6562) --- sys/dev/hid/hidbus.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/sys/dev/hid/hidbus.c b/sys/dev/hid/hidbus.c index fd73136c289f..c2f8f58552e1 100644 --- a/sys/dev/hid/hidbus.c +++ b/sys/dev/hid/hidbus.c @@ -526,14 +526,12 @@ hidbus_set_desc(device_t child, const char *suffix) struct hidbus_softc *sc = device_get_softc(bus); struct hid_device_info *devinfo = device_get_ivars(bus); struct hidbus_ivars *tlc = device_get_ivars(child); - char buf[80]; /* Do not add NULL suffix or if device name already contains it. */ if (suffix != NULL && strcasestr(devinfo->name, suffix) == NULL && - (sc->nauto > 1 || (tlc->flags & HIDBUS_FLAG_AUTOCHILD) == 0)) { - snprintf(buf, sizeof(buf), "%s %s", devinfo->name, suffix); - device_set_desc_copy(child, buf); - } else + (sc->nauto > 1 || (tlc->flags & HIDBUS_FLAG_AUTOCHILD) == 0)) + device_set_descf(child, "%s %s", devinfo->name, suffix); + else device_set_desc(child, devinfo->name); } From nobody Thu Jun 27 15:31:11 2024 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 4W92bN0K1Sz5Pttr; Thu, 27 Jun 2024 15:31: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4W92bM5Dfbz4CRp; Thu, 27 Jun 2024 15:31:11 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1719502271; 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=bXwV8x7w/ZLE0c9rTNwKsAkq0+JZaW9dBzF0SksIgd8=; b=Z/tlycQoVQxMMF5H4c7e4Dh4xmdUg662/YmMCtrsndOstXie0yWpXfEia9bU1FA4/pMYkd G+D7iaooQPww2+P7xoZQy/U1KZHueutKNUMMFeS4vku8vMJj0+VxrnO3AVpNWtDEAZowxJ cNmTuiXzkBQ9jcZz5GJeKRp5ORiUgHA6Z1taDNoFWhJqIk4mcxR5qRvDr/m2YZHOCM/IWW Af+RsSusHTltS4M32QIDZqsmwQfLyrvJQgQiELcutT4QnMGLeoESYJSyH1KVvXBL4iILC0 n5FJKTAnV71pnvKnaFy5gLBUZCD47HK9MZygm3Q1HP0J3wwDjr0Of5/wmQzpIA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1719502271; a=rsa-sha256; cv=none; b=VfEuAfdHmgkanzzz8k9xeKg2EELMFVmgh85wf3LzUFR2MaCisNc6frPIfZyesaQpVOtXNa ErQryyxjMyAW4EzK9MPtvsfYFR4DYQlWz0a983Als/EmnrDZgBBNGUPjAFoDC+iI4LNpwf Pt+wxN6BgXBZBkjXjf5bV+Vgwhx0gZPlxymqejrWFMno2zfgCLKjbXIcrfzLG+nDciRwvW kmM+MONo7yVJseDYTBl9OBrvw8yZppb5QOah/Oj9kFNVDUExCxYnN5Qyn4JxStyr5yncIh 3QG+uG5TPil6zC5fDGE1l4yxE9PYiXTJvfWJ6qbRU9/e0Hn4dpJxVwJwbqaTbg== 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=1719502271; 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=bXwV8x7w/ZLE0c9rTNwKsAkq0+JZaW9dBzF0SksIgd8=; b=ccuH5HWo67ne8V7uUQ8sdxgRufz5rwDib7QL2bbtEzUs7Lu/s1xIPHVW8rVOUblI5DUDTm JgGwv05G/aVGxDENptqzR3wzXEOATtl0xsHSGPw67AEJ4fPyxnyDP92Rs0o+qSHZQGE/bl BsPHQnkdzJNQVV9MzJD8E5JfyvSlw7Guu4zdnNofN/v5uIJp04MQhKVyNMB6+nKLV+JnOF T+7vyDYE0ZfqTeom5/usKza1hU/a8zbzv06A/Owz8SxiHdHE6H03LiG4703PCtURgHl54x 5GQqvY8a0n0VAVIDIz5TeEGT5kJStfMblPeBYSbdFAygdUfEMf9hudV5urYLQA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4W92bM4rlwzHgZ; Thu, 27 Jun 2024 15:31:11 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 45RFVB2C078950; Thu, 27 Jun 2024 15:31:11 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 45RFVBoG078947; Thu, 27 Jun 2024 15:31:11 GMT (envelope-from git) Date: Thu, 27 Jun 2024 15:31:11 GMT Message-Id: <202406271531.45RFVBoG078947@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: c07458f1931e - stable/14 - cfi: Use device_set_descf() 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 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: c07458f1931e27846cf260d5f0552149878a1cf1 Auto-Submitted: auto-generated The branch stable/14 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=c07458f1931e27846cf260d5f0552149878a1cf1 commit c07458f1931e27846cf260d5f0552149878a1cf1 Author: Mark Johnston AuthorDate: 2024-06-05 19:26:50 +0000 Commit: Mark Johnston CommitDate: 2024-06-27 15:27:41 +0000 cfi: Use device_set_descf() No functional change intended. MFC after: 1 week (cherry picked from commit 2ef1f61df2d5961ffff1205d4800e46efadbf5ba) --- sys/dev/cfi/cfi_core.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/sys/dev/cfi/cfi_core.c b/sys/dev/cfi/cfi_core.c index 4e137140372c..9554a710d8f2 100644 --- a/sys/dev/cfi/cfi_core.c +++ b/sys/dev/cfi/cfi_core.c @@ -194,7 +194,6 @@ cfi_fmtsize(uint32_t sz) int cfi_probe(device_t dev) { - char desc[80]; struct cfi_softc *sc; char *vend_str; int error; @@ -279,9 +278,7 @@ cfi_probe(device_t dev) if (error) goto out; - snprintf(desc, sizeof(desc), "%s - %s", vend_str, - cfi_fmtsize(sc->sc_size)); - device_set_desc_copy(dev, desc); + device_set_descf(dev, "%s - %s", vend_str, cfi_fmtsize(sc->sc_size)); out: bus_release_resource(dev, SYS_RES_MEMORY, sc->sc_rid, sc->sc_res); From nobody Thu Jun 27 15:31:12 2024 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 4W92bP1sjbz5Pttw; Thu, 27 Jun 2024 15:31: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4W92bN6Ynrz4CSJ; Thu, 27 Jun 2024 15:31:12 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1719502272; 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=UXcBYcJz0UOAc2RGPqm/42yJ1R9vpMJ+sG9TfTkAQ7c=; b=TcxSw9iZr9HDeUX7conKRMvYUx0cCTmjZ3iIK3NoOQDlqt1nFBAYUg2zAjJB36AlBFc8EB awuBVdqSFPmYCaZU1b6lLQEHLdE9nSkDucrY0ck+tjKTkkyALqRF0Vz9V3Vs//+wBKZX09 wd2MkXBadkig5lDv2CDd9oPbjCCBveSiwQznc+cbj+0M18gDRK8KOHet/P8BMTfz5DRiXs kanAPegCD6iycgucorG+o/uv/7yClt/lYV7GWtBTm1zFlaxkKe3yw1aJQNDJbmgfUBk06v wl0/ZUpSpy+1lTsKXWOnQmdBcXhdvA88DloB3VuoZr/+UwPuy6G1ZK3g/aSauw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1719502272; a=rsa-sha256; cv=none; b=fuDHpg7lSzTr1iKjsWRjDv95CWiahFMN8B04+jSFd/JV9b21zyX6AJm0usezJCEUJzGlGe MD/6+eX6w25bYl2MfZXmDhp4e/1hIgANT47CFAUhtyWWT0xKoq33WlMGibqWdhyLgfHtzR 8oMW4wR1YJZjAE37ZrfFnjQ/Zii3IOaeF6Q+Y8G0lnRpMWEKcIlCUHRnuxZRnvGlh3Nj94 GLD7ULOdxCymyebE9VEctm4hPBkky1XLmj5hRoOvVKSeEUf5Yh93fBiJLchyKE6oUAfOsM KgWDu7TeRKC41e+dwTFquhnUGLbBFUUqsYM9JWH6N57yYUD8H9mzVynTWN+WtA== 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=1719502272; 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=UXcBYcJz0UOAc2RGPqm/42yJ1R9vpMJ+sG9TfTkAQ7c=; b=MmAdtZ0toCU6kJYxXrygqjg7rV9j+HmQvmm2igJfWpAvD8ePVUEeJ5tpkSfjlN8gs6ioJ6 kAOKyUbQD3GvdEF6P8c7aBCiDh6qtMBGekZ2XDD7xRknq4KuPJKt/ot51K3nkvvxz8iNCz 3+WAzybCi9yfCw+0I7TDwvN46nhBD0QbV4YhQADlbS85DmB/CYOffKE2+NyMMSDzclTY/f WtoQ85FuyIxiWUN/LJ0ZtVwfZpo6I1xVWtKrbipyz6WhoSZ05l+owyvM5wG2xG3RDa91ce kY2mg8dmqegq6occ0IdRoc34GS2u/n9am8hS6AZV8tfwkYvPlG038P0QsdMnwQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4W92bN61q6zJDH; Thu, 27 Jun 2024 15:31:12 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 45RFVC6x078988; Thu, 27 Jun 2024 15:31:12 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 45RFVCHp078985; Thu, 27 Jun 2024 15:31:12 GMT (envelope-from git) Date: Thu, 27 Jun 2024 15:31:12 GMT Message-Id: <202406271531.45RFVCHp078985@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: ddb9040fc2e9 - stable/14 - oce: Use device_set_descf() 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 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: ddb9040fc2e972f99f379f9f18f551ee854f9107 Auto-Submitted: auto-generated The branch stable/14 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=ddb9040fc2e972f99f379f9f18f551ee854f9107 commit ddb9040fc2e972f99f379f9f18f551ee854f9107 Author: Mark Johnston AuthorDate: 2024-06-05 19:28:13 +0000 Commit: Mark Johnston CommitDate: 2024-06-27 15:27:41 +0000 oce: Use device_set_descf() No functional change intended. MFC after: 1 week (cherry picked from commit c704b87ba679563cb8b344da69aa3cb7118a10b0) --- sys/dev/oce/oce_if.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/sys/dev/oce/oce_if.c b/sys/dev/oce/oce_if.c index d7ec58ec1f5e..2084b9c84fff 100644 --- a/sys/dev/oce/oce_if.c +++ b/sys/dev/oce/oce_if.c @@ -252,7 +252,6 @@ oce_probe(device_t dev) uint16_t vendor = 0; uint16_t device = 0; int i = 0; - char str[256] = {0}; POCE_SOFTC sc; sc = device_get_softc(dev); @@ -265,9 +264,9 @@ oce_probe(device_t dev) for (i = 0; i < (sizeof(supportedDevices) / sizeof(uint32_t)); i++) { if (vendor == ((supportedDevices[i] >> 16) & 0xffff)) { if (device == (supportedDevices[i] & 0xffff)) { - sprintf(str, "%s:%s", "Emulex CNA NIC function", - component_revision); - device_set_desc_copy(dev, str); + device_set_descf(dev, + "%s:%s", "Emulex CNA NIC function", + component_revision); switch (device) { case PCI_PRODUCT_BE2: From nobody Thu Jun 27 15:31:13 2024 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 4W92bQ42CVz5Ptks; Thu, 27 Jun 2024 15:31: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4W92bQ0Trhz4Bs8; Thu, 27 Jun 2024 15:31:14 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1719502274; 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=2KyOXGK497dodNkoUYbFMmXGdAleIaiwo+PgbzH+cYM=; b=bPRdyMx2/AJwqdWxNsHQRP94K9Doxl3H2wNsFm7wNoAjO554ZzlCZ3UNAfI0nzabVNTJOp g7yjVsw6U/Y0k2HFrw4TEThBHyI2DqGJfahfCL2RVtqrKIyn1Ztf0Sb/1mwuMdlsRu4/uP L351LzZZ87LAIxLR8KC/2Ehb6YRKAePPXDwRMAoyDJRD+Ue3U26UkCGVzWyEpfZAKsuV7J ybUxcL+C2aqerpwCsuA7oON4PRnSAUWGBYX4637QIhBMZySHLgYeQo8KZdnmtUpy9fFfT2 68eEeXrui6p+a0fFTkIGG+eM/yg9PcB/YY5ezUisQCsouEW/5RzikGuLhc4f+g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1719502274; a=rsa-sha256; cv=none; b=IiwZFeJCUtXWU1IYvLSlWNbtYDW/FmNf5P5zy60fYZqE6ckk2gMtiH3C15bYtlzZEDS3ku mt6njsHn2rlmBt11SH0O5VjWWljKWZ7jq5HQis+xPe0idVyRquq6jei4XxNgMsxpVXK9Dg a3JjLFiymJGKq1gwvwOV86AFw7vWK8qK9/kw7mZ2br2l1EDBy0eGB+oGOMy2vkQFjCJhjy kppynWfFFlH+jNpB3eHLc0NBU4auU1pUt+PQtttD69CyMXNi09HgnBieImh+zaw4+UfWOc WutDMHktVbyv4jA3AoezdE5o/46arU3q8gWmKY2xAFSib+sbFIeHTh4a+n32aw== 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=1719502274; 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=2KyOXGK497dodNkoUYbFMmXGdAleIaiwo+PgbzH+cYM=; b=EZlGF+5Duc5MSIRb1qgEnWNeJkld9oYGfkwDpewLZP4G8NzcKcb0wIgZPGU0gIO2WZ/VHR mHerFJ/Ew8zWZ6twvg42mjU+9FMS/w7pbGDbhr5VEtQafAkwZd5Sbv9J65MYUC8TkQSEA8 kjxlElPI5A1A27VY1LFMURh8JRN7Uc0a09QtXpKIVp0MMKkeTZ7EaeVBiOGYPP2cJ7gk9S ratxi8ZyifygGY69UvhCe8n7d3p/AGuwrlEjAkPak6nRIugWo2AyZqHulzhmurCKK1Y0mq K2mqBu4CLANX94jMeS3tLy6CASG3xj+186LFv/hDTmOYiWr3Vo5jHOAxEN9DTw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4W92bQ05zSzJ69; Thu, 27 Jun 2024 15:31:14 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 45RFVDKM079024; Thu, 27 Jun 2024 15:31:13 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 45RFVDuK079021; Thu, 27 Jun 2024 15:31:13 GMT (envelope-from git) Date: Thu, 27 Jun 2024 15:31:13 GMT Message-Id: <202406271531.45RFVDuK079021@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: c64abeae220e - stable/14 - pir: Use device_set_descf() 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 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: c64abeae220e3d6bf17f9c6a066cb75b4cf17ec6 Auto-Submitted: auto-generated The branch stable/14 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=c64abeae220e3d6bf17f9c6a066cb75b4cf17ec6 commit c64abeae220e3d6bf17f9c6a066cb75b4cf17ec6 Author: Mark Johnston AuthorDate: 2024-06-05 19:29:30 +0000 Commit: Mark Johnston CommitDate: 2024-06-27 15:27:41 +0000 pir: Use device_set_descf() No functional change intended. MFC after: 1 week (cherry picked from commit a96a9577127c9bf804e7e47e38e7b4123a43efa1) --- sys/i386/pci/pci_pir.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/sys/i386/pci/pci_pir.c b/sys/i386/pci/pci_pir.c index d3ae100a43d0..71dbb66b920b 100644 --- a/sys/i386/pci/pci_pir.c +++ b/sys/i386/pci/pci_pir.c @@ -654,11 +654,8 @@ pci_pir_probe(int bus, int require_parse) static int pir_probe(device_t dev) { - char buf[64]; - - snprintf(buf, sizeof(buf), "PCI Interrupt Routing Table: %d Entries", + device_set_descf(dev, "PCI Interrupt Routing Table: %d Entries", pci_route_count); - device_set_desc_copy(dev, buf); return (0); } From nobody Thu Jun 27 15:31:15 2024 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 4W92bR3b6tz5Ptkt; Thu, 27 Jun 2024 15:31: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4W92bR227zz4CWy; Thu, 27 Jun 2024 15:31:15 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1719502275; 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=U3vKgaYU/foqGH1GtkCBCB0oT9zScUY67/O0tRYWWbE=; b=B6FT3ccCctZFeS3Zr6hkW2S4ZoRGMcu3tuIkz50QBF37yxAGFSF1ksQMyCM4tpisslse5E NXJEYF6INz75lISIWHG+Zus1syIt49p9mYXM7AcQjuyd4uYagsQPnAv1FGN4XPGM+sBSS5 pqZv+jvek4wAPdB2FyUAnKJBirW6phh1g12WLdv2pdKL55cMi61B6Ea8v5IYmJTOf8BwPf uox7bXT+UOryKi+gWvGfhzyu65wHm/DM8zN9fgbeLRiqVVaAnHSOivIDeYcAiiPtWffCHI W3r62HW/nmOqo01bqWR8lTni2ztmxP4orzlcvcUkvH4nS61D/YkOnhm9FFBTpw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1719502275; a=rsa-sha256; cv=none; b=jXq7WkXenmdtKO7TcRKDV3Tn+2O7Zr1xRqHAqCx8stDl67Ldun/kQ31Yj8oQhS6UeaOk36 EJkifWYKyqE90U/tb6QrAWCKCv9djuqtRg50mnwL7DSEoIz32Vnkggna6p4lunFxIY3gqv v3osnn8v+bXONuqI32Gw091ZmLlePcqbKvo9LQ2j0KdTyfKWVQB+QpxXEcApJ3q3zk/XqM 0Fo5HQx006Zi/+GuxiMd1JwQ+H8UjXlQpi5fo5S+n7ffK12vxlbCrwuEQs+P4HQr/NCtvK G4QbxC72xvNDbzyd7F4nkKp+XeG0TI0z0JijGXtEy8/qA8mt4CHFVXen1+Sfcw== 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=1719502275; 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=U3vKgaYU/foqGH1GtkCBCB0oT9zScUY67/O0tRYWWbE=; b=TD/HRwpsgaBNydioUUnGTZMBXfzSV3u/SQBPPCBiFbjvEeg2m9pkGqJ/uvKgWr77ye0wnl HkTGFW+nbSme72o2rL9lor4WZd1pxgmxL7RC43Phq5m+4XvKCQ7/frMnvjVYIuaYd/Nrb0 y4Bq+VaGJcFzIjn753QgBneG8SbSECSCk4SB59yan33lafTvk1dGqlIsGCVB4gEr5vQayn FXOd14RCtSc+4IrRbNxOPmY0ZVb3QXWA69WQrlZn9tFbaHcPd0+kbbjoLVXX5ns7rjSF9z XpxAd9c7+BC4ZC9WhIZ3pm8KaI7VdpRUJkYi+Lm48P6legfLe6oAeaCZCRV1TA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4W92bR1B0RzJ6C; Thu, 27 Jun 2024 15:31:15 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 45RFVFRb079060; Thu, 27 Jun 2024 15:31:15 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 45RFVFMO079057; Thu, 27 Jun 2024 15:31:15 GMT (envelope-from git) Date: Thu, 27 Jun 2024 15:31:15 GMT Message-Id: <202406271531.45RFVFMO079057@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: 16cc589d9157 - stable/14 - mana: Use device_set_desc() 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 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 16cc589d9157b318f3bf42018144e760a2ab7831 Auto-Submitted: auto-generated The branch stable/14 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=16cc589d9157b318f3bf42018144e760a2ab7831 commit 16cc589d9157b318f3bf42018144e760a2ab7831 Author: Mark Johnston AuthorDate: 2024-06-05 19:30:15 +0000 Commit: Mark Johnston CommitDate: 2024-06-27 15:27:41 +0000 mana: Use device_set_desc() No functional change intended. MFC after: 1 week (cherry picked from commit 89848b3445ad52c304e6f9c5036aa9108bedb4c8) --- sys/dev/mana/gdma_main.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/sys/dev/mana/gdma_main.c b/sys/dev/mana/gdma_main.c index e09918496b03..d0438f127b83 100644 --- a/sys/dev/mana/gdma_main.c +++ b/sys/dev/mana/gdma_main.c @@ -1750,7 +1750,6 @@ static int mana_gd_probe(device_t dev) { mana_vendor_id_t *ent; - char adapter_name[60]; uint16_t pci_vendor_id = 0; uint16_t pci_device_id = 0; @@ -1764,8 +1763,7 @@ mana_gd_probe(device_t dev) mana_dbg(NULL, "vendor=%x device=%x\n", pci_vendor_id, pci_device_id); - sprintf(adapter_name, DEVICE_DESC); - device_set_desc_copy(dev, adapter_name); + device_set_desc(dev, DEVICE_DESC); return (BUS_PROBE_DEFAULT); } From nobody Thu Jun 27 15:31:16 2024 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 4W92bT22fXz5Pth8; Thu, 27 Jun 2024 15:31:17 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4W92bS3CR0z4CZn; Thu, 27 Jun 2024 15:31:16 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1719502276; 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=siJKRIq+EsH4neb+M+dxoLf0N5UhJLa0xj/iJXKbxyg=; b=qqhr7uhfRMF1qSoixCbeGN08mxl2AX3qGS22psxJv0QO5Nc2bRyF6IA2nh+NyuKFaQqpMs 8DsIsYFIl6HZeW2gpqukgVay9/4Vqdsb2RIo1xeyhgt4qpAIz8C783DFDCWFAxlg78qBkG 43aKId0dunbqgs6O3yNj97Go7P9y2K8vWxHhF/XlwN2wlAcw9SzXFDQGtsYBtjpDYcK/ua AD4t3hr2xnXhXtGh1Ai2fZw4xXFqNRlBMj1tiG+2IpzPdbGQ9sh4rLa+aAM7XkePzIpta9 l8yi7yoHh+MPxvs5rUEIm839t3uZo+6qsUXecf2ORFyQN9Z/a17Y/y5HoH+RMA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1719502276; a=rsa-sha256; cv=none; b=LFJS1+0WPx4sjmV8yL96u2+TgUKqArDpK4OO+F9xgRnW4UDrmWDDmag1ckGOdCWKVwNqCy p9ktNcKUnwdttkJNthrKDf0370psan6zNsDMU1kg1WuWyREiCotT5RdTy7m07NLF4giTmz O7ty3RkFCYpsr3LhjDuWsmTJmHRt5p29SPcFAsirEp0QpGBvf2T6RA7VLMzb1SmctcTDNi nFmkspOhj/+2pq8jTqRkirx7dB+TAzQqr63nUag6a0/lMQvQ9RyXq6WUsa0SwEGJDS2Cet qtUE4kbD2/b2qdzrNIZlZJDX08iOpeFsXhViiV7uKE6HplgzPcPs3G1UjJsLGA== 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=1719502276; 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=siJKRIq+EsH4neb+M+dxoLf0N5UhJLa0xj/iJXKbxyg=; b=SFPJw61gjO6Pqrx/fA66YDD1bfuBAfmCMaBdBjSQ6r7d9wl3PITJRxZrHNX7AuvfqrpSDD iLTOEt2jGzK8bAqEVyEwE17th41eON8PUd1oou82QGkikevKyaYxzkI8SvMwnVHoiLhqQW L39/W/f9WuQ1yiVRuX3SyunlrgIm8vFLI2PBERuwSrkEylCRcx1RnB2EIsi507Hv5IrMjf Kl2pVRAiELLepxFUz+KGQXTVEP9UaR7E0wpOV16DIRHjXCYjDHKdrgfDkkTAFA92R7NSSh oWHjnbz3OADkc+czY+/0/8nHgrDB7j2+2oVVUahb0X05NuHZ9477bVltDDLTOw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4W92bS2KLWzJDJ; Thu, 27 Jun 2024 15:31:16 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 45RFVGAP079096; Thu, 27 Jun 2024 15:31:16 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 45RFVGCf079093; Thu, 27 Jun 2024 15:31:16 GMT (envelope-from git) Date: Thu, 27 Jun 2024 15:31:16 GMT Message-Id: <202406271531.45RFVGCf079093@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: 48d60dd3ac32 - stable/14 - padlock: Use device_set_descf() 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 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 48d60dd3ac325b61bf7d07c024ce83b84da97e14 Auto-Submitted: auto-generated The branch stable/14 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=48d60dd3ac325b61bf7d07c024ce83b84da97e14 commit 48d60dd3ac325b61bf7d07c024ce83b84da97e14 Author: Mark Johnston AuthorDate: 2024-06-05 19:33:59 +0000 Commit: Mark Johnston CommitDate: 2024-06-27 15:27:41 +0000 padlock: Use device_set_descf() No functional change intended. MFC after: 1 week (cherry picked from commit 131c8ee7331af701c78e694c9c7051f53600c4fe) --- sys/crypto/via/padlock.c | 21 ++------------------- 1 file changed, 2 insertions(+), 19 deletions(-) diff --git a/sys/crypto/via/padlock.c b/sys/crypto/via/padlock.c index b8dae256dbf4..2acdefd75bc6 100644 --- a/sys/crypto/via/padlock.c +++ b/sys/crypto/via/padlock.c @@ -80,31 +80,14 @@ padlock_identify(driver_t *drv, device_t parent) static int padlock_probe(device_t dev) { - char capp[256]; - #if defined(__amd64__) || defined(__i386__) /* If there is no AES support, we has nothing to do here. */ if (!(via_feature_xcrypt & VIA_HAS_AES)) { device_printf(dev, "No ACE support.\n"); return (EINVAL); } - strlcpy(capp, "AES-CBC", sizeof(capp)); -#if 0 - strlcat(capp, ",AES-EBC", sizeof(capp)); - strlcat(capp, ",AES-CFB", sizeof(capp)); - strlcat(capp, ",AES-OFB", sizeof(capp)); -#endif - if (via_feature_xcrypt & VIA_HAS_SHA) { - strlcat(capp, ",SHA1", sizeof(capp)); - strlcat(capp, ",SHA256", sizeof(capp)); - } -#if 0 - if (via_feature_xcrypt & VIA_HAS_AESCTR) - strlcat(capp, ",AES-CTR", sizeof(capp)); - if (via_feature_xcrypt & VIA_HAS_MM) - strlcat(capp, ",RSA", sizeof(capp)); -#endif - device_set_desc_copy(dev, capp); + device_set_descf(dev, "AES-CBC%s", + (via_feature_xcrypt & VIA_HAS_SHA) ? ",SHA1,SHA256" : ""); return (0); #else return (EINVAL); From nobody Thu Jun 27 15:31:18 2024 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 4W92bW1hyNz5Pv34; Thu, 27 Jun 2024 15:31: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4W92bV4WtNz4Ckd; Thu, 27 Jun 2024 15:31:18 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1719502278; 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=cJwEULCoV4tf4xW2/9pNFH+XMinw8eq4GiVAB9Ow2fs=; b=fwOs3GgtOKtVu3HIxL55c0XmzultMak0ulP2wjmt1PwhK+ycBS5fNXlhtwFtjraK7wZCOH PE8XN0CmepiXLQijkMoKHrbljBFSz06QURvQESb/f8b/jn/WAdnExpvh6INurVUCBDEy+S U9FaBdeMDxwLdJBOlrOcBs/RJWW8GXE1V/KUYugsfaqBYDxfsA9gxlKsfFXew/L/MEveUr XGG8Drai/1i+svn/HX5Upnh8S2Eoj3Qhqbn2gGZqlYmrcLXagkgOo3f99979Hi85ApEX3+ i3G/jVncevHxZdvazI1U23lrluT+hd5hEIcFLXuaNafHMRyBdlDbfTACiQ0BYg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1719502278; a=rsa-sha256; cv=none; b=XzNWRbd0Fyoy2d/H+0uP3z4xxPxpWqvQ7ANnQKcdGHn58CakcmwdsWAtNlXyXHH18GFIvR Q9+0NSetl/nb1MLJH0s2NyNJ4LjfFF1fVs5FyN+MFkqr7uGPpz64eHOu1YAKqEr4+TZar1 ezIM3zXU75snzsYl/QXzxTVpHC0Vo2LQqc8JfGeedRXgexg9mchG48q9eOe18iS2UJLrxy lf0PjsyooapoUASIAdvOmpSQ1+jxHKHxtfXuq+l1GMW3UzAXLvf3k6oGyH2OtfZ2P15Tuh CYWvoxVvg+sltt9S4np4lE4G75NEMy6zmPrThVhC7JsVG9iS0207r+xAsOjcyQ== 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=1719502278; 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=cJwEULCoV4tf4xW2/9pNFH+XMinw8eq4GiVAB9Ow2fs=; b=MZY2zS+C0iBnmEGPMo8dGXTApdtAwlqGZ+auzvfRTa+1A3GlgN4M9G6LC7EwmkBCg8wpcv PA4QExC/SflIxCHStxbGYeLWreprDgdbSWApix6SaJm41saPLYcTDZT7dlsG+JrL0uA371 0sKZzQhG7MO7+zdco7r1O0YAgX3Lus48eua5/lYAu5EwO2lOzca1COqxPgAHDNgToXUQOY WkeiUdpg65rHfUkpqOf5QoANj1O8pJFAsrST6Sw+gh+LguvaZJ1zZCLiNYFq3M8l0RLR3D BEN3hnz95hVwRr+ek1HzDJBOGmg/Aj9zbSnDQg+sJTeE8EG2MG62LGFtvkU3gQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4W92bV46ggzJ6D; Thu, 27 Jun 2024 15:31:18 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 45RFVI7T079184; Thu, 27 Jun 2024 15:31:18 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 45RFVIDD079181; Thu, 27 Jun 2024 15:31:18 GMT (envelope-from git) Date: Thu, 27 Jun 2024 15:31:18 GMT Message-Id: <202406271531.45RFVIDD079181@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: e437440b7aa4 - stable/14 - uniq tests: Make uniq_test:stdout more reliable 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 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: e437440b7aa4a9f36d2219fc32cb6bd60d118dd6 Auto-Submitted: auto-generated The branch stable/14 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=e437440b7aa4a9f36d2219fc32cb6bd60d118dd6 commit e437440b7aa4a9f36d2219fc32cb6bd60d118dd6 Author: Mark Johnston AuthorDate: 2024-06-14 00:00:47 +0000 Commit: Mark Johnston CommitDate: 2024-06-27 15:27:42 +0000 uniq tests: Make uniq_test:stdout more reliable When running regression tests in paralle, this one occasionally fails because uniq exits with status 0. I believe this is because the test is a bit racy: it assumes that true(1) will exit before uniq writes to standard out. Just sleep for a bit to give the other end of the pipe to exit. Reviewed by: des MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D45534 (cherry picked from commit d9220f64da8b1d55b15259e8b266b50371ed4f47) --- usr.bin/uniq/tests/uniq_test.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/usr.bin/uniq/tests/uniq_test.sh b/usr.bin/uniq/tests/uniq_test.sh index 804e82ce7766..9d37245dee4e 100755 --- a/usr.bin/uniq/tests/uniq_test.sh +++ b/usr.bin/uniq/tests/uniq_test.sh @@ -167,6 +167,8 @@ stdout_head() { stdout_body() { ( trap "" PIPE + # Give true(1) some time to exit. + sleep 1 echo a | uniq 2>stderr echo $? >result ) | true From nobody Thu Jun 27 15:31:20 2024 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 4W92bY2lmRz5Ptrh; Thu, 27 Jun 2024 15:31: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4W92bY06fDz4CVc; Thu, 27 Jun 2024 15:31:21 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1719502281; 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=RYd2OPuYS9211U7Ir7K+8aMT2pb/AKX5wpxnUlLl+6U=; b=jWvCLJyfPqVnW2nwKGgCOXq6n4monvW7dQczKfjrv0Jis6tmwh6kcIdVDUPHF9geJx9EWO xvch99v/jM8jOH3mI/ICJC8J6PBZeFcBx6eeGlgs0TVD6SuCYTRCh+i5hrKWhNxVlBiVeI L8WebSawhOSYc/ruJJ0jj8sWP9CrIiu2DNBZffFFGnOn3eNOKH40qr1SLDsOJencMiE9C9 feCXDcxhDj0h6+3oxabd+brzhwSRXpqWjz+PEn0AW/ChNWQLP0z7IB0quWPuegRCdm5aoz bjrGu4Nrb9vsFVcebJoZAJqxD8uoBcf5q87jBEFcXoqHP3rEpOt80Gk7xYe3ng== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1719502281; a=rsa-sha256; cv=none; b=fMqXZ7DnIPw3oq5BxB2Ix/A8ZiGiUrXYvvTZUSkhK23i7uOPIvQQ80XKMjyTWIK6tlWvmD pcrV05QlJQPe02KpJR4gmRTl6I4z3c/QRPhW/8VssjTzcLe9ot37Qc52L/RNa/IkgW1o6N OJgFtsgj4HBJYsNmDIkGSygCu6ZdfO1Pw2e0e6UeEEEDzPDSyHHr9tck00b+R63FMbVdmP FR7hpjNmWibIjrx+vYtjWJndJX2/4wfVxuBwDef9jbFhIyCDYKNAiv3Q5r7Sk5cvPcEwpR I3RIbutSimfoQWi0zJ6DQVLRL2jnW6Kh+GJG8iPF0v/F7ZaWCT+tN3NMTGID+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=1719502281; 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=RYd2OPuYS9211U7Ir7K+8aMT2pb/AKX5wpxnUlLl+6U=; b=ccBIFYqnMNE2n92EPwFGHtOXJA0LmGdbraKKIUeSuo0XHz6DwhbC7pE75CXG17E2NV40dE QC9rceOMNo4Q5A4n6sKIOg305MF+esh0Qq9OuQOYh8jUUKUGKKdZLRqUrJ+5WaLAI88EWr 9686dD/eQjZ3+h+FqJg5C0MI4Q0pcjyeL4TrdNyZlVBKvB3ewPVM0X62TEN2lq4yb0oqRN qU8HphprRg0yJfGpnzo6YlW4jsd3CSHfLaVXYmT349gbHXpmUmeFs+UH6zrX+IHoMZ13FU WdkfmwE/EmZ1JMpPQceDu4zHkeSXwx93ADUolvp5avpL8Kip+QDSzc0AjhkFUA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4W92bX6B7hzHcv; Thu, 27 Jun 2024 15:31:20 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 45RFVKKA079265; Thu, 27 Jun 2024 15:31:20 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 45RFVKkZ079262; Thu, 27 Jun 2024 15:31:20 GMT (envelope-from git) Date: Thu, 27 Jun 2024 15:31:20 GMT Message-Id: <202406271531.45RFVKkZ079262@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: b31999c05135 - stable/14 - physmem: Correct a comment 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 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: b31999c05135cec637cfffbb62dbccfa47b1cc5c Auto-Submitted: auto-generated The branch stable/14 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=b31999c05135cec637cfffbb62dbccfa47b1cc5c commit b31999c05135cec637cfffbb62dbccfa47b1cc5c Author: Mark Johnston AuthorDate: 2024-06-20 20:43:39 +0000 Commit: Mark Johnston CommitDate: 2024-06-27 15:27:42 +0000 physmem: Correct a comment MFC after: 1 week Sponsored by: Klara, Inc. Sponsored by: Juniper Networks, Inc. (cherry picked from commit f45213c74cbac7f41ab3c94440cb37a2fd92a449) --- sys/kern/subr_physmem.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/sys/kern/subr_physmem.c b/sys/kern/subr_physmem.c index 79fedf58d66d..e74a11f47c2c 100644 --- a/sys/kern/subr_physmem.c +++ b/sys/kern/subr_physmem.c @@ -177,7 +177,8 @@ physmem_print_tables(void) * * Updates the value at *pavail with the sum of all pages in all hw regions. * - * Returns the number of pages of non-excluded memory added to the avail list. + * Returns the number of entries in the avail list, which is twice the number + * of returned regions. */ static size_t regions_to_avail(vm_paddr_t *avail, uint32_t exflags, size_t maxavail, From nobody Thu Jun 27 15:31:19 2024 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 4W92bX1WMhz5Ptrf; Thu, 27 Jun 2024 15:31: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4W92bW6CnGz4CXp; Thu, 27 Jun 2024 15:31:19 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1719502279; 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=4qWyM19X1/OnIS4z+TZzcg7Y6ykIBR4icbzpntAxztw=; b=mV3W0sQMoVfzRCtX5noN0lr8k+96mYKCkeUCP743LF+IWoQovaDrDnvHaI3qzkqE0TgVLB nNWdmtvqCJW8Co2dKwcxwB706skKvNsUYS82myjSKvDNyMxO4Kxo6gUJmhymahy/wo0ffJ IaZjlQ2A5sO64r7E3m7Fii+9J+0BSQhRz9uGUhgY0wlRXCwKceFEbpd21vaTdgjlpgSh+X RXX/J6i+VNDEJ7R2+mNXVS3NMRYTo8Xi3eP82yxQmoRFDLt5lELeDTmYYiqED9NtY66XUY ThTxk/Egjyr0XVhL/BrLzCMSoZvhWQzESmSO9X3/gs/r1dwiceRGdjcTez1XEg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1719502279; a=rsa-sha256; cv=none; b=DzPtw9SPoZSLO4/vIAkD0AOiZN4WF5JP3ifZLL43rOxhvuHD9HI+zQRtiATf4B8hlcz46V 7u40EWlvfiCoTKm39d3VgRn2Mdp1lrmIqxtbXLxROFV8flNIHfXHs9TWBMkGpYr3zmXmNL RfW8HUdOIULGKaZyt9BzlujN8gdTvP9Ixp2524ejh+Kg4olHTzfzaR0/GD5znEp29tC43h Lpt7sZsaEBpdmn3WRdbDBN36RnCpJpcbHuNady7lqNeZ/6Fm55T9EZzx+x/aOLfl/NP//A WNVTrdIEVE8bj6mSFLLFo/6MaBZMKVseQamj5FxGyhSat/KJmo+TzSUeM/bRog== 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=1719502279; 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=4qWyM19X1/OnIS4z+TZzcg7Y6ykIBR4icbzpntAxztw=; b=r0JzsXdWQxpSznyPJTXmvGm1x7EyhUcd0IgXQOMRI/kgPnuWi6l0Dv3LOHBhPM3BDon/py TpGk6htO2km6wSsUlmGZ60HRwdnyVs0c+Qkgbcl2QhyE/YhZRhfQqsPeqltKurZgeSfXV5 TTpZjMJu9WRslnznBPDCql3NLo1XTm8MfI+e1IztMJ5FEma+hL/k6cPk8MhOf7Y/b9tA+c n/C7Qi/Iux0WL5+FDtq++D7kY76vebG5Ax2T2k3/yhQPNKYvf+RMcBzTQ7ISIdMmAu0Nd1 0Q20Iy49+kk7iG+sOYlBkDvPJfVyT9hbOE4F3RoRSLsh+d1PPSXcHKFFOt4b/A== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4W92bW58hTzHQr; Thu, 27 Jun 2024 15:31:19 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 45RFVJW3079226; Thu, 27 Jun 2024 15:31:19 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 45RFVJMM079223; Thu, 27 Jun 2024 15:31:19 GMT (envelope-from git) Date: Thu, 27 Jun 2024 15:31:19 GMT Message-Id: <202406271531.45RFVJMM079223@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: 3026c74b87a2 - stable/14 - amd64/vmm: Make vmm.h more self-contained 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 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 3026c74b87a201c185168183a21d6d89d068ac7d Auto-Submitted: auto-generated The branch stable/14 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=3026c74b87a201c185168183a21d6d89d068ac7d commit 3026c74b87a201c185168183a21d6d89d068ac7d Author: Mark Johnston AuthorDate: 2024-06-14 00:17:07 +0000 Commit: Mark Johnston CommitDate: 2024-06-27 15:27:42 +0000 amd64/vmm: Make vmm.h more self-contained CTASSERT is defined in kassert.h, so include that here. No functional change intended. MFC after: 1 week (cherry picked from commit aede0d3badd1be92b57deb14c494785ab61022d4) --- sys/amd64/include/vmm.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/sys/amd64/include/vmm.h b/sys/amd64/include/vmm.h index 7d5d13678122..368c3a6cb95b 100644 --- a/sys/amd64/include/vmm.h +++ b/sys/amd64/include/vmm.h @@ -144,6 +144,8 @@ enum x2apic_state { (SPECNAMELEN - VM_MAX_PREFIXLEN - VM_MAX_SUFFIXLEN - 1) #ifdef _KERNEL +#include + CTASSERT(VM_MAX_NAMELEN >= VM_MIN_NAMELEN); struct vm; From nobody Thu Jun 27 17:56:44 2024 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 4W95qJ4qskz5Q7j5; Thu, 27 Jun 2024 17:56: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4W95qJ4J8bz4bFh; Thu, 27 Jun 2024 17:56:44 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1719511004; 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=uky5QWTEE+WpQJDO/PGMlBTLWWvB/krA7U9xa1CHQoU=; b=OuPcGY80dlWm1ZF1EEVS+r2yXKWzKYh1B2e9PT1Ap5VASuZEwrpjJ73CYt9eRglMHf9ONJ mKpr2vq4WIi7e3llKaAo07shFoc3Bbgjg0Eb3MIbdPNsID0UdM8bHsRrnP2ICJC7D3W7/z jiNnPV7cwQjiGYoVzli78RITZHj7IohVrAza2OD7tgB5OuqMmPc50Jb7rI0qvv7HArGoVk 6t5/PkXuXNtzpv5KXe0IZrYnnYk7CPIcuprpuXXYlzz3AMJRwoqw22/dG29S1eRldpMd2O kYlDkooPdIX0Vse4im/dEWM2ep/C7Q2rk7TdWJB/URJ15fycxjvzZzclLWTW4w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1719511004; a=rsa-sha256; cv=none; b=k6kMi8ef2SIUq5PzkQ2tfS71/9VRbjOrCUI1ccNgA7wAumMsE3GTLoL6aFOTSshNrvsfKq cHqqF5pZOKeBdr0MPF5sIJBq34fRBd270bzpT5B4Bi79tJdVQwqHIrKjoiyyXa2wJHvole kLJOBriQTHKab/XW0ri7LWdNufQfE5ILndfFvc8XjhM2A329KmwpaHuNYFIEgSp8h2/9wz 0o4AMD2TnXJDUNkJnEMJ29NwNhj41gmrYXWA2ZMBDXg/D6hWr2FOurzyC6rxW/8khS+vJO QG4xxzPDtEnk5PwMQ5R0Lb4NXnYrql/olKmzy3iWGJBahdAePKuTdkTvuVbP5Q== 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=1719511004; 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=uky5QWTEE+WpQJDO/PGMlBTLWWvB/krA7U9xa1CHQoU=; b=EMNzH9mViHTd+7SV9PoXafMn4ni8bXLr/hmDsGU7nVtlK3vKrH9WhNkEa82lm6QI94O9Cs y6EZvQBAutbURNJmq9irbPnl0C+mD7J42VidBwYCyko1ecnvPZcs4caa+eCjPYoZIvS/QI h33i1i5gKWGsy+LA2AC+oz4Hn9zyHUoEBg9LF/SJIOjI2JzSTIvXR4VycUkvQ+T3zj/jrc 5aCmb2JmeEncDPTqs9sYgQ2xFyIEM6UH9/13efMHUy+T0T/HE5p604eE1uPfhS+C7kXOdu MryjLL8ZrvxSMbyGGnm3PndnjnnlbaV5bGvx2dWt3YO2Qe5tQfkWIr1E9v09CA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4W95qJ34MmzMTr; Thu, 27 Jun 2024 17:56:44 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 45RHuiLg022028; Thu, 27 Jun 2024 17:56:44 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 45RHuiOg022025; Thu, 27 Jun 2024 17:56:44 GMT (envelope-from git) Date: Thu, 27 Jun 2024 17:56:44 GMT Message-Id: <202406271756.45RHuiOg022025@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mitchell Horne Subject: git: 53a64a093824 - stable/14 - rk_pinctrl: fix error check 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 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mhorne X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 53a64a0938241869b7dc657c5bf30e3bde1879c2 Auto-Submitted: auto-generated The branch stable/14 has been updated by mhorne: URL: https://cgit.FreeBSD.org/src/commit/?id=53a64a0938241869b7dc657c5bf30e3bde1879c2 commit 53a64a0938241869b7dc657c5bf30e3bde1879c2 Author: John F. Carr AuthorDate: 2024-06-14 16:37:06 +0000 Commit: Mitchell Horne CommitDate: 2024-06-27 17:56:23 +0000 rk_pinctrl: fix error check The parse_bias method returns a signed int, with a value of -1 when the device tree reports nothing of the bias configuration. Convert the local 'bias' from unsigned to signed to properly check this condition. PR: 229721 Reviewed by: mhorne MFC after: 3 days (cherry picked from commit 97ab935d566c85458bc7cab99c402f026d704eff) --- sys/arm64/rockchip/rk_pinctrl.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/arm64/rockchip/rk_pinctrl.c b/sys/arm64/rockchip/rk_pinctrl.c index 7a47e3b9d468..02017258dbe2 100644 --- a/sys/arm64/rockchip/rk_pinctrl.c +++ b/sys/arm64/rockchip/rk_pinctrl.c @@ -1142,9 +1142,9 @@ rk_pinctrl_configure_pin(struct rk_pinctrl_softc *sc, uint32_t *pindata) { phandle_t pin_conf; struct syscon *syscon; - uint32_t bank, subbank, pin, function, bias; + uint32_t bank, subbank, pin, function; uint32_t bit, mask, reg, drive; - int i, rv; + int i, rv, bias; bank = pindata[0]; pin = pindata[1]; From nobody Thu Jun 27 17:56:45 2024 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 4W95qK74c9z5Q7Xc; Thu, 27 Jun 2024 17:56: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4W95qK537pz4bJ0; Thu, 27 Jun 2024 17:56:45 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1719511005; 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=yc+gqUw2oAcll8pou273mpNdFoyRqCWTWIVZbUj8xfg=; b=DnzkLiqVdbFfLZ3oYaN6Bi5YFsNEU2SQnT6u2GhKeerT2keD2ZsJ2RNlERMM2wGWLs5+pF twCxZS6I+mVQptFpv3Bpsymp/RQZo5omNrPU/fq/W3ecgmpctCbKksZkIzBHyhE8wU6SUE /jKLIcgmUQvyzqZZICIhTYjMC3iS7XjTOeW0Ccab/Vc9UBSaG/3vYmq+oyv1OTHk9UzTXU zXq7nXKjQXBjn/eAyqX6TD/bNw7Sgn1rFjao8/sccZuxu+izkCOtstIAJlTRXA9+bcqgi0 ILE7o7cZlNZN5xGuNEIsPXZojhEVmLg2PdDooHcsJi7WlPzpXbbZjgu6DlbE2g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1719511005; a=rsa-sha256; cv=none; b=Ce2HLLgzvcsa8g1Y2J8fun4jEqQ5dlOSC8DWU48r2ZoLSmQjtAkM9SvAXkDzG/HP9qBQ1Y gSJjvVvt4HBKbRGuDO526/9dlcEMdNgkUc3d7DSsOAIVre1akRUtf16l0LaxfN/FykM3W5 pzhISQh+zCXJKPdx2UEWlCpEeg9e1mkowd9kd4gZP/bRSeiJrYBLpnAHHTrrZf6K9UxPeN vitWYEhf7u5R54bds5LRKF2C2kV8ABZGrymPSsKA1lpslANuDoBAMnXWLXlYdS9je8Pi6t dRrJwpVQ2V0v/n9Nfl8f5HSBzjEQE+1v6WIPN+Gry4rs9uJkJyrUNsh0s9aWtg== 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=1719511005; 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=yc+gqUw2oAcll8pou273mpNdFoyRqCWTWIVZbUj8xfg=; b=NL7qk3jrRF+xIexvVJRDwFMvvBnlRZqS8j2dG5XLnzoQxEpPeWEsc+QJ6qPJOD/SJl1WfU cvjEw+gq4xVAfzDxaZCQ1Fzy33K0649RcLzV5XC+rAb6iX6DfgEqiCFTUVzOOF2hbO406/ vLYImjg7OSIHJf4AiPAPrEZ37TUn5sBN9pjns2QX6YrxOgO8YHxphA1K3nZ0eoC7F6jVVS IBv+uVKGAiZVWRvCOzOaP3MJwvmGT6dCkQ6UKHB0igrxeh3MBGA37KyawELwyhwsPjAfrN 4xg0VjAktsUIGRBOjQUOEAkYyVKx/0ATsBf/qcFvINs4PVSzv6NqT4FaVlK2uw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4W95qK4LKgzMms; Thu, 27 Jun 2024 17:56:45 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 45RHujNG022068; Thu, 27 Jun 2024 17:56:45 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 45RHujVf022065; Thu, 27 Jun 2024 17:56:45 GMT (envelope-from git) Date: Thu, 27 Jun 2024 17:56:45 GMT Message-Id: <202406271756.45RHujVf022065@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mitchell Horne Subject: git: 9a53391b601d - stable/14 - riscv: adjust physmem reservation 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 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mhorne X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 9a53391b601dd19dec2be2b68e356e2378deb085 Auto-Submitted: auto-generated The branch stable/14 has been updated by mhorne: URL: https://cgit.FreeBSD.org/src/commit/?id=9a53391b601dd19dec2be2b68e356e2378deb085 commit 9a53391b601dd19dec2be2b68e356e2378deb085 Author: Mitchell Horne AuthorDate: 2024-06-14 17:57:28 +0000 Commit: Mitchell Horne CommitDate: 2024-06-27 17:56:23 +0000 riscv: adjust physmem reservation Make sure we do this BEFORE pmap_bootstrap(). Reviewed by: markj, jhb MFC after: 3 days Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D45325 (cherry picked from commit 0e4e77072f65df71644140e41229b868a73f3371) --- sys/riscv/riscv/machdep.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/sys/riscv/riscv/machdep.c b/sys/riscv/riscv/machdep.c index 5872ef9f94ac..61f86f9e6958 100644 --- a/sys/riscv/riscv/machdep.c +++ b/sys/riscv/riscv/machdep.c @@ -550,10 +550,6 @@ initriscv(struct riscv_bootparams *rvbp) cache_setup(); - /* Bootstrap enough of pmap to enter the kernel proper */ - kernlen = (lastaddr - KERNBASE); - pmap_bootstrap(rvbp->kern_l1pt, rvbp->kern_phys, kernlen); - #ifdef FDT /* * XXX: Unconditionally exclude the lowest 2MB of physical memory, as @@ -566,6 +562,11 @@ initriscv(struct riscv_bootparams *rvbp) physmem_exclude_region(mem_regions[0].mr_start, L2_SIZE, EXFLAG_NODUMP | EXFLAG_NOALLOC); #endif + + /* Bootstrap enough of pmap to enter the kernel proper */ + kernlen = (lastaddr - KERNBASE); + pmap_bootstrap(rvbp->kern_l1pt, rvbp->kern_phys, kernlen); + physmem_init_kernel_globals(); /* Establish static device mappings */ From nobody Fri Jun 28 10:17:15 2024 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 4W9WZg4FnNz5FCx8; Fri, 28 Jun 2024 10:17: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4W9WZg3FFDz4nFJ; Fri, 28 Jun 2024 10:17:15 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1719569835; 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=0XD6vnSF1znq/D6NTOfs2O2bIxq4szlWaVtR5vKF084=; b=PX22MA3Z+RXeq+9Wme72DscdowDx95mqJVHhR8WKz94tAVJbIJle93q5M3bqGJFbV32+5x O+mMI9FmPzi0IA+Qn47/1jTl0jka21YPIpM4kza354rIRvtRpwVuu4tP6/Kjv/7FymAx6t CnUoFT21nFh75u/AOUCUbjgS1Dd7ngvjbkqGWufaTinMRfMMpqAu0PT8SdM2NTUDCbRLXl HbzZlIlWZ+PpRsoQljdTmkG3m3SqDrV+gMciWFQCsDzbtOB5X0Mz+l1CLk3SGmgtXygEGX Xldlu+EbhSqn2kx20LO3mWv5/3CGUVlVI10N0GLj3Ltd4XEmYRcsKpA3Cc5gkw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1719569835; a=rsa-sha256; cv=none; b=sHpVuNizJvQ8kqAUsCz42AV3oNOoYODxbINlWRe0zx+UIIDXJLaMpp8ixTNs0FpijnZ6uY wmbmkCBSsH0YfbuML9Dor2LtNhTK78VPtu+MO8Mrnne3a/nKZxUKDBbw45WDzIjHFC+mpR ZxGKhr9PXiHAu2N1vdkjYJ93xi2V/Un9f59INVYBzxZrgTuc/Grx0Ym7X7p0TBpuU9LetG Meid9dIEZY7hGP9+knf2TmqirdAES+y09twKVysw4HpeJBQmO7bgmFEvucHz0fAbWbgMV7 qoJ1oKmyRJlrLh6njqyHBivXofhLCD30lRVxF0RKFUbvk0XTIHnjVefBfWzrng== 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=1719569835; 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=0XD6vnSF1znq/D6NTOfs2O2bIxq4szlWaVtR5vKF084=; b=JvLDONKd8zaNbQkQ8YpVexG1HkGlX0brIDBRHzhXvNT93tZ1+1yCp5rqi6V5MzYQs8K69F Bya2VzOXlxGru/YksGctsOB+R511F4Fj8Sy9KWTgPyL2CdsXqsBjoZ0YduCg6uk4+jwTRn X9YSAE6URBc8s5xGBxCEP+xJnxAOaPIosU2XSK6Y5/SO7nnUYfkMaQQnH81I490+7dgV7+ jJvwBkxAluZlSGQcD6H26MExa1hrTpW74BI2eeqJBC3RMUIfkx27vuZsZwyjIDPH3bSqMx dFlIbdg/I4krHlDPbEN4CwrIZhIVUFKldar8/q2XqyFcN2Pz3dR5E2a5fovAjg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4W9WZg2rlgzrbm; Fri, 28 Jun 2024 10:17:15 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 45SAHF3B075532; Fri, 28 Jun 2024 10:17:15 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 45SAHFH5075529; Fri, 28 Jun 2024 10:17:15 GMT (envelope-from git) Date: Fri, 28 Jun 2024 10:17:15 GMT Message-Id: <202406281017.45SAHFH5075529@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mariusz Zaborski Subject: git: c5e0b035d9eb - stable/14 - libutil: move ftime to libutil 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 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: oshogbo X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: c5e0b035d9eb14e73fc17899cd007a31e0d1edc8 Auto-Submitted: auto-generated The branch stable/14 has been updated by oshogbo: URL: https://cgit.FreeBSD.org/src/commit/?id=c5e0b035d9eb14e73fc17899cd007a31e0d1edc8 commit c5e0b035d9eb14e73fc17899cd007a31e0d1edc8 Author: Mariusz Zaborski AuthorDate: 2024-05-29 12:32:16 +0000 Commit: Mariusz Zaborski CommitDate: 2024-06-28 10:17:52 +0000 libutil: move ftime to libutil It seems that there are still some applications that use ftime(3) (for example, science/siconos and sysutils/lcdproc). The issue is that we don't build libcompat as a shared library anymore. The easiest solution is to move it to libutil, until we deprecate it for good. This solution was proposed by kib@ in https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=257789. PR: 257789 MFC after: 1 month Reviewed by: kib (ages ago) Differential Revision: https://reviews.freebsd.org/D39994 (cherry picked from commit bb421be6c1174fad837973acc5e4a7bade4489db) --- lib/libcompat/Makefile | 7 +------ lib/libutil/Makefile | 6 +++--- lib/{libcompat/4.1 => libutil}/ftime.3 | 4 ++-- lib/{libcompat/4.1 => libutil}/ftime.c | 2 ++ sys/sys/timeb.h | 2 +- 5 files changed, 9 insertions(+), 12 deletions(-) diff --git a/lib/libcompat/Makefile b/lib/libcompat/Makefile index 7c99556e7513..e30e120c3d41 100644 --- a/lib/libcompat/Makefile +++ b/lib/libcompat/Makefile @@ -7,12 +7,7 @@ NO_PIC= WARNS?= 0 -.PATH: ${.CURDIR}/4.1 ${.CURDIR}/4.3 ${.CURDIR}/4.4 - -# compat 4.1 sources -SRCS+= ftime.c - -MAN+= 4.1/ftime.3 +.PATH: ${.CURDIR}/4.3 ${.CURDIR}/4.4 # compat 4.3 sources SRCS+= re_comp.c rexec.c diff --git a/lib/libutil/Makefile b/lib/libutil/Makefile index 889a81747c82..5bce5c158958 100644 --- a/lib/libutil/Makefile +++ b/lib/libutil/Makefile @@ -12,7 +12,7 @@ LIB= util SHLIB_MAJOR= 9 SRCS= _secure_path.c auth.c cpuset.c expand_number.c flopen.c fparseln.c \ - getlocalbase.c gr_util.c \ + ftime.c getlocalbase.c gr_util.c \ hexdump.c humanize_number.c kinfo_getfile.c \ kinfo_getallproc.c kinfo_getproc.c kinfo_getvmmap.c \ kinfo_getvmobject.c kld.c \ @@ -30,8 +30,8 @@ CFLAGS+= -DINET6 CFLAGS+= -I${.CURDIR} -I${SRCTOP}/lib/libc/gen/ -MAN+= cpuset.3 expand_number.3 flopen.3 fparseln.3 getlocalbase.3 hexdump.3 \ - humanize_number.3 kinfo_getallproc.3 kinfo_getfile.3 \ +MAN+= cpuset.3 expand_number.3 flopen.3 fparseln.3 ftime.3 getlocalbase.3 \ + hexdump.3 humanize_number.3 kinfo_getallproc.3 kinfo_getfile.3 \ kinfo_getproc.3 kinfo_getvmmap.3 kinfo_getvmobject.3 kld.3 \ login_auth.3 login_cap.3 \ login_class.3 login_ok.3 login_times.3 login_tty.3 pidfile.3 \ diff --git a/lib/libcompat/4.1/ftime.3 b/lib/libutil/ftime.3 similarity index 98% rename from lib/libcompat/4.1/ftime.3 rename to lib/libutil/ftime.3 index 48eb465aed31..dbed25317115 100644 --- a/lib/libcompat/4.1/ftime.3 +++ b/lib/libutil/ftime.3 @@ -27,14 +27,14 @@ .\" .\" @(#)ftime.3 8.1 (Berkeley) 6/4/93 .\" -.Dd August 4, 2018 +.Dd May 28, 2024 .Dt FTIME 3 .Os .Sh NAME .Nm ftime .Nd get date and time .Sh LIBRARY -.Lb libcompat +.Lb libuitl .Sh SYNOPSIS .In sys/types.h .In sys/timeb.h diff --git a/lib/libcompat/4.1/ftime.c b/lib/libutil/ftime.c similarity index 99% rename from lib/libcompat/4.1/ftime.c rename to lib/libutil/ftime.c index 5ea57bca40fd..b31fca907883 100644 --- a/lib/libcompat/4.1/ftime.c +++ b/lib/libutil/ftime.c @@ -33,6 +33,8 @@ #include #include #include + +#define _IN_LIBUITL #include int diff --git a/sys/sys/timeb.h b/sys/sys/timeb.h index 952a5e83b8a7..853541e27ae6 100644 --- a/sys/sys/timeb.h +++ b/sys/sys/timeb.h @@ -39,7 +39,7 @@ #ifndef _SYS_TIMEB_H_ #define _SYS_TIMEB_H_ -#ifdef __GNUC__ +#if defined(__GNUC__) && !defined(_IN_LIBUITL) #warning "this file includes which is deprecated" #endif From nobody Fri Jun 28 10:17:16 2024 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 4W9WZh4nkLz5FD7p; Fri, 28 Jun 2024 10:17:16 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4W9WZh4Fklz4nfH; Fri, 28 Jun 2024 10:17:16 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1719569836; 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=5Q5CbBBCIM1SfVLJWzgtXKvJMzkbCidIxnryGigDuOI=; b=ykkD10CS3EO42JNohWLS+iJqWsTa9Xe4E15UA/s0W8xr3vuCueGjGKQ7Bi6jDxTwz+ZK2C +6EBrErT0NsWR4wRuqd7YRPU0Y462qvOZOawMx6/0wKJvezKNogdUoKT+lw73HGPPosMdI YBbsOFuQEd2xj7rgYFmRU9jui1GG2QfXZkHRo/jcndWtyc7186fyH7bUu3TLO7hKRuVJ29 J/SECGfQeYUP0Sq1PqNPL79X0hkn0qIzWX8X3lfZBEsEqz3yHFxms4uwj8b+ixtAlOpYXC Gspgh/uC5H/GWk6zD6Y75ccS5nJbUZakY2e6Czfr/2uoy1ZPzIiYlFiYEPWCVA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1719569836; a=rsa-sha256; cv=none; b=ScbFfdQpIJgBrSJaQ1ebHm2jkj75GU63oYRpNlj8BaQWCwAxKfa4ittKoxs/5SOydhZRtF GI7u5nUeXC8jTc6esNmY7cbO+qWal5zV6DeY9tNC8kdCui9cUfzOa3eMJ/yp0FqtEUC6lb U5XpSARiN4KWAqRbyjL+sje6qRdgR8I/XkWBjQ2Ohhzv/IwJ46vkJ1JJnKSZc371Q4e9Le S/JQAsdUmt08JHPORM8q1QzKJ2OLKKHoGWmq4GJh2GhftF/rk7+39KNaNWQxDO7iVbX7WL /vSnU9c4Y/mGvYcNifHNMTzh/9l2PbrA081eexlYWagjPidFwSUjv6PllY/jgw== 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=1719569836; 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=5Q5CbBBCIM1SfVLJWzgtXKvJMzkbCidIxnryGigDuOI=; b=NABtXQ38yJ9hijg4hFa21apyae4iPngBv+HubmECBAsEjQtXfO/IzKD2cHcRIcdpFGFfXY 3lhOOuUGmYlnERoBDRzq2PhVRvIhd/h5L/Hq/C3Tqz/r9o4Pf421S0iPOFje8FFUaS38MT R4us85/KRQNiMnZbdBjSq841/bxXrtQHwINhSbLNCLEgkQ0POZw0ohNa6ovFAkMYrV6MB6 mQGreRBaHFH8mGx7+YO4khwM2A3v7GPP/pRuyKcQawA7vD0Lw8KzaW7oS9xaxUABiU/+K6 Szt96b2rF34QuDZwugSN6kzy7b3dZ1niWoRQXgJbgIq81zS+PLHytAZ7sKjBOg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4W9WZh3sMQzrsr; Fri, 28 Jun 2024 10:17:16 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 45SAHGmr075574; Fri, 28 Jun 2024 10:17:16 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 45SAHGYs075571; Fri, 28 Jun 2024 10:17:16 GMT (envelope-from git) Date: Fri, 28 Jun 2024 10:17:16 GMT Message-Id: <202406281017.45SAHGYs075571@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mariusz Zaborski Subject: git: 944827bcf6f0 - stable/14 - isp: fix ISPCTL_ABORT_CMD switch case 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 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: oshogbo X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 944827bcf6f0b7db74d47e18885d327a623ef6b7 Auto-Submitted: auto-generated The branch stable/14 has been updated by oshogbo: URL: https://cgit.FreeBSD.org/src/commit/?id=944827bcf6f0b7db74d47e18885d327a623ef6b7 commit 944827bcf6f0b7db74d47e18885d327a623ef6b7 Author: Mariusz Zaborski AuthorDate: 2024-06-25 14:50:28 +0000 Commit: Mariusz Zaborski CommitDate: 2024-06-28 10:18:23 +0000 isp: fix ISPCTL_ABORT_CMD switch case Prevent kernel panic by not running ISPCTL_FCLINK_TEST after a failed ISPCTL_ABORT_CMD. Reviewed by: mav Tested by: Arne Steinkamm MFC after: 3 days Differential Revision: https://reviews.freebsd.org/D45718 (cherry picked from commit 8aa9192ce98aec07b24f8279c709237dd2c4421b) --- sys/dev/isp/isp.c | 1 + 1 file changed, 1 insertion(+) diff --git a/sys/dev/isp/isp.c b/sys/dev/isp/isp.c index b53171add5f5..ad6dbd1e6f76 100644 --- a/sys/dev/isp/isp.c +++ b/sys/dev/isp/isp.c @@ -3088,6 +3088,7 @@ isp_control(ispsoftc_t *isp, ispctl_t ctl, ...) if (ab->abrt_nphdl == ISP24XX_ABRT_OKAY) return (0); isp_prt(isp, ISP_LOGWARN, "Chan %d handle %d abort returned 0x%x", chan, tgt, ab->abrt_nphdl); + break; } case ISPCTL_FCLINK_TEST: { From nobody Fri Jun 28 10:17:51 2024 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 4W9WbN1RmLz5FDF2; Fri, 28 Jun 2024 10:17: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4W9WbN0XLxz4nwk; Fri, 28 Jun 2024 10:17:52 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1719569872; 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=HH4g3cDMid8JajYV1Sqxc/U/4DOlzu6dKDQAnmBgCa4=; b=GXr/DrHU1d3YYqwjLCR8kszz83IjwT6XnSdh7YmdfmDrZQsRpFdToDdBCcRS2NjlmdRTH2 caVTCQPm3vaqhtPlv81YhjleVenmopZOmhRsc3xWpD7YSHZl1R5Sn9KVF9uY5HZEZKm7Mk fVPK1Ar0RiR9LVWvroulHDkSD2o9GMIfCeE07X2QfbIoLXnU7DGpvMpLW4ifpY0DDZPOFo xyMtOXxKuMZdY5c1sEfuuHKk2/k6CBpDvpsojA0NXypcrwDPGadZDihyz24Wy4ZB9J7Nqh CkwYrQYywK556XXeH7efrlKZC0Ei9NqA4cAFicM4h21eL6F7QsqzL2vJriCIWg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1719569872; a=rsa-sha256; cv=none; b=Yu1ceZGlBVkaoApQL74w2Y8CEPF46T/Eb7XTpJ1sHwG0gd0NcVs4rVSqGUhRFfjsFQxM7t MKPC8MMk/NawMv/Jlwhau5ixMUxgzuj/JsBabYMbIlZ033HfdWKn7pMObwW1xXx+R4sJDY +3txgn6zSndgf3HSN93raN4FhbgG9gHbrD/eOM3kz4P8lE1W520IH7ni8Yuxy276P0afWn PQxDAEWVH4FT+/TSH0MS+mgEqUjOLmK11YN42qRw10Dj2cEro4kmi5mgXPbPD4zhWKhPW3 lzQXBminUNIoWZ0jKcZBpcvveaHFrhsw5LlH+Uc89tn1wSYhOZJq/4aQgjOyxg== 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=1719569872; 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=HH4g3cDMid8JajYV1Sqxc/U/4DOlzu6dKDQAnmBgCa4=; b=OTgF2q854WaHN2iahGxVh191xbpjXUB2lBUQY1sCA/3rJ1iHdTjXkC90RNc30DN/FE3R9v fMhuWsiHu76b/kkRUOkCiAiatuzl5KP60H2F6o39q7twRLCWJg7DgaJY3UAXfc1qK5HTOx oPaT3mxwnGx8jWLCk0jz8xRpQpMYF4BbXALeIDGEFvqlm/d72Sq1SK4DVfRrDlR87ST3+n /ayVT9FHd0EzWI8YBGuU0YGkIFafcgmsKSqHRf6rsETNCI/hpYQuFLRCLQEFKO6KyuVK4k fi6SKVUMpXyNlKnAeuO0Dt0TbbOvXEifxEfFCT8lyPpuS22Zlj8RPfpM6vTbyA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4W9WbN07XVzrMC; Fri, 28 Jun 2024 10:17:52 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 45SAHpHg075779; Fri, 28 Jun 2024 10:17:51 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 45SAHpcM075776; Fri, 28 Jun 2024 10:17:51 GMT (envelope-from git) Date: Fri, 28 Jun 2024 10:17:51 GMT Message-Id: <202406281017.45SAHpcM075776@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mariusz Zaborski Subject: git: 7fa105d91f0d - stable/13 - isp: fix ISPCTL_ABORT_CMD switch case 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 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: oshogbo X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 7fa105d91f0dd31d55d178811cc5a62f6fdbd501 Auto-Submitted: auto-generated The branch stable/13 has been updated by oshogbo: URL: https://cgit.FreeBSD.org/src/commit/?id=7fa105d91f0dd31d55d178811cc5a62f6fdbd501 commit 7fa105d91f0dd31d55d178811cc5a62f6fdbd501 Author: Mariusz Zaborski AuthorDate: 2024-06-25 14:50:28 +0000 Commit: Mariusz Zaborski CommitDate: 2024-06-28 10:19:14 +0000 isp: fix ISPCTL_ABORT_CMD switch case Prevent kernel panic by not running ISPCTL_FCLINK_TEST after a failed ISPCTL_ABORT_CMD. Reviewed by: mav Tested by: Arne Steinkamm MFC after: 3 days Differential Revision: https://reviews.freebsd.org/D45718 (cherry picked from commit 8aa9192ce98aec07b24f8279c709237dd2c4421b) --- sys/dev/isp/isp.c | 1 + 1 file changed, 1 insertion(+) diff --git a/sys/dev/isp/isp.c b/sys/dev/isp/isp.c index b53171add5f5..ad6dbd1e6f76 100644 --- a/sys/dev/isp/isp.c +++ b/sys/dev/isp/isp.c @@ -3088,6 +3088,7 @@ isp_control(ispsoftc_t *isp, ispctl_t ctl, ...) if (ab->abrt_nphdl == ISP24XX_ABRT_OKAY) return (0); isp_prt(isp, ISP_LOGWARN, "Chan %d handle %d abort returned 0x%x", chan, tgt, ab->abrt_nphdl); + break; } case ISPCTL_FCLINK_TEST: { From nobody Fri Jun 28 10:18:36 2024 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 4W9WcD4RPvz5FCyF; Fri, 28 Jun 2024 10:18:36 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4W9WcD2XSwz4pbs; Fri, 28 Jun 2024 10:18:36 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1719569916; 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=Nnb0ARn/T46seoql92pp2TjMQULdqG1MGy238s6F4e4=; b=NuND0FciRHr8HVB2MaqiRki3QOFNLd087JfvJR7uksiuH8LwOYW89zxMEilj1X4ak9KxXW wTYsYa/Hwz4hZsM0qXqdB6PsazkuyvvwpAUx42jP4Hne9ZqaaONelJoU2R9CaSPGVPxWEP LD6NdiwBFLTjtASCQKgyGuoym+kddSZMIAARU/7U6rNkG+zpjpcyQpUA9MxDqoMRovKTXH mro6vOhuB8yj4b4BnhbC6ccIwM7U/PADX3fcQ0EShGBwKPdlvaYbGDbIzEkjK2vlvFGkJW iQHnGjHSnoeXXWRllYu1Gxz5ZzR3y0AirgXyaOFenJQOgCYKXbp86T7eTwQnAg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1719569916; a=rsa-sha256; cv=none; b=b197MNifzDUuK4sNLUvHoCaBLKwSZH+V4v9MfWBhh7Kkkv5fIGG/MqB5No+q847oOA8Y97 17l54ISMf/OyDththXS75bLttKnyjhjzem0N2w1jytryfkSelrjkITZUZ0+q2NHs0Dk+XY XRuRxuucar9OAGqaL2mjFRhulYzUAmGIJKuifZQBHxI3urivFD31P5cAOtwODhmYy6YyoB 9BjhZpahxZXY6TCiefU0CFKONaA4V0kAWSGuZvchsazUtsxcgH/rssGryyatE36/YE9pHI T35p0KXO+JhSXtkJwxtifhdqfvzC4N18nMDJWvUZcWluBThiADu9WLfTgJfLTw== 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=1719569916; 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=Nnb0ARn/T46seoql92pp2TjMQULdqG1MGy238s6F4e4=; b=gY6L6vD9OOvRLtd1lmTGSMMzzvqCIyuH0oypSDj6JqJsikgNNvHdrJYn1J6Td0z40j7LBi HrteslsasybS+nocPTWgVHMeaTXlEQNv9a6bm3i6a+Vh7LKrLNKtYjQHmmyVWCvo7Os/6k jQM0dnW9L4zECeyW1EDeZbG06KWV6pvH5sbIbzyz6jbu2Sg8RrEibrXiOtEaly+J7DCOwR rCJQVhLvayp33reoggWJei/sbRguBnkWOgKyz8G5cTv53HugcEl6LGhvBcROAG0v7/M4tm DQgB17jwURDzzLPaIZcPZHToKR8FLmMZ4z1OtmswPu2C5Y4caG7vVGkKOhI3dg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4W9WcD1sgXzrss; Fri, 28 Jun 2024 10:18:36 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 45SAIaCC076144; Fri, 28 Jun 2024 10:18:36 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 45SAIa8S076141; Fri, 28 Jun 2024 10:18:36 GMT (envelope-from git) Date: Fri, 28 Jun 2024 10:18:36 GMT Message-Id: <202406281018.45SAIa8S076141@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mariusz Zaborski Subject: git: c7bb7a23336a - stable/13 - libcapsicum: cache more time zone information 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 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: oshogbo X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: c7bb7a23336ad1c526b7fb910092a828455094ee Auto-Submitted: auto-generated The branch stable/13 has been updated by oshogbo: URL: https://cgit.FreeBSD.org/src/commit/?id=c7bb7a23336ad1c526b7fb910092a828455094ee commit c7bb7a23336ad1c526b7fb910092a828455094ee Author: Mariusz Zaborski AuthorDate: 2024-05-27 11:17:03 +0000 Commit: Mariusz Zaborski CommitDate: 2024-06-28 10:19:56 +0000 libcapsicum: cache more time zone information The functions like gmtime(3) expect to cache a GMT time zone. Some sandboxed programs (like last(1)) use the gmtime(3) function. In case of last(1), this function fails to load a proper time zone because it is called after entering the capability mode. _open () at _open.S:4 0x00000008011bc5a8 in tzloadbody (name=0x8018b9580 "/usr/share/zoneinfo/Etc/UTC", sp=0x801870140, tzload (name=, sp=0x801870140, doextend=true) 0x00000008011bb8ba in gmtload (sp=0x801870140) at /usr/src/contrib/tzcode/localtime.c:1456 gmtcheck () at /usr/src/contrib/tzcode/localtime.c:1581 0x000000080111f85a in _libc_once (once_control=0x80127c550, init_routine=0x0) _once (once_control=0x80127c550, init_routine=0x0) at /usr/src/lib/libc/gen/_once_stub.c:63 0x00000008011bb9d0 in gmtime_r (timep=0x7fffffffe3a8, tmp=0x80127c568) gmtime (timep=timep@entry=0x7fffffffe3a8) at /usr/src/contrib/tzcode/localtime.c:1865 0x0000000001024cd4 in printentry (bp=bp@entry=0x8018b4800, tt=tt@entry=0x80186a0a0) 0x00000000010245ae in doentry (bp=0x8018b4800) 0x00000000010243a7 in main (argc=1, argv=) This time zone is not loaded by the tzset(3) function. Because of that, extend the caph_cache_tzdata(3) function to also include the GMT time zone. There is no other way to cache this data than calling gmtime(3) once. MFC after: 5 days Reviewed by: emaste, markj Differential Revision: https://reviews.freebsd.org/D45297 (cherry picked from commit e24ff5c99be080007ff9086398fbe3ef56cd94dc) --- lib/libcapsicum/capsicum_helpers.h | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/lib/libcapsicum/capsicum_helpers.h b/lib/libcapsicum/capsicum_helpers.h index f137ec1806f9..a6c696aa9a8e 100644 --- a/lib/libcapsicum/capsicum_helpers.h +++ b/lib/libcapsicum/capsicum_helpers.h @@ -133,8 +133,17 @@ caph_limit_stdio(void) static __inline void caph_cache_tzdata(void) { + time_t delta; tzset(); + + /* + * The tzset() function does not cache all time zones. + * Some functions, such as gmtime(), require a GMT time zone. + * The only way to cache them is to call the function directly. + */ + delta = 0; + (void)gmtime(&delta); } static __inline void From nobody Fri Jun 28 10:18:52 2024 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 4W9WcY1cWgz5FCyH; Fri, 28 Jun 2024 10:18: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4W9WcX72BWz4ppr; Fri, 28 Jun 2024 10:18:52 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1719569933; 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=jK2gi4IQz0HFTMBMJ/2rmLOFdsXRtVbiTkJBB2Q5JOw=; b=F3CtK8/A2gJRHTFr5dWmt75sLHrifdvaD+M+n+RCHAsPbhu6LVq7Cd9yvcMDlX+vUO0C4g Lu1zOY33Ou9nYLvtNOr7EPitYy3DffKKb7ozAh8M87dZI9lx3UtYowHoengDSjYvVaqvPg vRZS0vI3KtG9drBDawaXihvbp+embsHUCMq7Pp2zz9CdWZ2L5EV5SH1S1NcVq00DrH45ti EXr8XLZ2XK3OFonyFR2WpPuARkIxy6oZEcpwWBob6X/PaK0kytevhWP5MikIEyAw4nh6MZ E7FZbgktmGsTn5zoXOFG44S2Z1Un0FdQwKnwf1aK3nYd6Dt3qBdr8qwNt8Ry7Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1719569933; a=rsa-sha256; cv=none; b=OtqQMxUwJUiAb1bVZiKhRPHEEETZw1yynLYbOZmOE4pwN3LJLPfQD6R0Z597lXqahEFuE4 uKTsbEoZfRU0+zKx2JaCTfqUCEKdknuBm8vLNagimONjzqrTxoYU7lrvvjXxGBoAnbo/Tx n6LQab4VXefLwUphZzMAfgCosA7MZHBnvyfWfMFvg5cVOj2ygbzuoCttBTS9vu/m0yy/B4 CQSBsWWIz0VwZRaXQeENWH4jhw8J+ZRZ/KJhsw2hzoY8D+twAhyyBJqTEhyac4eBSZnJ5M 7LW+x3WCmllCccD2kdBQvV6HnXFs47PvShDXVttRkomJNf83hC5llVMxBbAWNQ== 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=1719569933; 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=jK2gi4IQz0HFTMBMJ/2rmLOFdsXRtVbiTkJBB2Q5JOw=; b=Au6KCuefLtKQ5d46A5inU5UateSVji65jnN29gACAHWGB92FOOUumX+L/5yArzAosbHH82 voexpE0oh9vtKM3aW5UOu4hY165hP8yjUvRf1sMfBaQBr7FTzNiEJAG+Ihq9mvCXctMc7f tkjLLvvaRp4gyqfmpHsFQm5tAV1oi93Ugidm/DB4nU/Q4zMc38L8TjYjdsJwxzbhwPW0nJ VmtHIstpMuS44QCyGM0ne8ctlBadaym2cabQyk14nx8h1S6biQQsHO03Nab7EYNuxlqYP8 4HDasI0Xy2P7TWAM4+tzjyeAiw481W0rTl3p1fk4jTPDILkz29Vs9gK+5UU05Q== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4W9WcX6cVBzrn9; Fri, 28 Jun 2024 10:18:52 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 45SAIqp6076340; Fri, 28 Jun 2024 10:18:52 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 45SAIqjJ076337; Fri, 28 Jun 2024 10:18:52 GMT (envelope-from git) Date: Fri, 28 Jun 2024 10:18:52 GMT Message-Id: <202406281018.45SAIqjJ076337@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mariusz Zaborski Subject: git: 2c88494a3364 - stable/14 - libcapsicum: cache more time zone information 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 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: oshogbo X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 2c88494a336488caa3eec75a126d8b9bc23c20b0 Auto-Submitted: auto-generated The branch stable/14 has been updated by oshogbo: URL: https://cgit.FreeBSD.org/src/commit/?id=2c88494a336488caa3eec75a126d8b9bc23c20b0 commit 2c88494a336488caa3eec75a126d8b9bc23c20b0 Author: Mariusz Zaborski AuthorDate: 2024-05-27 11:17:03 +0000 Commit: Mariusz Zaborski CommitDate: 2024-06-28 10:20:15 +0000 libcapsicum: cache more time zone information The functions like gmtime(3) expect to cache a GMT time zone. Some sandboxed programs (like last(1)) use the gmtime(3) function. In case of last(1), this function fails to load a proper time zone because it is called after entering the capability mode. _open () at _open.S:4 0x00000008011bc5a8 in tzloadbody (name=0x8018b9580 "/usr/share/zoneinfo/Etc/UTC", sp=0x801870140, tzload (name=, sp=0x801870140, doextend=true) 0x00000008011bb8ba in gmtload (sp=0x801870140) at /usr/src/contrib/tzcode/localtime.c:1456 gmtcheck () at /usr/src/contrib/tzcode/localtime.c:1581 0x000000080111f85a in _libc_once (once_control=0x80127c550, init_routine=0x0) _once (once_control=0x80127c550, init_routine=0x0) at /usr/src/lib/libc/gen/_once_stub.c:63 0x00000008011bb9d0 in gmtime_r (timep=0x7fffffffe3a8, tmp=0x80127c568) gmtime (timep=timep@entry=0x7fffffffe3a8) at /usr/src/contrib/tzcode/localtime.c:1865 0x0000000001024cd4 in printentry (bp=bp@entry=0x8018b4800, tt=tt@entry=0x80186a0a0) 0x00000000010245ae in doentry (bp=0x8018b4800) 0x00000000010243a7 in main (argc=1, argv=) This time zone is not loaded by the tzset(3) function. Because of that, extend the caph_cache_tzdata(3) function to also include the GMT time zone. There is no other way to cache this data than calling gmtime(3) once. MFC after: 5 days Reviewed by: emaste, markj Differential Revision: https://reviews.freebsd.org/D45297 (cherry picked from commit e24ff5c99be080007ff9086398fbe3ef56cd94dc) --- lib/libcapsicum/capsicum_helpers.h | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/lib/libcapsicum/capsicum_helpers.h b/lib/libcapsicum/capsicum_helpers.h index f137ec1806f9..a6c696aa9a8e 100644 --- a/lib/libcapsicum/capsicum_helpers.h +++ b/lib/libcapsicum/capsicum_helpers.h @@ -133,8 +133,17 @@ caph_limit_stdio(void) static __inline void caph_cache_tzdata(void) { + time_t delta; tzset(); + + /* + * The tzset() function does not cache all time zones. + * Some functions, such as gmtime(), require a GMT time zone. + * The only way to cache them is to call the function directly. + */ + delta = 0; + (void)gmtime(&delta); } static __inline void From nobody Fri Jun 28 18:49:46 2024 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 4W9ky25bBnz5P6nG; Fri, 28 Jun 2024 18:49: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4W9ky253D2z4t2G; Fri, 28 Jun 2024 18:49:46 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1719600586; 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=en3BC+vkLw7y+IjUGf3vw8aH0Rsf9MyVLQahsNokaD8=; b=gpjDcdBf5Nq195WyrYoECCU7jd0MF6hRp7+Am1NWAtLIrBAxJi8tinxQHo9EqrJ+kUXpkA hwYiz7+oK7Wnh60o/AmyxdmTdtCPSWvTLkSWgYxFO1iMzIM0MUrZtKgeqS028nRg+eIHhu VVioyNqH7j7jDyuKsYwaEREwC1m6MY3pzBOIIMYDitNLo+d6TRFuZxHelPnpkmEeAKXm9f FlxsXlOWCxM9G2S2QPD0taz69j6aB4Qdp6f6uED6DymKg4Y+EfvB861mDD7cy31ECwmHjx 08NM/6XnMmKyTfxn6QtgBAOQ/GUzPYCYdwlKYFIg3DSK8ELusX31Ssc29zINcw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1719600586; a=rsa-sha256; cv=none; b=sw2JXkQDVfNiSi1N7WTzptjjwqSiz+fIgkLCPPCygc5srzgxokwi7y4Ia8lVVOtOfVv2hq lpMG/l81hpRmZ8MhHuf0RARiBEv86BVLGD3AAVYduxHEC57x9BSvEJa4p1SG6wWPKjvBhX 8VtSqpUNFg4Gzz9J1p4lX0JqYeqzA6JzteYTrfP/X7mL5P6EezE2MphHcVdl4fwr0r4CpR sAqmKCA1m4Gokc89kcfnSrK6FrA7zsHUCqQVo65bgEC4sDN1Ficwm5oEOIV964TIoFdH/6 SO1OGCg4Wwa4XEpXpqlTfiDbuuUP8EG/7gG45CN3LC3x+gmoG2TS3t+6gGnXVw== 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=1719600586; 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=en3BC+vkLw7y+IjUGf3vw8aH0Rsf9MyVLQahsNokaD8=; b=uDp/tqi3kUasSiXMY7AFmDM65KZoZry7g/zXiqsnFEwS1ElVHrdkOSF0UxjmlEJWxucZcK Ug0XdYp1utwRbtDw6AtuOaEHkxDSUc2jh+GZV2Ch0STo+SXH5u3ELGqwiZrBd7+OPAgGjI EXPpICQZgMNqvZAZeNTNzEpHdpD+i6DiJb2pvj7Wb/pYLD3RVlSUtGJ1ifRkC97gJVG06H NipzpMZ59VwW8XngATgv/CeQfDWRXg19Fey3VAaFMaPxt1rodu6Ay7Drj58CJusult8+aO z071VxLSnwn1I2ycvsuuN/HugRZXDB8IYgP6CVMI8f6jhpPdzaPrcUaToJc6zw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4W9ky24fXMz16XF; Fri, 28 Jun 2024 18:49:46 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 45SInkEs036231; Fri, 28 Jun 2024 18:49:46 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 45SInkSD036228; Fri, 28 Jun 2024 18:49:46 GMT (envelope-from git) Date: Fri, 28 Jun 2024 18:49:46 GMT Message-Id: <202406281849.45SInkSD036228@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Alan Somers Subject: git: 51bee6ab6535 - stable/13 - geli.8: minor proofreading 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 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/13 X-Git-Reftype: branch X-Git-Commit: 51bee6ab65358a261858778d57c2fbd69fb181ce Auto-Submitted: auto-generated The branch stable/13 has been updated by asomers: URL: https://cgit.FreeBSD.org/src/commit/?id=51bee6ab65358a261858778d57c2fbd69fb181ce commit 51bee6ab65358a261858778d57c2fbd69fb181ce Author: Alan Somers AuthorDate: 2024-04-22 21:11:09 +0000 Commit: Alan Somers CommitDate: 2024-06-28 18:49:18 +0000 geli.8: minor proofreading Sponsored by: Axcient Reviewed by: imp, pauamma (manpages) Differential Revision: https://reviews.freebsd.org/D44907 (cherry picked from commit c0f02dcd4c9c17181c59fa3c43259cce793a0b21) --- lib/geom/eli/geli.8 | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/geom/eli/geli.8 b/lib/geom/eli/geli.8 index c378c591290c..501b948fde49 100644 --- a/lib/geom/eli/geli.8 +++ b/lib/geom/eli/geli.8 @@ -22,7 +22,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd April 18, 2022 +.Dd April 20, 2024 .Dt GELI 8 .Os .Sh NAME @@ -867,7 +867,7 @@ If set to 0, a CPU-pinned thread will be started for every active CPU. When set to 1, can speed-up crypto operations by using batching. Batching reduces the number of interrupts by responding to a group of crypto requests with one interrupt. -The crypto card and the driver has to support this feature. +The crypto card and the driver have to support this feature. .It Va kern.geom.eli.key_cache_limit : No 8192 Specifies how many Data Keys to cache. The default limit @@ -884,7 +884,7 @@ Reports how many times we were looking up a Data Key and it was not in cache. This sysctl is not updated for providers that need fewer Data Keys than the limit specified in .Va kern.geom.eli.key_cache_limit . -.Va kern.geom.eli.unmapped_io +.It Va kern.geom.eli.unmapped_io Enable support for unmapped I/O buffers, currently implemented only on 64-bit platforms. This is an optimization which reduces the overhead of I/O processing. From nobody Fri Jun 28 18:53:55 2024 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 4W9l2q6p95z5P6sR; Fri, 28 Jun 2024 18:53: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4W9l2q6C2wz4vDF; Fri, 28 Jun 2024 18:53:55 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1719600835; 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=FyLXDbEN0xi1TWMJN6pHkyRe7zFzXxkb+TgR4U2wuV0=; b=PIcyjchBUkfXp9YfdNyBSz3xu85+3SEKxcZVjVNRMV3oYkUn2svgoo7sUAXn9LSoKXaxnC 5om9WZbX2iUaNYFtm0jCHmwIMxznJbXZGQF2mGdcJfkyqROfWIdaM5ZQvbA6lHxPuoLtJP AAGKiIPDwSfg4vj9I4w+k+PWaXfYxIAML68bLzu3EN9RzeWudQKr20K+mLV6lLl243+14H 3YTv6076+AMV8GMXRgCQw3GiyQ0+3MsBUs4ibjLTAbgJ8MF8+rC3B7qsIBY8NI3nAiLGTL z3rBYEQdC5h/+DBNQFDutdAH6Z5+cMd6rLOEXCUgctOyptTi6ePb8O/07WvQvw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1719600835; a=rsa-sha256; cv=none; b=OMfot7m+gtBYduWk7ohtoOqZ/W/uE1UyuGT222xBKz15aEvF3+SOUAPeV+uqYntaypKcpx NzqYrqTwzsJS3a07jn7uHWxabMCh6X6dtnUkl3SiUh4fy3E2lQ66Kjf0ZqThpYuuifR85z OptIj/N5pbyLmBh8ucwZhnA+Km7qiw9zTcANwOrGHxY85n5llLxK9gwtawZCo6QHv/WqkX vyrW0MRO5CIWRNY0omYoQZgMGlyQtWrcfNZcv/KKvZ7kEBefX3NYD0uBG/BP36CW5EjSui 8DUGGwXNLEbTyo8c9FLeopfw//x06RyNDMZoRTgAvuVfP5UR3zrZY/CQHF6B4A== 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=1719600835; 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=FyLXDbEN0xi1TWMJN6pHkyRe7zFzXxkb+TgR4U2wuV0=; b=hcZgmOx+bGjzObooS29PTTvhKWrUNwSCim8GZmn1b+DbC/9kEHF8AV3p9+xx0616dymlkd 8FYy4SA+g0nIPLyXRJtarN2a4Z+psLD3val6lNV5Y9Xab63KJSVNDqkh5vtkHcYe4xTGAv pF7ZXZtJUwt6JzeqV9wE+a4XZUmBIpWY5UURKIKpbOEIcu6RSlQ0GkmF1WN66PpFk+J3S0 IBwTOLmcx4FdHOiGRCJLEIxv9sRaSksVnC+GCsYV1CbbcNN2lsVoKsm9WHTgvPpnL0yMF2 XiA8vxVT9l03HDrDtS4uUGTrGVyOz9INFBN+5bDCQU33ADsCVfJReDV91BFthw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4W9l2q5pWXz16mY; Fri, 28 Jun 2024 18:53:55 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 45SIrt1w052532; Fri, 28 Jun 2024 18:53:55 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 45SIrt2K052529; Fri, 28 Jun 2024 18:53:55 GMT (envelope-from git) Date: Fri, 28 Jun 2024 18:53:55 GMT Message-Id: <202406281853.45SIrt2K052529@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Alan Somers Subject: git: 4052c952803f - stable/13 - tests/fusefs: fix all tests that depend on kern.maxphys 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 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/13 X-Git-Reftype: branch X-Git-Commit: 4052c952803f2ba33bb26e13aeeaf9c0651e3702 Auto-Submitted: auto-generated The branch stable/13 has been updated by asomers: URL: https://cgit.FreeBSD.org/src/commit/?id=4052c952803f2ba33bb26e13aeeaf9c0651e3702 commit 4052c952803f2ba33bb26e13aeeaf9c0651e3702 Author: Gleb Smirnoff AuthorDate: 2024-05-06 19:03:20 +0000 Commit: Alan Somers CommitDate: 2024-06-28 18:52:07 +0000 tests/fusefs: fix all tests that depend on kern.maxphys The tests try to read kern.maxphys sysctl into int value, while unsigned long is required. Not sure when this was broken, seems like since cd8537910406e. Reviewed by: asomers Differential Revision: https://reviews.freebsd.org/D45053 (cherry picked from commit e9b411d273336647e61704213964b995952a44fd) --- tests/sys/fs/fusefs/bmap.cc | 12 ++++++------ tests/sys/fs/fusefs/read.cc | 2 +- tests/sys/fs/fusefs/utils.cc | 13 ++++++------- tests/sys/fs/fusefs/utils.hh | 2 +- tests/sys/fs/fusefs/write.cc | 5 +++-- 5 files changed, 17 insertions(+), 17 deletions(-) diff --git a/tests/sys/fs/fusefs/bmap.cc b/tests/sys/fs/fusefs/bmap.cc index fae5aabee471..06342e7cc23b 100644 --- a/tests/sys/fs/fusefs/bmap.cc +++ b/tests/sys/fs/fusefs/bmap.cc @@ -105,8 +105,8 @@ TEST_F(Bmap, bmap) arg.runb = -1; ASSERT_EQ(0, ioctl(fd, FIOBMAP2, &arg)) << strerror(errno); EXPECT_EQ(arg.bn, pbn); - EXPECT_EQ(arg.runp, m_maxphys / m_maxbcachebuf - 1); - EXPECT_EQ(arg.runb, m_maxphys / m_maxbcachebuf - 1); + EXPECT_EQ((unsigned long)arg.runp, m_maxphys / m_maxbcachebuf - 1); + EXPECT_EQ((unsigned long)arg.runb, m_maxphys / m_maxbcachebuf - 1); leak(fd); } @@ -142,7 +142,7 @@ TEST_F(Bmap, default_) arg.runb = -1; ASSERT_EQ(0, ioctl(fd, FIOBMAP2, &arg)) << strerror(errno); EXPECT_EQ(arg.bn, 0); - EXPECT_EQ(arg.runp, m_maxphys / m_maxbcachebuf - 1); + EXPECT_EQ((unsigned long )arg.runp, m_maxphys / m_maxbcachebuf - 1); EXPECT_EQ(arg.runb, 0); /* In the middle */ @@ -152,8 +152,8 @@ TEST_F(Bmap, default_) arg.runb = -1; ASSERT_EQ(0, ioctl(fd, FIOBMAP2, &arg)) << strerror(errno); EXPECT_EQ(arg.bn, lbn * m_maxbcachebuf / DEV_BSIZE); - EXPECT_EQ(arg.runp, m_maxphys / m_maxbcachebuf - 1); - EXPECT_EQ(arg.runb, m_maxphys / m_maxbcachebuf - 1); + EXPECT_EQ((unsigned long )arg.runp, m_maxphys / m_maxbcachebuf - 1); + EXPECT_EQ((unsigned long )arg.runb, m_maxphys / m_maxbcachebuf - 1); /* Last block */ lbn = filesize / m_maxbcachebuf - 1; @@ -163,7 +163,7 @@ TEST_F(Bmap, default_) ASSERT_EQ(0, ioctl(fd, FIOBMAP2, &arg)) << strerror(errno); EXPECT_EQ(arg.bn, lbn * m_maxbcachebuf / DEV_BSIZE); EXPECT_EQ(arg.runp, 0); - EXPECT_EQ(arg.runb, m_maxphys / m_maxbcachebuf - 1); + EXPECT_EQ((unsigned long )arg.runb, m_maxphys / m_maxbcachebuf - 1); leak(fd); } diff --git a/tests/sys/fs/fusefs/read.cc b/tests/sys/fs/fusefs/read.cc index 90516a2f7c8a..df2ca2380f00 100644 --- a/tests/sys/fs/fusefs/read.cc +++ b/tests/sys/fs/fusefs/read.cc @@ -1339,7 +1339,7 @@ TEST_P(ReadAhead, readahead) { expect_open(ino, 0, 1); maxcontig = m_noclusterr ? m_maxbcachebuf : m_maxbcachebuf + m_maxreadahead; - clustersize = MIN(maxcontig, m_maxphys); + clustersize = MIN((unsigned long )maxcontig, m_maxphys); for (offs = 0; offs < bufsize; offs += clustersize) { len = std::min((size_t)clustersize, (size_t)(filesize - offs)); expect_read(ino, offs, len, len, contents + offs); diff --git a/tests/sys/fs/fusefs/utils.cc b/tests/sys/fs/fusefs/utils.cc index 55a552e28eeb..831ded0c0815 100644 --- a/tests/sys/fs/fusefs/utils.cc +++ b/tests/sys/fs/fusefs/utils.cc @@ -130,8 +130,7 @@ class FuseEnv: public Environment { void FuseTest::SetUp() { const char *maxbcachebuf_node = "vfs.maxbcachebuf"; const char *maxphys_node = "kern.maxphys"; - int val = 0; - size_t size = sizeof(val); + size_t size; /* * XXX check_environment should be called from FuseEnv::SetUp, but @@ -141,12 +140,12 @@ void FuseTest::SetUp() { if (IsSkipped()) return; - ASSERT_EQ(0, sysctlbyname(maxbcachebuf_node, &val, &size, NULL, 0)) - << strerror(errno); - m_maxbcachebuf = val; - ASSERT_EQ(0, sysctlbyname(maxphys_node, &val, &size, NULL, 0)) + size = sizeof(m_maxbcachebuf); + ASSERT_EQ(0, sysctlbyname(maxbcachebuf_node, &m_maxbcachebuf, &size, + NULL, 0)) << strerror(errno); + size = sizeof(m_maxphys); + ASSERT_EQ(0, sysctlbyname(maxphys_node, &m_maxphys, &size, NULL, 0)) << strerror(errno); - m_maxphys = val; /* * Set the default max_write to a distinct value from MAXPHYS to catch * bugs that confuse the two. diff --git a/tests/sys/fs/fusefs/utils.hh b/tests/sys/fs/fusefs/utils.hh index 383f01ea4bfe..506e8a985212 100644 --- a/tests/sys/fs/fusefs/utils.hh +++ b/tests/sys/fs/fusefs/utils.hh @@ -77,7 +77,7 @@ class FuseTest : public ::testing::Test { public: int m_maxbcachebuf; - int m_maxphys; + unsigned long m_maxphys; FuseTest(): m_maxreadahead(0), diff --git a/tests/sys/fs/fusefs/write.cc b/tests/sys/fs/fusefs/write.cc index 9412d68603de..9d152aeb0617 100644 --- a/tests/sys/fs/fusefs/write.cc +++ b/tests/sys/fs/fusefs/write.cc @@ -184,7 +184,7 @@ virtual void SetUp() { if (m_maxphys < 2 * DFLTPHYS) GTEST_SKIP() << "MAXPHYS must be at least twice DFLTPHYS" << " for this test"; - if (m_maxphys < 2 * m_maxbcachebuf) + if (m_maxphys < 2 * (unsigned long )m_maxbcachebuf) GTEST_SKIP() << "MAXPHYS must be at least twice maxbcachebuf" << " for this test"; } @@ -860,7 +860,8 @@ TEST_F(WriteMaxWrite, write) ssize_t halfbufsize, bufsize; halfbufsize = m_mock->m_maxwrite; - if (halfbufsize >= m_maxbcachebuf || halfbufsize >= m_maxphys) + if (halfbufsize >= m_maxbcachebuf || + (unsigned long )halfbufsize >= m_maxphys) GTEST_SKIP() << "Must lower m_maxwrite for this test"; bufsize = halfbufsize * 2; contents = new int[bufsize / sizeof(int)]; From nobody Fri Jun 28 18:59:41 2024 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 4W9l9T2cjqz5P7b3; Fri, 28 Jun 2024 18:59: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4W9l9T22Czz4vT5; Fri, 28 Jun 2024 18:59:41 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1719601181; 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=ZZjxaS8kAgmgHgshhFQeE/O/0g3GxeoFQq1pdSchZII=; b=iYyu7q8Gr5ebzQvHvNd/gglJkkFhvjBI5lnAFjocxkW5Zj4gTF8R/gwEFvND+6GSVp5NiS WcJxIfS1TioxcDer/MkTVZpqsQM3aNoIbjsld7sBY+AKI0qDa4Eh5SrDjKN7PDq/kZUN4o glhf6xBneSvujD+h9b6BYIduozJ1brtyD/Xjh6fRUToW0aj5gmcz8mzxTP+hMxKFqREHsE DAbgaAD5mRqw5BDfS8rPnovm7PD8Mj3rzrDXLP965YmTArsI8UEZcOm5W/amCkuhv7byOd LoTsnTXillLCaPeTTYfJxSeQxTSCgEZ3F/9bjEmLExR0xKWYyXixmU1ekDHutQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1719601181; a=rsa-sha256; cv=none; b=K+9BG5bo2EuQn8ZoLvCiPSc65YAPZii3uiiDHzEXU3WtUnizsHcaBr7hEfk5cxffmP4Rm3 Q3wG2HMYb6vy6K+Yy9uyqdzhpNxkbcOFO+YUnWJn37ixTb57s9kE1FjMz/dGyL0x8LwGYG UN0x4xvOBGCXkb472ARJbNdXRW6CFQLRkYSbADSKy67On8DrPbBS9y60hKjccXqLwENvTe 9Tyjt3SJlPrZwf/Gkhuhn7WfFIO5Bqn3zHTcrryKKoAoT+Cm1K3p2+2apJy1w5Qe0ouE3u 2wGB9fq5wzr+eTwePE/JkKuSMqs1ydXeNu792RxAUfw1VEnrSE4HkwzOD/OZCA== 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=1719601181; 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=ZZjxaS8kAgmgHgshhFQeE/O/0g3GxeoFQq1pdSchZII=; b=N76xOGN4fYLvCCNoRGsA5olagYomwBKDNWT3SPOnfOENb51tA3/3eF/8Qo6oOiIBRx2SMp atL/H6fDSG23RJ5kLyiK98wT7LPEZyyaNuEJRbrZghV7SKV3BM16c80tDr1ZLK+uwo7Upc XPf9G9LJYo2S2yQB+AT5+5p9ep8d35NKOy48dpgTK7PwQo7HTEbpv+/CNMJphSSxNDDZsV G4K2RzUAHngULXRy+kP9uHsUyNJaJzJv+mK1bTf0BN3xoC4qzjH5StzXCfCe/5HBbOiM6n NsoSlDkf8AmroAL8pjTDz3rJhVfuhp5dFCGIB35PnJCBlSFfC1Bgc4MJhlgFNg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4W9l9T1Bg0z16xh; Fri, 28 Jun 2024 18:59:41 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 45SIxfcq053482; Fri, 28 Jun 2024 18:59:41 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 45SIxfMl053479; Fri, 28 Jun 2024 18:59:41 GMT (envelope-from git) Date: Fri, 28 Jun 2024 18:59:41 GMT Message-Id: <202406281859.45SIxfMl053479@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Alan Somers Subject: git: af64741bba63 - stable/13 - fusefs: make the tests more robust to changes to maxphys 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 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/13 X-Git-Reftype: branch X-Git-Commit: af64741bba6391a765294a41fe43030d4f242e4b Auto-Submitted: auto-generated The branch stable/13 has been updated by asomers: URL: https://cgit.FreeBSD.org/src/commit/?id=af64741bba6391a765294a41fe43030d4f242e4b commit af64741bba6391a765294a41fe43030d4f242e4b Author: Alan Somers AuthorDate: 2024-05-09 14:40:21 +0000 Commit: Alan Somers CommitDate: 2024-06-28 18:54:00 +0000 fusefs: make the tests more robust to changes to maxphys Remove assumptions in two test cases that maxphys won't be huge. Reported by: kib Sponsored by: Axcient (cherry picked from commit b2792a300ddb8d8334b234fe7744f5141cc96103) --- tests/sys/fs/fusefs/bmap.cc | 17 +++++++++++++---- tests/sys/fs/fusefs/write.cc | 2 +- 2 files changed, 14 insertions(+), 5 deletions(-) diff --git a/tests/sys/fs/fusefs/bmap.cc b/tests/sys/fs/fusefs/bmap.cc index 06342e7cc23b..8e9268058e96 100644 --- a/tests/sys/fs/fusefs/bmap.cc +++ b/tests/sys/fs/fusefs/bmap.cc @@ -77,8 +77,6 @@ class BmapEof: public Bmap, public WithParamInterface {}; /* * Test FUSE_BMAP - * XXX The FUSE protocol does not include the runp and runb variables, so those - * must be guessed in-kernel. */ TEST_F(Bmap, bmap) { @@ -105,8 +103,19 @@ TEST_F(Bmap, bmap) arg.runb = -1; ASSERT_EQ(0, ioctl(fd, FIOBMAP2, &arg)) << strerror(errno); EXPECT_EQ(arg.bn, pbn); - EXPECT_EQ((unsigned long)arg.runp, m_maxphys / m_maxbcachebuf - 1); - EXPECT_EQ((unsigned long)arg.runb, m_maxphys / m_maxbcachebuf - 1); + /* + * XXX The FUSE protocol does not include the runp and runb variables, + * so those must be guessed in-kernel. There's no "right" answer, so + * just check that they're within reasonable limits. + */ + EXPECT_LE(arg.runb, lbn); + EXPECT_LE((unsigned long)arg.runb, m_maxreadahead / m_maxbcachebuf); + EXPECT_LE((unsigned long)arg.runb, m_maxphys / m_maxbcachebuf); + EXPECT_GT(arg.runb, 0); + EXPECT_LE(arg.runp, filesize / m_maxbcachebuf - lbn); + EXPECT_LE((unsigned long)arg.runp, m_maxreadahead / m_maxbcachebuf); + EXPECT_LE((unsigned long)arg.runp, m_maxphys / m_maxbcachebuf); + EXPECT_GT(arg.runp, 0); leak(fd); } diff --git a/tests/sys/fs/fusefs/write.cc b/tests/sys/fs/fusefs/write.cc index 9d152aeb0617..0b93369ad66d 100644 --- a/tests/sys/fs/fusefs/write.cc +++ b/tests/sys/fs/fusefs/write.cc @@ -179,7 +179,7 @@ class WriteCluster: public WriteBack { public: virtual void SetUp() { m_async = true; - m_maxwrite = 1 << 25; // Anything larger than MAXPHYS will suffice + m_maxwrite = UINT32_MAX; // Anything larger than MAXPHYS will suffice WriteBack::SetUp(); if (m_maxphys < 2 * DFLTPHYS) GTEST_SKIP() << "MAXPHYS must be at least twice DFLTPHYS" From nobody Fri Jun 28 18:59:42 2024 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 4W9l9V2kwyz5P7dH; Fri, 28 Jun 2024 18:59:42 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4W9l9V2DGzz4vT6; Fri, 28 Jun 2024 18:59:42 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1719601182; 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=KjSF6WzImV5FF+DxoumCeVoogbTBkQbVcD53TFTwuw0=; b=OM78qRm8vrFLFTBmh+O/CO98mAPv7BH/H0Rs7ovs1cxotG12aGnXWuAME9WLzSbQOi4hrS tNOADswbrBPzyaGYFcDTpqXigW02aY6jX11XD1aTigRbzeOMHsFwxbbh6wYMj7GXRpjgdQ hnNYov2YT+ESqM9B0w0zPgwNm9CkZsyI6bYqyVt+KsVOFEsZm07EbTHZwLCBws7pV3GR8l xMYvjv99I5lSpX27pf0PujJWkofLsxLMaSM3sQuK+CNCQdQ4uWAv7E02cR7pRZd9nhzU2X xv0WA/x3SV0Vi/xpAbEyum/3T3PDwgWYurEdxgdYP0pWj64K6MWpv+6TQz0nCg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1719601182; a=rsa-sha256; cv=none; b=QXpv8bEO4i8GCtgtPMpVFzoBZWBwjDHxUiZWCQmzbbVdCGOdL0XeLzkXF2/oIjeOrvphpl lvLrZN+WG4MOJTK3T1jnNCAj6hy7AhNm8MOwAtlonUhocLCJsZ1f29vB9YxXT4CfClD3mT zE3U5dZ6wJHmTkBMleICEJITwkZpN8i8wxOZyEvEeQlHFwsJ+uJ0ZHIgpEDQnVu99yyV3L OldkakTWLX9/9knxEc2khSoojCZR6S5TS+cSZLbSy6yzz5UHv5AkCftwZHkTwQ1CC02vZO zeG6m48c28cpX4Aehlrl1CGJawJLCQAxtgMo8HtDp/zYNBxfZuwGNoo67EMZnA== 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=1719601182; 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=KjSF6WzImV5FF+DxoumCeVoogbTBkQbVcD53TFTwuw0=; b=dwKzu1I3X7gjSfbdk9vLDR5GCo86pzaaiuuKaPOinzZfpLDhgfR887A6qkdu6cvL626Qfl MdcU6liTFkpPZTyR5ssPcN9QtS974tc2mA2By2wV2hysI1kyn80GRJcBsG8vZVAUqM7k6q MiXAw2JxRzpFRgZhS5vyYqVzQ7IPaBKf2RzTgLN0tG4OWejiMmNfv5flbWVI+ExTlmX7L4 aKglTDPQ4FNmjrbcP3uDSw6gO76d9gAt0i7a1PyeW7rpY8JP7BswtUXiJfe+1T/9ixmABs 1JE/KqhN+WeQSnjOBFBAIJFF530BDfzgL3P7pXU63WSfUrjCMtSfnDOyyj5irw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4W9l9V1rJ5z16Jp; Fri, 28 Jun 2024 18:59:42 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 45SIxgmv053518; Fri, 28 Jun 2024 18:59:42 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 45SIxg5M053515; Fri, 28 Jun 2024 18:59:42 GMT (envelope-from git) Date: Fri, 28 Jun 2024 18:59:42 GMT Message-Id: <202406281859.45SIxg5M053515@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Alan Somers Subject: git: 43d29dceeabe - stable/13 - vfs_getopt(9): fix typo 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 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/13 X-Git-Reftype: branch X-Git-Commit: 43d29dceeabe26f01fb449ec8fe5270302f7a8d1 Auto-Submitted: auto-generated The branch stable/13 has been updated by asomers: URL: https://cgit.FreeBSD.org/src/commit/?id=43d29dceeabe26f01fb449ec8fe5270302f7a8d1 commit 43d29dceeabe26f01fb449ec8fe5270302f7a8d1 Author: Alan Somers AuthorDate: 2024-05-19 15:49:03 +0000 Commit: Alan Somers CommitDate: 2024-06-28 18:56:11 +0000 vfs_getopt(9): fix typo [skip ci] Reported by: Claudiu (cherry picked from commit 3cc1b35bc1bdcdee279b3ee7d0e0946b684df898) --- share/man/man9/vfs_getopt.9 | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/share/man/man9/vfs_getopt.9 b/share/man/man9/vfs_getopt.9 index 0e68655f540f..ff0f027314c7 100644 --- a/share/man/man9/vfs_getopt.9 +++ b/share/man/man9/vfs_getopt.9 @@ -24,7 +24,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH .\" DAMAGE. .\" -.Dd July 31, 2011 +.Dd May 19, 2024 .Dt VFS_GETOPT 9 .Os .Sh NAME @@ -46,7 +46,7 @@ .Fa "struct vfsoptlist *opts" "const char *name" "void **buf" "int *len" .Fc .Ft "char *" -.Fn vfs_getops "struct vfsoptlist *opts" "const char *name" "int *error" +.Fn vfs_getopts "struct vfsoptlist *opts" "const char *name" "int *error" .Ft int .Fo vfs_flagopt .Fa "struct vfsoptlist *opts" "const char *name" "uint64_t *flags" "uint64_t flag" @@ -177,7 +177,7 @@ function returns 0 if the option was found; otherwise, is returned. .Pp The -.Fn vfs_getops +.Fn vfs_getopts function returns the specified option if it is found, and is .Dv NUL terminated. From nobody Fri Jun 28 18:59:43 2024 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 4W9l9W4g9Wz5P7dM; Fri, 28 Jun 2024 18:59:43 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4W9l9W3Km9z4vWK; Fri, 28 Jun 2024 18:59:43 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1719601183; 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=sBl4ISJKjvvhrf8Dht+CEWUB5g05tk1WBKUZGxf7hZw=; b=xYSyo9jw/OelwZ6a51/i/rp+muxrUEmU5GXTJk38dRhBTqgUMB1Ysj3DlkByaRhOP0Hp3P NF0GjSexDZO3TrF5pOhxMtnEhlNE/4lY+pVp1EDsisSL1IsenHGtQh+TNhthqVWHw9pFyg Fx2VAIYkt1bOmjV9xCzA/NM2dUOFVpcvMv3bpEbQNEvc3rYAsYt5d2zZvKmsFfMna+029z 2M3tLJLeu11AedGuFHWbLWBOOfDhq55qm4dV0uOUmhvyYESSbearuPiFV8Hfi1yEyHLxA/ PbwgSoFGCbrncQJQfiFReMbtGIHn32IeBofBLX0/nQa3OZrD9cDBeipk5m/sTQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1719601183; a=rsa-sha256; cv=none; b=onAJU5wW1XxiqabvRTSr/8OVSJUMMIp/Eo92GfsBQUbFI8/YhzShKJAJBqZ/Hw8NqLLtA+ ShD+xSpUQlp97KepCDhlSHCvVr46sXj+w7MfFbwFD9cpZvF2g4K3LH6XszaI52NctKPqw0 YAQj7X6oRS1Z0oRZB6sUwX2XranwrZt0U8u9e2FbRSxjxsma8zjIiHoezoEWhDDNwrAG+T t6pt3OPuCvqkBi7UBPLDAupUWARk3MaRKkGmSOsM+EDfsdY81YDPv0EsaL7zDmzHdNu5Jr 2cQrCtLorFKOyQkSeK0efvWK1fwmvrVcSM7eeT5Nk/FqHAmYSLbGI3C10hTf/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=1719601183; 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=sBl4ISJKjvvhrf8Dht+CEWUB5g05tk1WBKUZGxf7hZw=; b=oC6J/y3F437bLRz5iWSpUijELrpJOaWheD/5y1KcaZH7cpqz6vD0vPyY5H0qILRceVo1DK DoA7iS/16SDX8ohUCdVEf+iaabbNLXku+WPSd6YURXJXqw96KUo0CHk7xisL+0lzVF5kR1 8BbjtrfMCQ3wCat1hIuTYMv7HYWdypVA0gOpsU/3pys+TnXq1irJTlhSf9TlCvAFc4MgH5 6NjxatvwwTD5gVSz3Uhfm1I/TIN9ja8TIgMA/N/NyIuifraO2jbPnDZbrFXZRnKPO0z02L Vlf+jb2dJB3hhxPw5yz5mzsm3ZHnv6EZ8orjYCwt7f+YF05fi1YsVC/Tm59mOA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4W9l9W2tFFz16CK; Fri, 28 Jun 2024 18:59:43 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 45SIxh89053566; Fri, 28 Jun 2024 18:59:43 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 45SIxhgl053563; Fri, 28 Jun 2024 18:59:43 GMT (envelope-from git) Date: Fri, 28 Jun 2024 18:59:43 GMT Message-Id: <202406281859.45SIxhgl053563@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Alan Somers Subject: git: 1cc56f881fde - stable/13 - mdconfig: fix cleanup in the attach_size_rounddown test 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 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/13 X-Git-Reftype: branch X-Git-Commit: 1cc56f881fde26f7ade811bd2fd5ce5c3f300069 Auto-Submitted: auto-generated The branch stable/13 has been updated by asomers: URL: https://cgit.FreeBSD.org/src/commit/?id=1cc56f881fde26f7ade811bd2fd5ce5c3f300069 commit 1cc56f881fde26f7ade811bd2fd5ce5c3f300069 Author: Alan Somers AuthorDate: 2024-05-31 21:18:25 +0000 Commit: Alan Somers CommitDate: 2024-06-28 18:56:38 +0000 mdconfig: fix cleanup in the attach_size_rounddown test Sponsored by: Axcient (cherry picked from commit d1bd097d52cb5f8b0484e1f22c5506846f4ed304) --- sbin/mdconfig/tests/mdconfig_test.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sbin/mdconfig/tests/mdconfig_test.sh b/sbin/mdconfig/tests/mdconfig_test.sh index 9aaf724206b1..655b7fd63b40 100755 --- a/sbin/mdconfig/tests/mdconfig_test.sh +++ b/sbin/mdconfig/tests/mdconfig_test.sh @@ -291,7 +291,7 @@ attach_size_rounddown_body() -x "mdconfig -r -u ${md#md} -s ${ms2}b" check_diskinfo "$md" 16384 2 $ss } -attach_size_rounddown() +attach_size_rounddown_cleanup() { cleanup_common } From nobody Fri Jun 28 19:25:12 2024 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 4W9lkx0667z5PBDr; Fri, 28 Jun 2024 19:25: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4W9lkw6LC9z3ymS; Fri, 28 Jun 2024 19:25:12 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1719602712; 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=xKIUdiXfTFtJdFrYxerHs3VCoLdoMAL7HG+GUACTZsY=; b=RLQef9XOgJKnFYLfDIpdLE8erU7xMca+GVrw0v9x6KkDR86ZyvnM4iw1yc+GzbFhpbyxEQ UkP/EyeEGgOB1qKTrdLx/55trAZiFupIBWKKfti11y80jRNlo7Q3daMoCaHzc1JRRxZfCr WeUqa892kkJhNQT2hFz8q0ACvylrmPqe7f8TLTHwY6aQnEVAcUD40eNn/tL5QPyacxbH/3 cVCxkCKTM/KUvm3VvUJdRXt+KfErG9cD7X9ZXpai9BCJspwpmWvM6Z6U6AOMsLxY0Uq6A6 sK3rbswC0yDcGe4AqIRbJFz7hkwM2Xl9aB3jTxd+UEF+2BComF6vObGkZRR0dA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1719602712; a=rsa-sha256; cv=none; b=EjS4zVxIfwiXJfbteixFL3Qfs0VLST8fEtL8snwNICEZstbrdsXsxGsO1bMulBcZW2kNgC GZ3xUgapmsnd0/EeSn5CmyrgvznYek2vjyr11Wnd9isBSi7Xugm9Nqrchp6SjWm2lVUA5g Wcx/675LQPwITh9DXDZH9m0kqdxsVrAv/KJsVhCmAj4ci8UgcQTjuDpMk+Chetv2RuWb2t ciGnoCoOhnpSKGymu89rJiyUPQ7S+1xXSGOkWVJion2l2X0v+Xaw5BQn+Ow453kT301OzJ /GcDkUIbI05y4LY0ZuCMWa0yL0xoTPzk/IxI5v71Ry2Lz6B+yreyljou/pricg== 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=1719602712; 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=xKIUdiXfTFtJdFrYxerHs3VCoLdoMAL7HG+GUACTZsY=; b=trkzi9pK9rCt6twhW/nR/ozOoJHJNNftA6I4ItJu45kXBBKHgqDhB/ov0FTxqv981u1Cc0 p3pfAiX5/JPm1Nl8HmuwYY933nytzeOUECNYgea9zY+L44Tufxg7M0VqIUHS/NiB14Vkg9 iOLi+Me0fX9Zm7GAkfMkYuWBR1Jkujb6zW+mr+vRVTLaASaQe1fZSuiKaYUFifrDB8rZOQ cOlqiFQrbZIruUJ3cokFB952bib8wx6X5VydpaqoqkL/2trCZbDSpDfhDBA92G3eqza8mU 7KcLr9BQL/aXE3PjwqWikbrjzB9Xmismvf8cLSRX1QNzCSOtB6mWP9ac6i1Z1A== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4W9lkw5q0kz17YK; Fri, 28 Jun 2024 19:25:12 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 45SJPCLs003968; Fri, 28 Jun 2024 19:25:12 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 45SJPCew003965; Fri, 28 Jun 2024 19:25:12 GMT (envelope-from git) Date: Fri, 28 Jun 2024 19:25:12 GMT Message-Id: <202406281925.45SJPCew003965@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Alan Somers Subject: git: 4451b1de2179 - stable/13 - ctladm.8: fix several errors in the "port" section 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 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/13 X-Git-Reftype: branch X-Git-Commit: 4451b1de2179cc554489207e6456aaf3252b1e16 Auto-Submitted: auto-generated The branch stable/13 has been updated by asomers: URL: https://cgit.FreeBSD.org/src/commit/?id=4451b1de2179cc554489207e6456aaf3252b1e16 commit 4451b1de2179cc554489207e6456aaf3252b1e16 Author: Alan Somers AuthorDate: 2024-06-05 20:13:04 +0000 Commit: Alan Somers CommitDate: 2024-06-28 19:00:41 +0000 ctladm.8: fix several errors in the "port" section * Document the "-d" option. * Add the "-c" and "-r" options to the summary. * Correct the list of required options. * Clarify that the "-t" option is only for use with "-o", "-w", and "-W" * Replace references to the nonexistent "-n" with "-p". Also, fix a few related error strings in the ctladm command. Sponsored by: Axcient Reviewed by: jhb Differential Revision: https://reviews.freebsd.org/D45503 (cherry picked from commit 60107d23d8f2c05f418c024000a31a6148d2f7de) --- usr.sbin/ctladm/ctladm.8 | 32 ++++++++++++++++++++++++++++---- usr.sbin/ctladm/ctladm.c | 7 ++++--- 2 files changed, 32 insertions(+), 7 deletions(-) diff --git a/usr.sbin/ctladm/ctladm.8 b/usr.sbin/ctladm/ctladm.8 index ba2712cb278c..4e7288dac6b6 100644 --- a/usr.sbin/ctladm/ctladm.8 +++ b/usr.sbin/ctladm/ctladm.8 @@ -35,7 +35,7 @@ .\" .\" $Id: //depot/users/kenm/FreeBSD-test2/usr.sbin/ctladm/ctladm.8#3 $ .\" -.Dd December 27, 2023 +.Dd June 5, 2024 .Dt CTLADM 8 .Os .Sh NAME @@ -162,6 +162,7 @@ .Nm .Ic port .Op Fl c +.Op Fl d Ar driver .Op Fl o Ar on|off .Op Fl w Ar wwpn .Op Fl W Ar wwnn @@ -591,6 +592,10 @@ The serial number is returned when the error is injected. Perform one of several CTL frontend port operations. Either get a list of frontend ports .Pq Fl l , +create a new frontend port +.Pq Fl c , +destroy a frontend port +.Pq Fl r , turn one or more frontends on or off .Pq Fl o Ar on|off , @@ -600,6 +605,8 @@ or World Wide Port Name .Pq Fl W Ar wwpn for a given port. One of +.Fl c , +.Fl r , .Fl l , .Fl o , or @@ -612,6 +619,18 @@ combined with enabling/disabling or listing ports. .Bl -tag -width 12n .It Fl c Create new frontend port using free pp and vp=0. +.It Fl d Ar driver +Specify the name of the frontend driver used by the +.Pq Fl c +or +.Pq Fl r +subcommands. +Valid driver names include +.Dq ioctl , +.Dq iscsi , +and +.Dq nvmf , +but more can be added by external kernel modules. .It Fl o Ar on|off Turn the specified CTL frontend ports on or off. If no port number or port type is specified, all ports are turned on or @@ -626,7 +645,12 @@ The port numbers can be found in the frontend port list. Remove port specified with .Pq Fl p Ar targ_port . .It Fl t Ar fe_type -Specify the frontend type. +Specify the frontend type used by the +.Pq Fl o , +.Pq Fl w , +and +.Pq Fl W +subcommands. Currently defined port types are .Dq fc (Fibre Channel), @@ -640,7 +664,7 @@ and .It Fl w Ar wwnn Set the World Wide Node Name for the given port. The -.Fl n +.Fl p argument must be specified, since this is only possible to implement on a single port. As a general rule, the WWNN should be the same across all ports on the @@ -648,7 +672,7 @@ system. .It Fl W Ar wwpn Set the World Wide Port Name for the given port. The -.Fl n +.Fl p argument must be specified, since this is only possible to implement on a single port. As a general rule, the WWPN must be different for every port in the system. diff --git a/usr.sbin/ctladm/ctladm.c b/usr.sbin/ctladm/ctladm.c index 1384daed74a2..1cf42aa5933b 100644 --- a/usr.sbin/ctladm/ctladm.c +++ b/usr.sbin/ctladm/ctladm.c @@ -541,7 +541,7 @@ cctl_port(int fd, int argc, char **argv, char *combinedopt) * we'll throw an error, since that only works on one port at a time. */ if ((port_type != CTL_PORT_NONE) && (targ_port != -1)) { - warnx("%s: can only specify one of -t or -n", __func__); + warnx("%s: can only specify one of -t or -p", __func__); retval = 1; goto bailout; } else if ((targ_port == -1) && (port_type == CTL_PORT_NONE)) @@ -625,7 +625,7 @@ cctl_port(int fd, int argc, char **argv, char *combinedopt) } case CCTL_PORT_MODE_SET: if (targ_port == -1) { - warnx("%s: -w and -W require -n", __func__); + warnx("%s: -w and -W require -p", __func__); retval = 1; goto bailout; } @@ -674,7 +674,8 @@ bailout: return (retval); bailout_badarg: - warnx("%s: only one of -l, -o or -w/-W may be specified", __func__); + warnx("%s: only one of -c, -r, -l, -o or -w/-W may be specified", + __func__); return (1); } From nobody Fri Jun 28 19:25:13 2024 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 4W9lky0FDfz5PB1y; Fri, 28 Jun 2024 19:25: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4W9lkx6bxQz3ymT; Fri, 28 Jun 2024 19:25:13 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1719602713; 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=5k/G33uduVnOlEJ2HoWYtSj7a+a9SHv2OB6f1kDL3oE=; b=vHy2msbQA6aKdct1zNIeVOUIi0Q0Nq6aqRb3v1szy93eGY1Q5HRRgihd2lcWT+vVwXzW7A rqKXp9X4x1SONGKFHCg9VNk9C8teWOroWFLLCaLGKghRkkGmFHss5X+To/Sd7NobY9PB3H xAdBT2Y70OsIUC1F9EWw/fQP0UGa+4Z+AIOwelbJHBW/4wUfxfVKFu07exZumbslNeGUgF CXv4fIkYJmEBJrkio0uNEKL/mfIRoeOBTk3UOD2lAjWHeZ41zwNM5U796l59wH1gvbJVCF ZK2ll7Kr5MvPt2+WHXriwikWJNAd9v/FwmSU2a4dPo9yiGmP2wzoAh2M5ombRA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1719602713; a=rsa-sha256; cv=none; b=NSpExN40wlqWWlI94hTm3aFFGeZCoh34nb4wngeIFh+0x8fd/VOIMrtC/an+mAqEdkKdBP JwuOrj2RStOsUrWOe9pmVU9ETq4h+nFtYvobJauSxQpudPnU4OK3O2CAPdjzU7Lmg1wroD El12xkZR+fa4/jK+PdFKEfJmUvIYFGRb1ZBa8Bzlzx7gJJX8Xfja06bjg9E+rZb5ARxib5 sI09VZZKhhz/JTykj9KY+fRk1Bk96X/gTwEqfzF6IreQnk37lkyDLvxcuqKE2KvBJafDLb ZZhT9IFTAkf07HXgopcRtgRMHVo1uAvRswWl7ao0Z/BnAYmkZ3iXiVR0IAlMOA== 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=1719602713; 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=5k/G33uduVnOlEJ2HoWYtSj7a+a9SHv2OB6f1kDL3oE=; b=DU7P1494mOeGgRUi3p8Nz6lhGBDt/vnveeaNRttGuVNmRLQa3Dhki3ifA41RUuE3NOVnGJ 6nWtlalD9ZtEjhZ9QTRMgcaGxWYW7hrlkNq9giwajgGH6+oZ0cCEoR3ruWdIoYlQ5Nsqkd f/9xSHpSzDuqAiU0SgXCUC7rK27f+cmUbxGZOh4vKXkiHtTA/FBdPeNLwgiVUHGzvVfyVv xrTHVAQpN/vANIb9Kc5O/O/idpMoYL7Lo1FScp3HXBX+Xb33BDTMiYx4rzk3ei85lPryVL cItYG3jk9dNxRQOkDTtMT6mo5UDBJPBp4JDxZRPhKo1/PAJkwB0dy5EV4V3JFQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4W9lkx6C9Rz17YL; Fri, 28 Jun 2024 19:25:13 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 45SJPDbi004014; Fri, 28 Jun 2024 19:25:13 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 45SJPDCJ004011; Fri, 28 Jun 2024 19:25:13 GMT (envelope-from git) Date: Fri, 28 Jun 2024 19:25:13 GMT Message-Id: <202406281925.45SJPDCJ004011@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Alan Somers Subject: git: ab9e5b86596c - stable/13 - Add some ATF tests for ctladm 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 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/13 X-Git-Reftype: branch X-Git-Commit: ab9e5b86596c998b2001b87a2a6c67f564769075 Auto-Submitted: auto-generated The branch stable/13 has been updated by asomers: URL: https://cgit.FreeBSD.org/src/commit/?id=ab9e5b86596c998b2001b87a2a6c67f564769075 commit ab9e5b86596c998b2001b87a2a6c67f564769075 Author: Alan Somers AuthorDate: 2024-06-05 20:16:25 +0000 Commit: Alan Somers CommitDate: 2024-06-28 19:04:11 +0000 Add some ATF tests for ctladm So far only "ctladm port -c" and "ctladm port -r" are covered. Sponsored by: Axcient Reviewed by: mav Pull Request: https://github.com/freebsd/freebsd-src/pull/1279 (cherry picked from commit 9747d11d91642cb9b81602d88e8aebeb388543c7) Fix mtree entry for ctladm tests Sponsored by: Axcient (cherry picked from commit 81ef0a89fcc055bdf3d0f1affbadb643412ebce9) ctladm: add a copyright header to the port test [skip ci] Reported by: markj Sponsored by: Axcient (cherry picked from commit a1608e8854da7f3b5734c2fcb85dd740733a08e6) --- etc/mtree/BSD.tests.dist | 2 + usr.sbin/ctladm/Makefile | 3 + usr.sbin/ctladm/tests/Makefile | 10 +++ usr.sbin/ctladm/tests/port.sh | 180 +++++++++++++++++++++++++++++++++++++++++ 4 files changed, 195 insertions(+) diff --git a/etc/mtree/BSD.tests.dist b/etc/mtree/BSD.tests.dist index 5d31c374166d..91e02c4ae7e5 100644 --- a/etc/mtree/BSD.tests.dist +++ b/etc/mtree/BSD.tests.dist @@ -1141,6 +1141,8 @@ usr.sbin chown .. + ctladm + .. daemon .. etcupdate diff --git a/usr.sbin/ctladm/Makefile b/usr.sbin/ctladm/Makefile index f9ddd251f96c..69dc727deaf4 100644 --- a/usr.sbin/ctladm/Makefile +++ b/usr.sbin/ctladm/Makefile @@ -23,4 +23,7 @@ MAN= ctladm.8 CFLAGS+= -DWANT_ISCSI .endif +HAS_TESTS= +SUBDIR.${MK_TESTS}+= tests + .include diff --git a/usr.sbin/ctladm/tests/Makefile b/usr.sbin/ctladm/tests/Makefile new file mode 100644 index 000000000000..73ac94d77d21 --- /dev/null +++ b/usr.sbin/ctladm/tests/Makefile @@ -0,0 +1,10 @@ + +PACKAGE= tests + +ATF_TESTS_SH= port + +# "ctladm port" does not report the name of the port just created, so we can't +# cleanup unless we assume that no other test created a port too. +TEST_METADATA+= is_exclusive="true" + +.include diff --git a/usr.sbin/ctladm/tests/port.sh b/usr.sbin/ctladm/tests/port.sh new file mode 100644 index 000000000000..110b89bd965b --- /dev/null +++ b/usr.sbin/ctladm/tests/port.sh @@ -0,0 +1,180 @@ +# SPDX-License-Identifier: BSD-2-Clause +# +# Copyright (c) 2024 Axcient +# 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, 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 DOCUMENTATION 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. + +# Things that aren't tested due to lack of kernel support: +# * Creating camsim ports +# * Creating tpc ports +# * Creating camtgt ports +# * Creating umass ports + +# TODO +# * Creating iscsi ports +# * Creating nvmf ports +# * Creating ha ports +# * Creating fc ports + +skip_if_ctld() { + if service ctld onestatus > /dev/null; then + # If ctld is running on this server, let's not interfere. + atf_skip "Cannot run this test while ctld is running" + fi +} + +cleanup() { + driver=$1 + + if [ -e after-ports ]; then + diff before-ports after-ports | awk "/$driver/ {print \$2}" | xargs -n1 ctladm port -r -d ioctl -p + fi +} + +atf_test_case create_ioctl cleanup +create_ioctl_head() +{ + atf_set "descr" "ctladm can create a new ioctl port" + atf_set "require.user" "root" +} +create_ioctl_body() +{ + skip_if_ctld + + atf_check -o save:before-ports ctladm portlist -qf ioctl + atf_check ctladm port -c -d "ioctl" + atf_check -o save:after-ports ctladm portlist -qf ioctl + if test `wc -l before-ports | cut -w -f2` -ge `wc -l after-ports | cut -w -f2`; then + atf_fail "Did not create a new ioctl port" + fi +} +create_ioctl_cleanup() +{ + cleanup ioctl +} + +atf_test_case create_ioctl_options cleanup +create_ioctl_options_head() +{ + atf_set "descr" "ctladm can set options when creating a new ioctl port" + atf_set "require.user" "root" +} +create_ioctl_options_body() +{ + skip_if_ctld + + atf_check -o save:before-ports ctladm portlist -qf ioctl + atf_check ctladm port -c -d "ioctl" -O pp=101 -O vp=102 + atf_check -o save:after-ports ctladm portlist -qf ioctl + if test `wc -l before-ports | cut -w -f2` -ge `wc -l after-ports | cut -w -f2`; then + atf_fail "Did not create a new ioctl port" + fi + if ! egrep -q '101[[:space:]]+102' after-ports; then + ctladm portlist + atf_fail "Did not create the port with the specified options" + fi +} +create_ioctl_options_cleanup() +{ + cleanup ioctl +} + + +atf_test_case disable_ioctl cleanup +disable_ioctl_head() +{ + atf_set "descr" "ctladm can disable an ioctl port" + atf_set "require.user" "root" +} +disable_ioctl_body() +{ + skip_if_ctld + + atf_check -o save:before-ports ctladm portlist -qf ioctl + atf_check ctladm port -c -d "ioctl" + atf_check -o save:after-ports ctladm portlist -qf ioctl + if test `wc -l before-ports | cut -w -f2` -ge `wc -l after-ports | cut -w -f2`; then + atf_fail "Did not create a new ioctl port" + fi + portnum=`diff before-ports after-ports | awk '/ioctl/ {print $2}'`; + atf_check -o ignore ctladm port -o off -p $portnum + atf_check -o match:"^$portnum *NO" ctladm portlist -qf ioctl +} +disable_ioctl_cleanup() +{ + cleanup ioctl +} + +atf_test_case enable_ioctl cleanup +enable_ioctl_head() +{ + atf_set "descr" "ctladm can enable an ioctl port" + atf_set "require.user" "root" +} +enable_ioctl_body() +{ + skip_if_ctld + + atf_check -o save:before-ports ctladm portlist -qf ioctl + atf_check ctladm port -c -d "ioctl" + atf_check -o save:after-ports ctladm portlist -qf ioctl + if test `wc -l before-ports | cut -w -f2` -ge `wc -l after-ports | cut -w -f2`; then + atf_fail "Did not create a new ioctl port" + fi + portnum=`diff before-ports after-ports | awk '/ioctl/ {print $2}'`; + atf_check -o ignore ctladm port -o off -p $portnum + atf_check -o ignore ctladm port -o on -p $portnum + atf_check -o match:"^$portnum *YES" ctladm portlist -qf ioctl +} +enable_ioctl_cleanup() +{ + cleanup ioctl +} + +atf_test_case remove_ioctl +remove_ioctl_head() +{ + atf_set "descr" "ctladm can remove an ioctl port" + atf_set "require.user" "root" +} +remove_ioctl_body() +{ + skip_if_ctld + + atf_check -o save:before-ports ctladm portlist -qf ioctl + atf_check ctladm port -c -d "ioctl" + atf_check -o save:after-ports ctladm portlist -qf ioctl + if test `wc -l before-ports | cut -w -f2` -ge `wc -l after-ports | cut -w -f2`; then + atf_fail "Did not create a new ioctl port" + fi + portnum=`diff before-ports after-ports | awk '/ioctl/ {print $2}'`; + atf_check ctladm port -r -d ioctl -p $portnum +} + +atf_init_test_cases() +{ + atf_add_test_case create_ioctl + atf_add_test_case create_ioctl_options + atf_add_test_case disable_ioctl + atf_add_test_case enable_ioctl + atf_add_test_case remove_ioctl +} From nobody Fri Jun 28 19:36:12 2024 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 4W9lzc1vZNz5PCDC; Fri, 28 Jun 2024 19:36: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4W9lzc1HYFz40tc; Fri, 28 Jun 2024 19:36:12 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1719603372; 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=zF1gPpoa30emELgxB6crDYDsq4GjM26TAZtX6lqAK0I=; b=XhrR8cgsweKZDi3qkqytiu8kSsdC0ns68O4K65nXy+fAENY9rlWtcpwlpTvH+80Vciec5A Bl0iPvBLGIn35Jbx48eEOxoU3Pxv/khSfgh29py8GTKcb3sC+aX2xXKJU16TqZfHGpLAZY a0N6uDDDz9QvUGhRwli/cOwzOyatAEMei3/w5hj/nEmTNKCYz3gGtyJ890Ka3hqci1i3Zy R4g1ljhsmADEtFv7400yajN7redJ9sZ05pfJ3RsO9zEDugkXhv2mHZAnUYJy2nH9hQcsbg /lNQLkk9AA5m1HFEaSr1lwtr6Oeq3uHCwbSWi73l2qkGAGaTU37VMm0VeW8q+w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1719603372; a=rsa-sha256; cv=none; b=D4jwyKEwVloKY4LR8JF/Gcut3SfeA615MBSCrTrCYP4PUh7M+4JeY5Aj9s9u920bsZ05Ng BMQ7CqFPIw5bsMCfDyXN8gEcWVhExTbJz6xCEM+Sje+k/J+GP0IUC91W1cC4TrLBRUUSlY 8VKpbNlD/pnT/ZKemBiy797uNaQ1MzrmzyEB1CiRuneIie3jg5zdp/n32nCo+kDp3WgLXi MYuvMvQRrCPUI29jccaVPKZ2fFuBbr5AuEpFLLe43YO8gsNkCHJUow3iz7yTtPIoApe1nD AX+z2kVauJxqqJ80jPIcH4cv0HTi8y0aloB0sacRqirKSG/rzGjDAch/6dy33g== 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=1719603372; 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=zF1gPpoa30emELgxB6crDYDsq4GjM26TAZtX6lqAK0I=; b=Awrg2Igk+TGgGU55uVKTerzaVlY7OceDmy4iDWKHvBs1JAL7EUwGsEv8fG29qAWeHUChaI iNDe5iVZ02ZKQpHol/ZtH6rCn8zf8GTGb/abqvDb2Bog3B/WvcEc/dxYAf0Qo5jnV8x+Xs 7KVUUblTCO9YH9RF0kWm+TmdkGZVVwTUqSgSckPM9JVo9dPmLhJGq1/O2ODOPM7BwqmRPe 7BuR3Tx/eh6cH+Q846JJwkG1o+Zh8DW6/7NnmGzwUT3LHTlNSWEHeIZW06vrnt9pLetEbe l8foDR7S8bFVRzrlG/b36y1vNQz4tWf3FI6fOaHPxpMJtwiPQMzcjHeMvz+O+Q== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4W9lzc0twMz17Z6; Fri, 28 Jun 2024 19:36:12 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 45SJaCtT021052; Fri, 28 Jun 2024 19:36:12 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 45SJaCdQ021049; Fri, 28 Jun 2024 19:36:12 GMT (envelope-from git) Date: Fri, 28 Jun 2024 19:36:12 GMT Message-Id: <202406281936.45SJaCdQ021049@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Alan Somers Subject: git: 1dc90424b26f - stable/13 - ctladm: print port number with a succesful "port -c" 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 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/13 X-Git-Reftype: branch X-Git-Commit: 1dc90424b26f80e4a9475a722f46e754fe7aba76 Auto-Submitted: auto-generated The branch stable/13 has been updated by asomers: URL: https://cgit.FreeBSD.org/src/commit/?id=1dc90424b26f80e4a9475a722f46e754fe7aba76 commit 1dc90424b26f80e4a9475a722f46e754fe7aba76 Author: Alan Somers AuthorDate: 2024-06-05 23:54:46 +0000 Commit: Alan Somers CommitDate: 2024-06-28 19:25:54 +0000 ctladm: print port number with a succesful "port -c" command Make "ctladm port -c" print the port number of the newly successful port. This way it won't have to be guessed by a subsequent "ctladm portlist" command. That means it's safe to use it concurrently with other ctladm processes. In particular, this allows the tests to be run in parallel. Sponsored by: Axcient Reviewed by: mav Pull Request: https://github.com/freebsd/freebsd-src/pull/1279 (cherry picked from commit 591de7534fb3acb2e6eef94a1e5e92000d2cf83d) --- usr.sbin/ctladm/ctladm.c | 18 +++++++++++ usr.sbin/ctladm/tests/Makefile | 4 --- usr.sbin/ctladm/tests/port.sh | 70 ++++++++++++++++++++---------------------- 3 files changed, 52 insertions(+), 40 deletions(-) diff --git a/usr.sbin/ctladm/ctladm.c b/usr.sbin/ctladm/ctladm.c index 1cf42aa5933b..6af25ed28925 100644 --- a/usr.sbin/ctladm/ctladm.c +++ b/usr.sbin/ctladm/ctladm.c @@ -392,7 +392,9 @@ static struct ctladm_opts cctl_fe_table[] = { static int cctl_port(int fd, int argc, char **argv, char *combinedopt) { + char result_buf[1024]; int c; + uint64_t created_port = -1; int32_t targ_port = -1; int retval = 0; int wwnn_set = 0, wwpn_set = 0; @@ -582,6 +584,8 @@ cctl_port(int fd, int argc, char **argv, char *combinedopt) case CCTL_PORT_MODE_CREATE: { bzero(&req, sizeof(req)); strlcpy(req.driver, driver, sizeof(req.driver)); + req.result = result_buf; + req.result_len = sizeof(result_buf); if (port_mode == CCTL_PORT_MODE_REMOVE) { req.reqtype = CTL_REQ_REMOVE; @@ -614,6 +618,20 @@ cctl_port(int fd, int argc, char **argv, char *combinedopt) warnx("warning: %s", req.error_str); break; case CTL_LUN_OK: + if (port_mode == CCTL_PORT_MODE_CREATE) { + req.result_nvl = nvlist_unpack(result_buf, req.result_len, 0); + if (req.result_nvl == NULL) { + warnx("error unpacking result nvlist"); + break; + } + created_port = nvlist_get_number(req.result_nvl, "port_id"); + printf("Port created successfully\n" + "frontend: %s\n" + "port: %ju\n", driver, + (uintmax_t) created_port); + nvlist_destroy(req.result_nvl); + } else + printf("Port destroyed successfully\n"); break; default: warnx("unknown status: %d", req.status); diff --git a/usr.sbin/ctladm/tests/Makefile b/usr.sbin/ctladm/tests/Makefile index 73ac94d77d21..825e38e6c6e3 100644 --- a/usr.sbin/ctladm/tests/Makefile +++ b/usr.sbin/ctladm/tests/Makefile @@ -3,8 +3,4 @@ PACKAGE= tests ATF_TESTS_SH= port -# "ctladm port" does not report the name of the port just created, so we can't -# cleanup unless we assume that no other test created a port too. -TEST_METADATA+= is_exclusive="true" - .include diff --git a/usr.sbin/ctladm/tests/port.sh b/usr.sbin/ctladm/tests/port.sh index 110b89bd965b..782a8ee5b6c1 100644 --- a/usr.sbin/ctladm/tests/port.sh +++ b/usr.sbin/ctladm/tests/port.sh @@ -45,8 +45,9 @@ skip_if_ctld() { cleanup() { driver=$1 - if [ -e after-ports ]; then - diff before-ports after-ports | awk "/$driver/ {print \$2}" | xargs -n1 ctladm port -r -d ioctl -p + if [ -e port-create.txt ]; then + portnum=`awk '/port:/ {print $2}' port-create.txt` + ctladm port -r -d $driver -p $portnum fi } @@ -60,12 +61,13 @@ create_ioctl_body() { skip_if_ctld - atf_check -o save:before-ports ctladm portlist -qf ioctl - atf_check ctladm port -c -d "ioctl" - atf_check -o save:after-ports ctladm portlist -qf ioctl - if test `wc -l before-ports | cut -w -f2` -ge `wc -l after-ports | cut -w -f2`; then - atf_fail "Did not create a new ioctl port" - fi + atf_check -o save:port-create.txt ctladm port -c -d "ioctl" + atf_check egrep -q "Port created successfully" port-create.txt + atf_check egrep -q "frontend: *ioctl" port-create.txt + atf_check egrep -q "port: *[0-9]+" port-create.txt + portnum=`awk '/port:/ {print $2}' port-create.txt` + atf_check -o save:portlist.txt ctladm portlist -qf ioctl + atf_check egrep -q "$portnum *YES *ioctl *ioctl" portlist.txt } create_ioctl_cleanup() { @@ -82,13 +84,13 @@ create_ioctl_options_body() { skip_if_ctld - atf_check -o save:before-ports ctladm portlist -qf ioctl - atf_check ctladm port -c -d "ioctl" -O pp=101 -O vp=102 - atf_check -o save:after-ports ctladm portlist -qf ioctl - if test `wc -l before-ports | cut -w -f2` -ge `wc -l after-ports | cut -w -f2`; then - atf_fail "Did not create a new ioctl port" - fi - if ! egrep -q '101[[:space:]]+102' after-ports; then + atf_check -o save:port-create.txt ctladm port -c -d "ioctl" -O pp=101 -O vp=102 + atf_check egrep -q "Port created successfully" port-create.txt + atf_check egrep -q "frontend: *ioctl" port-create.txt + atf_check egrep -q "port: *[0-9]+" port-create.txt + portnum=`awk '/port:/ {print $2}' port-create.txt` + atf_check -o save:portlist.txt ctladm portlist -qf ioctl + if ! egrep -q '101[[:space:]]+102' portlist.txt; then ctladm portlist atf_fail "Did not create the port with the specified options" fi @@ -109,13 +111,9 @@ disable_ioctl_body() { skip_if_ctld - atf_check -o save:before-ports ctladm portlist -qf ioctl - atf_check ctladm port -c -d "ioctl" - atf_check -o save:after-ports ctladm portlist -qf ioctl - if test `wc -l before-ports | cut -w -f2` -ge `wc -l after-ports | cut -w -f2`; then - atf_fail "Did not create a new ioctl port" - fi - portnum=`diff before-ports after-ports | awk '/ioctl/ {print $2}'`; + atf_check -o save:port-create.txt ctladm port -c -d "ioctl" + portnum=`awk '/port:/ {print $2}' port-create.txt` + atf_check -o save:portlist.txt ctladm portlist -qf ioctl atf_check -o ignore ctladm port -o off -p $portnum atf_check -o match:"^$portnum *NO" ctladm portlist -qf ioctl } @@ -134,13 +132,9 @@ enable_ioctl_body() { skip_if_ctld - atf_check -o save:before-ports ctladm portlist -qf ioctl - atf_check ctladm port -c -d "ioctl" - atf_check -o save:after-ports ctladm portlist -qf ioctl - if test `wc -l before-ports | cut -w -f2` -ge `wc -l after-ports | cut -w -f2`; then - atf_fail "Did not create a new ioctl port" - fi - portnum=`diff before-ports after-ports | awk '/ioctl/ {print $2}'`; + atf_check -o save:port-create.txt ctladm port -c -d "ioctl" + portnum=`awk '/port:/ {print $2}' port-create.txt` + atf_check -o save:portlist.txt ctladm portlist -qf ioctl atf_check -o ignore ctladm port -o off -p $portnum atf_check -o ignore ctladm port -o on -p $portnum atf_check -o match:"^$portnum *YES" ctladm portlist -qf ioctl @@ -160,14 +154,18 @@ remove_ioctl_body() { skip_if_ctld - atf_check -o save:before-ports ctladm portlist -qf ioctl - atf_check ctladm port -c -d "ioctl" - atf_check -o save:after-ports ctladm portlist -qf ioctl - if test `wc -l before-ports | cut -w -f2` -ge `wc -l after-ports | cut -w -f2`; then - atf_fail "Did not create a new ioctl port" + # Specify exact pp and vp to make the post-removal portlist check + # unambiguous + atf_check -o save:port-create.txt ctladm port -c -d "ioctl" -O pp=10001 -O vp=10002 + portnum=`awk '/port:/ {print $2}' port-create.txt` + atf_check -o save:portlist.txt ctladm portlist -qf ioctl + atf_check -o inline:"Port destroyed successfully\n" ctladm port -r -d ioctl -p $portnum + # Check that the port was removed. A new port may have been added with + # the same ID, so match against the pp and vp numbers, too. + if ctladm portlist -qf ioctl | egrep -q "^${portnum} .*10001 *10002"; then + ctladm portlist -qf ioctl + atf_fail "port was not removed" fi - portnum=`diff before-ports after-ports | awk '/ioctl/ {print $2}'`; - atf_check ctladm port -r -d ioctl -p $portnum } atf_init_test_cases() From nobody Fri Jun 28 19:36:13 2024 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 4W9lzd3pJFz5PCDD; Fri, 28 Jun 2024 19:36: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4W9lzd2Lpgz40qm; Fri, 28 Jun 2024 19:36:13 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1719603373; 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=sKZzyibGREguP38hzUnfFU9ZvxyiSzDeQHuvxGssERg=; b=Mo4qTLPz9dw44FRyPFLeK8U4hdgPlUWt6SQrvkJzShov4HTC9zj5p1QLRUcpKk9ewkB4kv dbGMpdLXXwQRSCAY8/ojwjc0eVISXrQYgRCPTmO6FWvRnt8uHPRN50z7HuUoOVvudEgP8Y CWgK5YHU/O5XZ4mtKFFyNPYIArNmPdJl9rtcUMQEC3+olMqK31D/7V21rJjJzE+e0/E4QK 7H9CnZPtJ2YppIXS+Cq+EgOrla+mT8BiP6r5fr1J1axvFuwsCUv1jxmUL10JwVdRPfUCgr N/vejGahKl9AUu0Q/8LFNuxv6UnKiVPNE18sCNCZXu0ReTYlc/uTQURFUB0PYw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1719603373; a=rsa-sha256; cv=none; b=A0TNqKLQXbokT9Lhi/rEiRill6Bz66NOMFl/h0kBv4jsOjjQDYAzkQZSB8ip+8O2HG6q5M lKviMmRI4sL5aWKlYDluhqZj/ehR/Jn070u5GcYxc8gz8utxcx+nKitxWM1RgYwBKYnh8x TNFrccpbEeTu+Igy133yvmuMpcKWgsnuak+ecax9bN4S7KS4LQtc7S6An8ZUNl3/bpHuG0 5RCZ6eH84tdw7+TnbcBPQpGeNHYY5UkiJO+GH09C3oKQvRMAqPZwKa5ULm0dwQ+I5Bx9p+ e8FfWbMYsR5dHuCaYtt9eR0Pp9os6WA9Jg8rg2cWiMUlDDhm8HcfJyYNo3IeCQ== 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=1719603373; 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=sKZzyibGREguP38hzUnfFU9ZvxyiSzDeQHuvxGssERg=; b=dl/JineO9qrixt4/e+ei+g8gJucBESjrJSPRhGZ1JbmoAk+VW547XV8KQzMeK0wToVbdX1 PIjXo7Xo1uSuGGJAV0sU9axPiz9eNQkJM1bIHby+bQY1ywl62cVdbSfxurOR/BmzarsMXO AnPj1Iln6t/+g1K0yFgma9N8BDpqY/WV7Vfjhq9kspugPlekbhDjEar1k2aSfUmQn4b1Ol izTqhIKD67DefRPt4ZvK9ftC/fpHy+2b7lCvCk/H9wt8vuRdyCPuU/tVHqHKb3Cps8ahBz 5Na51uzdZRAhY2URe5cCWNiMQVmqiIBwbJ7xtxzVOekEwxBUD5GpaZ6L1ySpAA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4W9lzd1yKhz175D; Fri, 28 Jun 2024 19:36:13 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 45SJaDx3021106; Fri, 28 Jun 2024 19:36:13 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 45SJaDML021103; Fri, 28 Jun 2024 19:36:13 GMT (envelope-from git) Date: Fri, 28 Jun 2024 19:36:13 GMT Message-Id: <202406281936.45SJaDML021103@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Alan Somers Subject: git: 259f94f8ab4f - stable/13 - ctladm: better documentation for adding and removing cfiscsi ports 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 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/13 X-Git-Reftype: branch X-Git-Commit: 259f94f8ab4fefbf5531c42d06e5079285ae3b7c Auto-Submitted: auto-generated The branch stable/13 has been updated by asomers: URL: https://cgit.FreeBSD.org/src/commit/?id=259f94f8ab4fefbf5531c42d06e5079285ae3b7c commit 259f94f8ab4fefbf5531c42d06e5079285ae3b7c Author: Alan Somers AuthorDate: 2024-06-06 17:19:19 +0000 Commit: Alan Somers CommitDate: 2024-06-28 19:26:44 +0000 ctladm: better documentation for adding and removing cfiscsi ports Sponsored by: Axcient Reviewed by: mav Pull Request: https://github.com/freebsd/freebsd-src/pull/1279 (cherry picked from commit afecc74cd7158da8e89c26c5267bc715c2417fe7) --- sys/cam/ctl/ctl_frontend_iscsi.c | 27 ++++++-- usr.sbin/ctladm/ctladm.8 | 32 +++++++-- usr.sbin/ctladm/tests/port.sh | 146 ++++++++++++++++++++++++++++++++++++++- 3 files changed, 191 insertions(+), 14 deletions(-) diff --git a/sys/cam/ctl/ctl_frontend_iscsi.c b/sys/cam/ctl/ctl_frontend_iscsi.c index 253ffbe7dbdc..03d5c91f7bf5 100644 --- a/sys/cam/ctl/ctl_frontend_iscsi.c +++ b/sys/cam/ctl/ctl_frontend_iscsi.c @@ -2150,17 +2150,24 @@ cfiscsi_ioctl_port_create(struct ctl_req *req) uint16_t tag; target = dnvlist_get_string(req->args_nvl, "cfiscsi_target", NULL); - alias = dnvlist_get_string(req->args_nvl, "cfiscsi_target_alias", NULL); + if (target == NULL) { + req->status = CTL_LUN_ERROR; + snprintf(req->error_str, sizeof(req->error_str), + "Missing required argument: cfiscsi_target"); + return; + } + val = dnvlist_get_string(req->args_nvl, "cfiscsi_portal_group_tag", NULL); - - if (target == NULL || val == NULL) { + if (val == NULL) { req->status = CTL_LUN_ERROR; snprintf(req->error_str, sizeof(req->error_str), - "Missing required argument"); + "Missing required argument: cfiscsi_portal_group_tag"); return; } + alias = dnvlist_get_string(req->args_nvl, "cfiscsi_target_alias", NULL); + tag = strtoul(val, NULL, 0); ct = cfiscsi_target_find_or_create(&cfiscsi_softc, target, alias, tag); if (ct == NULL) { @@ -2251,13 +2258,19 @@ cfiscsi_ioctl_port_remove(struct ctl_req *req) uint16_t tag; target = dnvlist_get_string(req->args_nvl, "cfiscsi_target", NULL); + if (target == NULL) { + req->status = CTL_LUN_ERROR; + snprintf(req->error_str, sizeof(req->error_str), + "Missing required argument: cfiscsi_target"); + return; + } + val = dnvlist_get_string(req->args_nvl, "cfiscsi_portal_group_tag", NULL); - - if (target == NULL || val == NULL) { + if (val == NULL) { req->status = CTL_LUN_ERROR; snprintf(req->error_str, sizeof(req->error_str), - "Missing required argument"); + "Missing required argument: cfiscsi_portal_group_tag"); return; } diff --git a/usr.sbin/ctladm/ctladm.8 b/usr.sbin/ctladm/ctladm.8 index 4e7288dac6b6..a7eb1d58cbbf 100644 --- a/usr.sbin/ctladm/ctladm.8 +++ b/usr.sbin/ctladm/ctladm.8 @@ -35,7 +35,7 @@ .\" .\" $Id: //depot/users/kenm/FreeBSD-test2/usr.sbin/ctladm/ctladm.8#3 $ .\" -.Dd June 5, 2024 +.Dd June 6, 2024 .Dt CTLADM 8 .Os .Sh NAME @@ -166,7 +166,7 @@ .Op Fl o Ar on|off .Op Fl w Ar wwpn .Op Fl W Ar wwnn -.Op Fl O Ar pp|vp +.Op Fl O Ar name=value .Op Fl p Ar targ_port .Op Fl r .Op Fl t Ar fe_type @@ -618,7 +618,7 @@ The WWNN and WWPN may both be specified at the same time, but cannot be combined with enabling/disabling or listing ports. .Bl -tag -width 12n .It Fl c -Create new frontend port using free pp and vp=0. +Create new frontend port. .It Fl d Ar driver Specify the name of the frontend driver used by the .Pq Fl c @@ -637,7 +637,31 @@ If no port number or port type is specified, all ports are turned on or off. .It Fl O Ar pp|vp Specify generic options on the ioctl frontend port. -At present, only pp and vp port numbers can be set. +The list of recognized options is driver-dependent. +The +.Dq ioctl +driver recognizes +.Dq pp +and +.Dq vp . +The +.Dq iscsi +driver recongizes +.Dq cfiscsi_portal_group_tag , +.Dq cfiscsi_target , +and +.Dq cfiscsi_target_alias . +The +.Dq nvmf +driver recognizes +.Dq subnqn , +.Dq portid , +.Dq max_io_qsize , +.Dq enable_timeout , +.Dq ioccsz , +.Dq nn , +and +.Dq serial . .It Fl p Ar targ_port Specify the frontend port number. The port numbers can be found in the frontend port list. diff --git a/usr.sbin/ctladm/tests/port.sh b/usr.sbin/ctladm/tests/port.sh index 782a8ee5b6c1..161759ec14d0 100644 --- a/usr.sbin/ctladm/tests/port.sh +++ b/usr.sbin/ctladm/tests/port.sh @@ -30,11 +30,20 @@ # * Creating umass ports # TODO -# * Creating iscsi ports # * Creating nvmf ports # * Creating ha ports # * Creating fc ports +# The PGTAG can be any 16-bit number. The only constraint is that each +# PGTAG,TARGET pair must be globally unique. +PGTAG=30257 + +load_cfiscsi() { + if ! kldstat -q -m cfiscsi; then + kldload cfiscsi || atf_skip "could not load cfscsi kernel mod" + fi +} + skip_if_ctld() { if service ctld onestatus > /dev/null; then # If ctld is running on this server, let's not interfere. @@ -46,8 +55,18 @@ cleanup() { driver=$1 if [ -e port-create.txt ]; then - portnum=`awk '/port:/ {print $2}' port-create.txt` - ctladm port -r -d $driver -p $portnum + case "$driver" in + "ioctl") + PORTNUM=`awk '/port:/ {print $2}' port-create.txt` + ctladm port -r -d $driver -p $PORTNUM + ;; + "iscsi") + TARGET=`awk '/target:/ {print $2}' port-create.txt` + # PORTNUM is ignored, but must be set + PORTNUM=9999 + ctladm port -r -d $driver -p "$PORTNUM" -O cfiscsi_portal_group_tag=$PGTAG -O cfiscsi_target=$TARGET + ;; + esac fi } @@ -74,6 +93,75 @@ create_ioctl_cleanup() cleanup ioctl } +atf_test_case create_iscsi cleanup +create_iscsi_head() +{ + atf_set "descr" "ctladm can create a new iscsi port" + atf_set "require.user" "root" +} +create_iscsi_body() +{ + skip_if_ctld + load_cfiscsi + + TARGET=iqn.2018-10.myhost.create_iscsi + atf_check -o save:port-create.txt ctladm port -c -d "iscsi" -O cfiscsi_portal_group_tag=$PGTAG -O cfiscsi_target="$TARGET" + echo "target: $TARGET" >> port-create.txt + atf_check egrep -q "Port created successfully" port-create.txt + atf_check egrep -q "frontend: *iscsi" port-create.txt + atf_check egrep -q "port: *[0-9]+" port-create.txt + atf_check -o save:portlist.txt ctladm portlist -qf iscsi + # Unlike the ioctl driver, the iscsi driver creates ports in a disabled + # state, so the port's lunmap may be set before enabling it. + atf_check egrep -q "$portnum *NO *iscsi *iscsi.*$TARGET" portlist.txt +} +create_iscsi_cleanup() +{ + cleanup iscsi +} + +atf_test_case create_iscsi_alias cleanup +create_iscsi_alias_head() +{ + atf_set "descr" "ctladm can create a new iscsi port with a target alias" + atf_set "require.user" "root" +} +create_iscsi_alias_body() +{ + skip_if_ctld + load_cfiscsi + + TARGET=iqn.2018-10.myhost.create_iscsi_alias + ALIAS="foobar" + atf_check -o save:port-create.txt ctladm port -c -d "iscsi" -O cfiscsi_portal_group_tag=$PGTAG -O cfiscsi_target="$TARGET" -O cfiscsi_target_alias="$ALIAS" + echo "target: $TARGET" >> port-create.txt + atf_check egrep -q "Port created successfully" port-create.txt + atf_check egrep -q "frontend: *iscsi" port-create.txt + atf_check egrep -q "port: *[0-9]+" port-create.txt + atf_check -o save:portlist.txt ctladm portlist -qvf iscsi + atf_check egrep -q "cfiscsi_target_alias=$ALIAS" portlist.txt +} +create_iscsi_alias_cleanup() +{ + cleanup iscsi +} + +atf_test_case create_iscsi_without_required_args +create_iscsi_without_required_args_head() +{ + atf_set "descr" "ctladm will gracefully fail to create an iSCSI target if required arguments are missing" + atf_set "require.user" "root" +} +create_iscsi_without_required_args_body() +{ + skip_if_ctld + load_cfiscsi + + TARGET=iqn.2018-10.myhost.create_iscsi + atf_check -s exit:1 -e match:"Missing required argument: cfiscsi_target" ctladm port -c -d "iscsi" -O cfiscsi_portal_group_tag=$PGTAG + atf_check -s exit:1 -e match:"Missing required argument: cfiscsi_portal_group_tag" ctladm port -c -d "iscsi" -O cfiscsi_target=$TARGET +} + atf_test_case create_ioctl_options cleanup create_ioctl_options_head() { @@ -168,11 +256,63 @@ remove_ioctl_body() fi } +atf_test_case remove_iscsi +remove_iscsi_head() +{ + atf_set "descr" "ctladm can remove an iscsi port" + atf_set "require.user" "root" +} +remove_iscsi_body() +{ + skip_if_ctld + load_cfiscsi + + TARGET=iqn.2018-10.myhost.remove_iscsi + atf_check -o save:port-create.txt ctladm port -c -d "iscsi" -O cfiscsi_portal_group_tag=$PGTAG -O cfiscsi_target="$TARGET" + portnum=`awk '/port:/ {print $2}' port-create.txt` + atf_check -o save:portlist.txt ctladm portlist -qf iscsi + atf_check -o inline:"Port destroyed successfully\n" ctladm port -r -d iscsi -p 9999 -O cfiscsi_portal_group_tag=$PGTAG -O cfiscsi_target="$TARGET" + # Check that the port was removed. A new port may have been added with + # the same ID, so match against the target and tag, too. + PGTAGHEX=0x7631 # PGTAG in hex + if ctladm portlist -qf iscsi | egrep -q "^${portnum} .*$PGTAG +[0-9]+ +$TARGET,t,$PGTAGHEX"; then + ctladm portlist -qf iscsi + atf_fail "port was not removed" + fi +} + +atf_test_case remove_iscsi_without_required_args cleanup +remove_iscsi_without_required_args_head() +{ + atf_set "descr" "ctladm will gracefully fail to remove an iSCSI target if required arguments are missing" + atf_set "require.user" "root" +} +remove_iscsi_without_required_args_body() +{ + skip_if_ctld + load_cfiscsi + + TARGET=iqn.2018-10.myhost.remove_iscsi_without_required_args + atf_check -o save:port-create.txt ctladm port -c -d "iscsi" -O cfiscsi_portal_group_tag=$PGTAG -O cfiscsi_target="$TARGET" + echo "target: $TARGET" >> port-create.txt + atf_check -s exit:1 -e match:"Missing required argument: cfiscsi_portal_group_tag" ctladm port -r -d iscsi -p 9999 -O cfiscsi_target="$TARGET" + atf_check -s exit:1 -e match:"Missing required argument: cfiscsi_target" ctladm port -r -d iscsi -p 9999 -O cfiscsi_portal_group_tag=$PGTAG +} +remove_iscsi_without_required_args_cleanup() +{ + cleanup iscsi +} + atf_init_test_cases() { atf_add_test_case create_ioctl + atf_add_test_case create_iscsi + atf_add_test_case create_iscsi_without_required_args + atf_add_test_case create_iscsi_alias atf_add_test_case create_ioctl_options atf_add_test_case disable_ioctl atf_add_test_case enable_ioctl atf_add_test_case remove_ioctl + atf_add_test_case remove_iscsi + atf_add_test_case remove_iscsi_without_required_args } From nobody Fri Jun 28 19:36:14 2024 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 4W9lzg0plkz5PBtB; Fri, 28 Jun 2024 19:36: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4W9lzf3fGQz419P; Fri, 28 Jun 2024 19:36:14 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1719603374; 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=cFsAP003z/0P2lR+aXYATsrzNbn4VbOQwNZv6iGgl7U=; b=UlaU+adzoRck8FmWS1uarjKowDHKKOn/GHgAGjHgkNT+l1l7YyN8HInOCqP+/+ZJwXTtvK Aay79XoLRRya2tPzRJEH25LUU3tTRDik5lMbB8Z+U8z2DhDcs/ea1lNwmPf2d/L0C8+K+4 nrnWxmaY99wI/Wjxe4+daCTqE3vjyQgUJPiFediN97kcOcIzvoksVmaeX3NYaN5+lHdlC/ VohHUMSiMDc/2x9/nuDKMAeMdoNmEBK+NQUQjBhR3ZQ/HenzTCCrRdmcBdCtl+8qFhANM4 jaQoCC+ix91BNAKoLdocrLGIextguX79Q4ILm7L8eE5nNEggLyNGRIJMoHM00Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1719603374; a=rsa-sha256; cv=none; b=XR8ducfjQ7wPYk9aAdLmqN4tCT9KyBe8d5p5BfRZ50CZZi7HuR9ThLJ3zedJr544gjDxVq H7WOLNwaqtf8rhavkRaeBRDgHu42a+rT7iFII4H7Nf1AHhnJel2Et2RkotqlmdjH7TkSGt jG9VbSXU3rRz+lqo+X+eB6P2/t/P/7MXkt2loBokJGEVdb2LQKknSIEwq87X7neBA4I5Gq WZWRcWPzN6Glf4XsIm7+0xyb/mTKEzRYe9Dyk22g7q9NYIjJ06JIG5dwyWP9ZlBrTfzoC4 eD9P0Dkhv9YUb6zZt2y8RL/R70W/gp6a1j0NzRxm4SH6ovQu1/RIyxhVJg8cyg== 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=1719603374; 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=cFsAP003z/0P2lR+aXYATsrzNbn4VbOQwNZv6iGgl7U=; b=o6XOVVGw3cW76xzjZQyeJdmeky5JEZiLtOUBn2B4odamuZoJ+/5Noaw1zio8GJEBvtZ6DH 8LsHwePG/zdZGqPhwFdFVOqryA+w0TppYW+To/RMfSYhg3xpvJlnmHghczuC/YbQPI8VRV Za9GBZa9cMNvg62ebRPSVjiARiE0anYGeHewUXQ9atHjN46NhLBsvaE6Glr+7pDaS8bdnc pLh0unwMUBtQNKJgs53a3Aggqvu2AwBkM/2PR1sygn+LuywUgQZ8uARzLkGPuDDXeFHn7T CqgYNQ3mkeWppzOzmaf5jbUHHUmJKo/aoQYRQJm3CzS4OPB9r2kMUf10355f1w== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4W9lzf31dPz175F; Fri, 28 Jun 2024 19:36:14 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 45SJaEAT021167; Fri, 28 Jun 2024 19:36:14 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 45SJaErC021164; Fri, 28 Jun 2024 19:36:14 GMT (envelope-from git) Date: Fri, 28 Jun 2024 19:36:14 GMT Message-Id: <202406281936.45SJaErC021164@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Alan Somers Subject: git: 7a8bab3d946c - stable/13 - ctladm: don't require the use of "-p" with "port -r" 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 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/13 X-Git-Reftype: branch X-Git-Commit: 7a8bab3d946c3c5408353bd5475eb6c8c9dc1d76 Auto-Submitted: auto-generated The branch stable/13 has been updated by asomers: URL: https://cgit.FreeBSD.org/src/commit/?id=7a8bab3d946c3c5408353bd5475eb6c8c9dc1d76 commit 7a8bab3d946c3c5408353bd5475eb6c8c9dc1d76 Author: Alan Somers AuthorDate: 2024-06-06 19:14:43 +0000 Commit: Alan Somers CommitDate: 2024-06-28 19:34:10 +0000 ctladm: don't require the use of "-p" with "port -r" When removing a port, the ioctl frontend requires the "-p" argument. But other frontends, like cfiscsi, do not. So don't require that argument in the ctladm command. The frontend driver will report an error if any required argument is missing. Sponsored by: Axcient Reviewed by: mav Pull Request: https://github.com/freebsd/freebsd-src/pull/1279 (cherry picked from commit edbd489d09babebdc6c03924a912013be584c409) --- sys/cam/ctl/ctl_frontend_ioctl.c | 2 +- usr.sbin/ctladm/ctladm.8 | 3 +-- usr.sbin/ctladm/ctladm.c | 10 +++------- usr.sbin/ctladm/tests/port.sh | 28 +++++++++++++++++++++++----- 4 files changed, 28 insertions(+), 15 deletions(-) diff --git a/sys/cam/ctl/ctl_frontend_ioctl.c b/sys/cam/ctl/ctl_frontend_ioctl.c index af3a552af32a..e471a4c3e24c 100644 --- a/sys/cam/ctl/ctl_frontend_ioctl.c +++ b/sys/cam/ctl/ctl_frontend_ioctl.c @@ -268,7 +268,7 @@ cfi_ioctl_port_remove(struct ctl_req *req) if (port_id == -1) { req->status = CTL_LUN_ERROR; snprintf(req->error_str, sizeof(req->error_str), - "port_id not provided"); + "Missing required argument: port_id"); return; } diff --git a/usr.sbin/ctladm/ctladm.8 b/usr.sbin/ctladm/ctladm.8 index a7eb1d58cbbf..6470f5d5a8ee 100644 --- a/usr.sbin/ctladm/ctladm.8 +++ b/usr.sbin/ctladm/ctladm.8 @@ -666,8 +666,7 @@ and Specify the frontend port number. The port numbers can be found in the frontend port list. .It Fl r -Remove port specified with -.Pq Fl p Ar targ_port . +Remove a port. .It Fl t Ar fe_type Specify the frontend type used by the .Pq Fl o , diff --git a/usr.sbin/ctladm/ctladm.c b/usr.sbin/ctladm/ctladm.c index 6af25ed28925..194f0647fe7f 100644 --- a/usr.sbin/ctladm/ctladm.c +++ b/usr.sbin/ctladm/ctladm.c @@ -575,11 +575,6 @@ cctl_port(int fd, int argc, char **argv, char *combinedopt) break; } case CCTL_PORT_MODE_REMOVE: - if (targ_port == -1) { - warnx("%s: -r requires -p", __func__); - retval = 1; - goto bailout; - } /* FALLTHROUGH */ case CCTL_PORT_MODE_CREATE: { bzero(&req, sizeof(req)); @@ -589,8 +584,9 @@ cctl_port(int fd, int argc, char **argv, char *combinedopt) if (port_mode == CCTL_PORT_MODE_REMOVE) { req.reqtype = CTL_REQ_REMOVE; - nvlist_add_stringf(option_list, "port_id", "%d", - targ_port); + if (targ_port != -1) + nvlist_add_stringf(option_list, "port_id", "%d", + targ_port); } else req.reqtype = CTL_REQ_CREATE; diff --git a/usr.sbin/ctladm/tests/port.sh b/usr.sbin/ctladm/tests/port.sh index 161759ec14d0..633dec2fd273 100644 --- a/usr.sbin/ctladm/tests/port.sh +++ b/usr.sbin/ctladm/tests/port.sh @@ -62,8 +62,6 @@ cleanup() { ;; "iscsi") TARGET=`awk '/target:/ {print $2}' port-create.txt` - # PORTNUM is ignored, but must be set - PORTNUM=9999 ctladm port -r -d $driver -p "$PORTNUM" -O cfiscsi_portal_group_tag=$PGTAG -O cfiscsi_target=$TARGET ;; esac @@ -93,6 +91,25 @@ create_ioctl_cleanup() cleanup ioctl } +atf_test_case remove_ioctl_without_required_args cleanup +remove_ioctl_without_required_args_head() +{ + atf_set "descr" "ctladm will gracefully fail to remove an ioctl target if required arguments are missing" + atf_set "require.user" "root" +} +remove_ioctl_without_required_args_body() +{ + skip_if_ctld + + atf_check -o save:port-create.txt ctladm port -c -d "ioctl" + atf_check egrep -q "Port created successfully" port-create.txt + atf_check -s exit:1 -e match:"Missing required argument: port_id" ctladm port -r -d "ioctl" +} +remove_ioctl_without_required_args_cleanup() +{ + cleanup ioctl +} + atf_test_case create_iscsi cleanup create_iscsi_head() { @@ -271,7 +288,7 @@ remove_iscsi_body() atf_check -o save:port-create.txt ctladm port -c -d "iscsi" -O cfiscsi_portal_group_tag=$PGTAG -O cfiscsi_target="$TARGET" portnum=`awk '/port:/ {print $2}' port-create.txt` atf_check -o save:portlist.txt ctladm portlist -qf iscsi - atf_check -o inline:"Port destroyed successfully\n" ctladm port -r -d iscsi -p 9999 -O cfiscsi_portal_group_tag=$PGTAG -O cfiscsi_target="$TARGET" + atf_check -o inline:"Port destroyed successfully\n" ctladm port -r -d iscsi -O cfiscsi_portal_group_tag=$PGTAG -O cfiscsi_target="$TARGET" # Check that the port was removed. A new port may have been added with # the same ID, so match against the target and tag, too. PGTAGHEX=0x7631 # PGTAG in hex @@ -295,8 +312,8 @@ remove_iscsi_without_required_args_body() TARGET=iqn.2018-10.myhost.remove_iscsi_without_required_args atf_check -o save:port-create.txt ctladm port -c -d "iscsi" -O cfiscsi_portal_group_tag=$PGTAG -O cfiscsi_target="$TARGET" echo "target: $TARGET" >> port-create.txt - atf_check -s exit:1 -e match:"Missing required argument: cfiscsi_portal_group_tag" ctladm port -r -d iscsi -p 9999 -O cfiscsi_target="$TARGET" - atf_check -s exit:1 -e match:"Missing required argument: cfiscsi_target" ctladm port -r -d iscsi -p 9999 -O cfiscsi_portal_group_tag=$PGTAG + atf_check -s exit:1 -e match:"Missing required argument: cfiscsi_portal_group_tag" ctladm port -r -d iscsi -O cfiscsi_target="$TARGET" + atf_check -s exit:1 -e match:"Missing required argument: cfiscsi_target" ctladm port -r -d iscsi -O cfiscsi_portal_group_tag=$PGTAG } remove_iscsi_without_required_args_cleanup() { @@ -313,6 +330,7 @@ atf_init_test_cases() atf_add_test_case disable_ioctl atf_add_test_case enable_ioctl atf_add_test_case remove_ioctl + atf_add_test_case remove_ioctl_without_required_args atf_add_test_case remove_iscsi atf_add_test_case remove_iscsi_without_required_args } From nobody Fri Jun 28 19:36:15 2024 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 4W9lzg65zvz5PC6j; Fri, 28 Jun 2024 19:36: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4W9lzg4QV6z41LW; Fri, 28 Jun 2024 19:36:15 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1719603375; 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=jbSP/qXz1SoKpmL8O+PC0KnwsV1K0zwRNCgfvV4adZY=; b=dcq9Eoja97G6a4I7kPTtRMDCSnMLmiiITRaKyPSUvs7WpsJuujWT5eb6In6jNsf7Q0Md0a ZfwHLvXuxZ6lkw3jpn8x4Md2p4NlVUjnr0LinixOC53Z9n1tvGK9cNsEXok1t0/sNWrla1 F0ICQH4TcAVHeUzNs+7b4M2bdxmTxqs0mWtS24cU7hpqDScbonNUIf/eLRn+u3Wxza/V59 xIUmZb6A+oOsOqUeHLbiaVvr6iybeOlpKOTc8W0R1bT9iSh057eboP0XSuCTtYap8P17Hd y2YeAnlCcFyImmxORgPm4nEdXazbr51EQxqaLMCmJ/fT+IhUalYJ7w0bRhGUQA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1719603375; a=rsa-sha256; cv=none; b=p1Pt+U5PgfEbE1FQd3sZxDtUy5hG4q8v7arcd0YyefrttOF5Q6wrwRovOo+xFnGbstyNoF lhI0MslQul5JWz8s/xWH+FPHdUc0JO43GqjRwPllXc7OLb1QUVFzr30K+GSPZikXNjonne Zpfhr+EuOx8MiqS8OntWUloH8BfMa1JN4dysjQ9M8S9PgJMfB0tCEUawX7YINDLUQnGQ1H ANjsZKWJYBWCILDkNdIwArXfK8rI2TxTVZLV4xYPtkPiSXi4cfq5iNRstrWv34ZslpHo2K 7KbtPLVBmldh+n4b6Aai/jbeFzb2oq7f/MTcrQ7Cz+j1SFFvDb+EOY3yjPlUDw== 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=1719603375; 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=jbSP/qXz1SoKpmL8O+PC0KnwsV1K0zwRNCgfvV4adZY=; b=dK6ZCwWfihxgrbgrDIPZ4/F6ElTcyC51vomzIM8KQQSSbd39t0rsCWsbHgT8CnzpG7BU6t vSEf+LnoupjUpd8C6RfjX4yu0UJytVjo0CIuMt6jmVgBP0toBF7SY4pUFlhKMYmv90akci zN/IxJbMg3b6OlsCMpA06NorZ7SLv0XV4+TbYe4jnmOUBgxBXPCfR9Kt+NNDYWsel9vANy yM+6HnXVJlvq6/CHmnpC76r3VGrqnER5EiyQiGNeAlHg4IOMZNuhamzHOwz2zJqHONwIT9 ItP8L9C+pU56rf8LGXoXTUQ+yHtmh2PYbcsVcp31Y5CtTK2GgtBDQv+VyWzQ7w== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4W9lzg42d8z17lY; Fri, 28 Jun 2024 19:36:15 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 45SJaFS1021212; Fri, 28 Jun 2024 19:36:15 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 45SJaF1J021209; Fri, 28 Jun 2024 19:36:15 GMT (envelope-from git) Date: Fri, 28 Jun 2024 19:36:15 GMT Message-Id: <202406281936.45SJaF1J021209@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Alan Somers Subject: git: 5d5082fd986e - stable/13 - ctld: plug memory leaks 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 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/13 X-Git-Reftype: branch X-Git-Commit: 5d5082fd986e11ad5bb30ac82384a28201b260b6 Auto-Submitted: auto-generated The branch stable/13 has been updated by asomers: URL: https://cgit.FreeBSD.org/src/commit/?id=5d5082fd986e11ad5bb30ac82384a28201b260b6 commit 5d5082fd986e11ad5bb30ac82384a28201b260b6 Author: Alan Somers AuthorDate: 2024-06-12 21:34:05 +0000 Commit: Alan Somers CommitDate: 2024-06-28 19:35:38 +0000 ctld: plug memory leaks Reviewed by: mav Sponsored by: Axcient Reported by: valgrind Pull Request: https://github.com/freebsd/freebsd-src/pull/1288 (cherry picked from commit 2909ddd17cb4d750852dc04128e584f93f8c5058) --- usr.sbin/ctld/ctld.c | 1 + usr.sbin/ctld/kernel.c | 36 ++++++++++++++++++++++++++++++++++++ 2 files changed, 37 insertions(+) diff --git a/usr.sbin/ctld/ctld.c b/usr.sbin/ctld/ctld.c index f2b2de5b9a57..f3d8d5807856 100644 --- a/usr.sbin/ctld/ctld.c +++ b/usr.sbin/ctld/ctld.c @@ -2874,6 +2874,7 @@ main(int argc, char **argv) error = conf_apply(oldconf, newconf); if (error != 0) log_warnx("failed to apply configuration"); + conf_delete(newconf); conf_delete(oldconf); oldconf = NULL; diff --git a/usr.sbin/ctld/kernel.c b/usr.sbin/ctld/kernel.c index cbb8e2c25f5d..5ea9295e9df0 100644 --- a/usr.sbin/ctld/kernel.c +++ b/usr.sbin/ctld/kernel.c @@ -615,6 +615,22 @@ retry_port: } cp->p_ctl_port = port->port_id; } + while ((port = STAILQ_FIRST(&devlist.port_list))) { + struct cctl_lun_nv *nv; + + STAILQ_REMOVE_HEAD(&devlist.port_list, links); + free(port->port_frontend); + free(port->port_name); + free(port->cfiscsi_target); + free(port->ctld_portal_group_name); + while ((nv = STAILQ_FIRST(&port->attr_list))) { + STAILQ_REMOVE_HEAD(&port->attr_list, links); + free(nv->value); + free(nv->name); + free(nv); + } + free(port); + } free(name); STAILQ_FOREACH(lun, &devlist.lun_list, links) { @@ -665,6 +681,18 @@ retry_port: cl->l_name); } } + while ((lun = STAILQ_FIRST(&devlist.lun_list))) { + struct cctl_lun_nv *nv; + + STAILQ_REMOVE_HEAD(&devlist.lun_list, links); + while ((nv = STAILQ_FIRST(&lun->attr_list))) { + STAILQ_REMOVE_HEAD(&lun->attr_list, links); + free(nv->value); + free(nv->name); + free(nv); + } + free(lun); + } return (conf); } @@ -742,12 +770,14 @@ kernel_lun_add(struct lun *lun) req.args = nvlist_pack(req.args_nvl, &req.args_len); if (req.args == NULL) { + nvlist_destroy(req.args_nvl); log_warn("error packing nvlist"); return (1); } } error = ioctl(ctl_fd, CTL_LUN_REQ, &req); + free(req.args); nvlist_destroy(req.args_nvl); if (error != 0) { @@ -825,12 +855,14 @@ kernel_lun_modify(struct lun *lun) req.args = nvlist_pack(req.args_nvl, &req.args_len); if (req.args == NULL) { + nvlist_destroy(req.args_nvl); log_warn("error packing nvlist"); return (1); } } error = ioctl(ctl_fd, CTL_LUN_REQ, &req); + free(req.args); nvlist_destroy(req.args_nvl); if (error != 0) { @@ -1053,6 +1085,7 @@ kernel_port_add(struct port *port) req.args = nvlist_pack(req.args_nvl, &req.args_len); if (req.args == NULL) { + nvlist_destroy(req.args_nvl); log_warn("error packing nvlist"); return (1); } @@ -1060,6 +1093,7 @@ kernel_port_add(struct port *port) req.result = result_buf; req.result_len = sizeof(result_buf); error = ioctl(ctl_fd, CTL_PORT_REQ, &req); + free(req.args); nvlist_destroy(req.args_nvl); if (error != 0) { @@ -1203,11 +1237,13 @@ kernel_port_remove(struct port *port) req.args = nvlist_pack(req.args_nvl, &req.args_len); if (req.args == NULL) { + nvlist_destroy(req.args_nvl); log_warn("error packing nvlist"); return (1); } error = ioctl(ctl_fd, CTL_PORT_REQ, &req); + free(req.args); nvlist_destroy(req.args_nvl); if (error != 0) { From nobody Fri Jun 28 19:46:10 2024 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 4W9mC71hv2z5PDCX; Fri, 28 Jun 2024 19:46: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4W9mC711rxz42bh; Fri, 28 Jun 2024 19:46:11 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1719603971; 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=io1j1ITO09orRKn3tXh4frF7jgNEyTH5Bj3B+pmBEXY=; b=O52h0dK9vi05fcDrbrOPhFSi97KiiMr2g8eHMY+EQ9e/lt6msjEfXYpCcDR7OQrrkgCamW UraBd40e+bmZQ9aTp9f0GuaPXDz/UWoYvXUSZRClFd72naejvyB6s3oXf3oRSC0LH5QqzB AxdxI3jqdjq6B4hFA4uSdbp2AHNTuH7Lk94zlapiSzGb5ikRIibAWL2SOB+XgWGeSFf/OC CnQwFPyo4fXCEPziC16A60tJc027obBpAlC89ZWK/2kjEnDJa+BmmjfbmgxJN6kHONY3z7 /ZFfTM6NIYbk4XKI6pRasg1R0k6mRvR4AQSzsTUMzAXkVQ8drcC/dt3FFekfog== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1719603971; a=rsa-sha256; cv=none; b=r1hzXA0qq7OeXiTxlNVZHnpiOSHSXALxH9sOCfsjoi9u7qp60gZjVBR1ZHgV5nYm2FUhF8 L7FYrht+Ln0w7EKisfHpi/QWLgREDyL6Nvoljz7NiXKhLRqIz/WIdOc0a4MXkz8w2DyWqs CN98EMupkQERern/tpkFrRF/kv3XsRGp2jVMu9xsLxXiIfOHv2fjw7SILZ/EwmriT631m+ pl2vdip0Z5r7DbyiS9JPqQdcI5Ql7Qz6Y68GqHqX/YVOk6gZ8n5eTsmwVPFdDVSx+yyO5L Vfaqg0I5N3fG73/6oJrWFQWl/UX2OipqJizcpuw2z/g78wNhG8t9K8vAHb8yrg== 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=1719603971; 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=io1j1ITO09orRKn3tXh4frF7jgNEyTH5Bj3B+pmBEXY=; b=A3uff/a4mlr2HnIJdbG/kbM8AtI0yKzyo8OblNIk4v4S0IwVASBcweWAtyTKN8V18IzvJU 9nXW3a34tgzNxrJ1f14XxW+O3XsoWIxZHTmp768kgG500mFFQhRQgYo75U/dXAm8CilmW0 FrNNfSKyTxsSRhIDByPMeYpucdRqMpRUAQ4IKr8s91Oe/iqRvBhuOgSKmYc+rHfuo/rXAv 2PRWVhbhDmSfhwAaE1AVbsb75yezp8cOvapmR2wJ/eiE/dzZmwckDQ2cBztNCaPnDv6Jwf iN1M2fMds4gDj6uTwPNcJSpVnL4DHkkd7wCvcRfyEiIp45Gbe0gUIig254Z7iQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4W9mC70dfkz18BV; Fri, 28 Jun 2024 19:46:11 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 45SJkAK3038132; Fri, 28 Jun 2024 19:46:10 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 45SJkA0R038129; Fri, 28 Jun 2024 19:46:10 GMT (envelope-from git) Date: Fri, 28 Jun 2024 19:46:10 GMT Message-Id: <202406281946.45SJkA0R038129@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Jamie Gritton Subject: git: c8f147943d2e - stable/14 - MFC zfs/jail: Mark the zfs.mount_snapshot jail parameter as boolean. 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 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jamie X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: c8f147943d2e0926793af3442dd26a8e5aebcda7 Auto-Submitted: auto-generated The branch stable/14 has been updated by jamie: URL: https://cgit.FreeBSD.org/src/commit/?id=c8f147943d2e0926793af3442dd26a8e5aebcda7 commit c8f147943d2e0926793af3442dd26a8e5aebcda7 Author: Jamie Gritton AuthorDate: 2024-06-24 20:00:49 +0000 Commit: Jamie Gritton CommitDate: 2024-06-28 19:44:56 +0000 MFC zfs/jail: Mark the zfs.mount_snapshot jail parameter as boolean. PR: 274263 Differential Revision: https://reviews.freebsd.org/D45647 (cherry picked from commit 9cbf1de7e34a6fced041388fad5d9180cb7705fe) --- sys/contrib/openzfs/module/os/freebsd/zfs/zfs_vfsops.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/contrib/openzfs/module/os/freebsd/zfs/zfs_vfsops.c b/sys/contrib/openzfs/module/os/freebsd/zfs/zfs_vfsops.c index a972c720dfdb..9b56d15f1095 100644 --- a/sys/contrib/openzfs/module/os/freebsd/zfs/zfs_vfsops.c +++ b/sys/contrib/openzfs/module/os/freebsd/zfs/zfs_vfsops.c @@ -100,7 +100,7 @@ static struct zfs_jailparam zfs_jailparam0 = { static int zfs_jailparam_slot; SYSCTL_JAIL_PARAM_SYS_NODE(zfs, CTLFLAG_RW, "Jail ZFS parameters"); -SYSCTL_JAIL_PARAM(_zfs, mount_snapshot, CTLTYPE_INT | CTLFLAG_RW, "I", +SYSCTL_JAIL_PARAM(_zfs, mount_snapshot, CTLTYPE_INT | CTLFLAG_RW, "B", "Allow mounting snapshots in the .zfs directory for unjailed datasets"); SYSCTL_NODE(_vfs_zfs, OID_AUTO, version, CTLFLAG_RD, 0, "ZFS versions"); From nobody Fri Jun 28 19:50:02 2024 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 4W9mHZ322lz5PDMl; Fri, 28 Jun 2024 19:50: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4W9mHZ2W70z437c; Fri, 28 Jun 2024 19:50:02 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1719604202; 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=7ddQK1ZTs9EGmID73Ko9FJgYdS0aL03C6R4/kcooPJk=; b=yLr7IQiwbJFVpHlTDx/N0agXCBsC7j/lpuHj+YZTyi9yUP8PsR/bZP26vZEroTizNvrz5Z pkCdQlzSwgwbZwl+zynmYMJ6VSyMmnV0SFTSGQijkU2XnE3pkMg5hAglIVRU1JnDl25aEd LDxiiGuSwv/9ke5Yei1JrUzDla0yEdZBxwDN332A8tvM5A2NTPJZhSSNZwPlt9PWCGp5YF vISEldv0mW9rQmU5a2QtOFXotfBbrtlt51ifaDlzwDWTiA8Ny5BB5aaXdABtM/deV0GRyD hqXTGSjZ9NnW3KdX6n79GQ48zQeanxZbHl1g38Q7W/E31gLHpHpfQtydr+BMsQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1719604202; a=rsa-sha256; cv=none; b=m+GFnXv4oAod4wG/hUE28BNUhlwTAcOMPUeTXfUIrVstnZwHePZ4JCCJblgZBIaL1N6R4Q Leb5+OqIy//rL70rdxeaJYJHK3LIg+hASPc7hLtMXUHsugaFms68sXRqLsK0BFUsr79OcD 1OIN3JP1MVnXjHtQpePi1QQKLH4usQj4PkaRJLbC8mA2+DG8xtKZ+5m5hD7iiSn7OyzZw3 Z61IVNXjtD7Styr80zpN4Fq4CcEXmIvuw/bBLP4MYlRXBgtAOQEJrVPT1NpAKwywsm49P/ tMRXroqiBC2PCSIQYBSX/JiN0HY5KyHKpx68KuLIGbfKVa8UleVnk+nCmnZq5A== 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=1719604202; 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=7ddQK1ZTs9EGmID73Ko9FJgYdS0aL03C6R4/kcooPJk=; b=YZtGq3OEy5PkBBHsPUBULgANkOTWtXUKoNjmvdeai2EU603qZolDhl/Zw5v1bK/kSK2npE JTHU7Wg4eB3FJ39nI2fd4Px1CscC3Q6KPyciJJ03Pm73eCvMt3QAPEM53wL3pzIq/wxBdG MtwjtSM6/tN3sE6SFyWABsnERfAOpeo1DpkraH7o1LKCJKjazJ2Ux3xvizlNu929wCbbt3 gLTBvdmGPPOrI7O1aOFSdZF3kxq4fPq/1hUrBFkBtoVL7l8ki3P7RDAqtoe84PqovtvGsM n+zZgG3eSKxeYBtzh6RWGVEji87sEm2Stur5XYbsagPrxcxLmWCAnCAkjGG49g== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4W9mHZ26x3z181D; Fri, 28 Jun 2024 19:50:02 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 45SJo22u040812; Fri, 28 Jun 2024 19:50:02 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 45SJo2cG040808; Fri, 28 Jun 2024 19:50:02 GMT (envelope-from git) Date: Fri, 28 Jun 2024 19:50:02 GMT Message-Id: <202406281950.45SJo2cG040808@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Jamie Gritton Subject: git: bb7b7b0eb7cf - stable/14 - MFC zfs/jail: Document the zfs.mount_snapshot parameter in jail(8). 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 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jamie X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: bb7b7b0eb7cf64109f05136d921a357f58839ba1 Auto-Submitted: auto-generated The branch stable/14 has been updated by jamie: URL: https://cgit.FreeBSD.org/src/commit/?id=bb7b7b0eb7cf64109f05136d921a357f58839ba1 commit bb7b7b0eb7cf64109f05136d921a357f58839ba1 Author: Jamie Gritton AuthorDate: 2024-06-24 20:03:45 +0000 Commit: Jamie Gritton CommitDate: 2024-06-28 19:49:28 +0000 MFC zfs/jail: Document the zfs.mount_snapshot parameter in jail(8). PR: 274263 Differential Revision: https://reviews.freebsd.org/D45647 (cherry picked from commit 63875db56bd545896e019c922378f96ad5adc892) --- usr.sbin/jail/jail.8 | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/usr.sbin/jail/jail.8 b/usr.sbin/jail/jail.8 index 0e98914795a2..3a6e46b065b2 100644 --- a/usr.sbin/jail/jail.8 +++ b/usr.sbin/jail/jail.8 @@ -23,7 +23,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd August 26, 2023 +.Dd June 24, 2024 .Dt JAIL 8 .Os .Sh NAME @@ -761,7 +761,15 @@ the jail cannot perform any sysvmsg-related system calls. .It Va sysvsem, sysvshm Allow access to SYSV IPC semaphore and shared memory primitives, in the same manner as -.Va sysvmsg. +.Va sysvmsg . +.It Va zfs.mount_snapshot +Allow jailed users to access the contents of ZFS snapshots under the +filesystem's +.Pa .zfs +directory. +If +.Va allow.mount.zfs +is set, the snapshots may also be mounted. .El .Pp There are pseudo-parameters that are not passed to the kernel, but are From nobody Fri Jun 28 19:51:08 2024 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 4W9mJr33KCz5PDQg; Fri, 28 Jun 2024 19:51: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4W9mJr2bNXz43Vm; Fri, 28 Jun 2024 19:51:08 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1719604268; 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=SXfsYtZMkIxzJt2fNvGJ/5fjDtd+0alyEAV7hj9NVho=; b=W9rzbj1jsViKOxC0Wf8XLtj96rW0P9nOEQ8ATDuBNDUCwLzO0d0Yluu8Pp1b2W6oXr0PuG r7S5lavpAVUW+7YtLnXu3ZV9NjZUmpMvZRX0co4qSuXM7yWA9hEuplCib5hy56z1qNnhem alQRVOyZrTrxO5fLhB0U7PsH2Azcb8M4hGCP89jjhQbLHeuPnDBfULQx/VjuwFIppdUnUd 8UsA+DgUhVpqBNeLH4Q3+TbJv1x6FBHGRBMwtZM1XKZFaAZzbIO1iqPlEcFG9gf60jsOMb WcJyomDSbWoRCoZpMExPcgOvTD8TRL6NGQeuMtSXrrVqWJJov+kDNz8gZ0vR2Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1719604268; a=rsa-sha256; cv=none; b=BYbUhQ8kE3efE5YWBzsQQw/tryBZ0TxiGflu+GX1i9GscaWEDSs7eSoHo6AiBYresm9/gt hcVBkwVoSoNWuvZ8ptNLSpZv16MLmPniw3mge9It6Q1xFaXe34td9Zyh+dhxcozEVw7gLr ahr/p7Nd/JiwzByoHYOaC+e2riDoJEd3N2z+TkQGqVcRkkxrPSIEDFb+KCLG6h1IKa6URC jL7Ow2dMLNLZUOV7Y5He9k5j8+RBWmAdfAq42M/WiN2Y52o4aVmUG3gi5pQ2AxV2UVLl3m eREbZ0kifrtLFNUvNwHpvy51uxdhZYUDlFfRRf5+oK85DV+stN6kZcV2rkK8YA== 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=1719604268; 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=SXfsYtZMkIxzJt2fNvGJ/5fjDtd+0alyEAV7hj9NVho=; b=SxYfToNlrW+tuXgnidQH/Urz+HjKhMLZOWT+4sWJATFJCxQE/x5afgD/qofmz27SsX8wOA fSBxH4Bpwxt/PbOcsFxXQVw2Hf4UDoaAYqkj/noGD8WsY0GY14CogLIbvSWyc7ZdUAjjh9 g9Pf4n9Xow7AsgVTPDhJKTV8Y/Tku1O7A9u45rrLBUsJTO4zIPlwjlcouAvBWoGq9nfSJk jYum9jknQuVa6EXOFvYAHFH9yH2RoBdI37OEQpQiaQWAjQKSZ3AEEmM6zgHZFOqsrqjMpd djjZ89qLk8sJG+XjwrzJTwwkI8XwwlnqXyZYgGIgwgb1F54RTzqyxVQp3+TcrQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4W9mJr2CfLz18FK; Fri, 28 Jun 2024 19:51:08 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 45SJp813050220; Fri, 28 Jun 2024 19:51:08 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 45SJp8Jj050217; Fri, 28 Jun 2024 19:51:08 GMT (envelope-from git) Date: Fri, 28 Jun 2024 19:51:08 GMT Message-Id: <202406281951.45SJp8Jj050217@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Jamie Gritton Subject: git: 172fbf12fc22 - stable/13 - MFC zfs/jail: Mark the zfs.mount_snapshot jail parameter as boolean. 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 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jamie X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 172fbf12fc22395b55d9dba6b81e7088c7ec43bd Auto-Submitted: auto-generated The branch stable/13 has been updated by jamie: URL: https://cgit.FreeBSD.org/src/commit/?id=172fbf12fc22395b55d9dba6b81e7088c7ec43bd commit 172fbf12fc22395b55d9dba6b81e7088c7ec43bd Author: Jamie Gritton AuthorDate: 2024-06-24 20:00:49 +0000 Commit: Jamie Gritton CommitDate: 2024-06-28 19:50:44 +0000 MFC zfs/jail: Mark the zfs.mount_snapshot jail parameter as boolean. PR: 274263 Differential Revision: https://reviews.freebsd.org/D45647 (cherry picked from commit 9cbf1de7e34a6fced041388fad5d9180cb7705fe) --- sys/contrib/openzfs/module/os/freebsd/zfs/zfs_vfsops.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/contrib/openzfs/module/os/freebsd/zfs/zfs_vfsops.c b/sys/contrib/openzfs/module/os/freebsd/zfs/zfs_vfsops.c index 33581d018256..42c8287a7c03 100644 --- a/sys/contrib/openzfs/module/os/freebsd/zfs/zfs_vfsops.c +++ b/sys/contrib/openzfs/module/os/freebsd/zfs/zfs_vfsops.c @@ -102,7 +102,7 @@ static struct zfs_jailparam zfs_jailparam0 = { static int zfs_jailparam_slot; SYSCTL_JAIL_PARAM_SYS_NODE(zfs, CTLFLAG_RW, "Jail ZFS parameters"); -SYSCTL_JAIL_PARAM(_zfs, mount_snapshot, CTLTYPE_INT | CTLFLAG_RW, "I", +SYSCTL_JAIL_PARAM(_zfs, mount_snapshot, CTLTYPE_INT | CTLFLAG_RW, "B", "Allow mounting snapshots in the .zfs directory for unjailed datasets"); SYSCTL_NODE(_vfs_zfs, OID_AUTO, version, CTLFLAG_RD, 0, "ZFS versions"); From nobody Fri Jun 28 19:52:10 2024 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 4W9mL273dcz5PDR6; Fri, 28 Jun 2024 19:52: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4W9mL26b30z44V8; Fri, 28 Jun 2024 19:52:10 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1719604330; 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=d4LQIjeYsPPlQT3k57oRePQVynL9WDtMk4FDXl3DkJc=; b=JYCwI4QVACvXZq2piQDjU0onsRoG4oyPjFTkPzoqiPnO++TWGEsKMX5gwm4zZzuz9ndwh9 SXpe+4U/isLHg3MXUQYeB22zkeUTl2FEnB97PWVhLI3mezckd7QECjZVBZUT/fu0eRhzt8 1X/x5YtvrlpVRx49Bq4CaCqWrAG/MVY+uspkGcvwIZsOXnJ1e5JY0dhmw3BJSFA7xEkb59 bfu9tlqnlMWmcpsg4v/VzJEX4dFvI4uBrpCAVbA3UNKFzS6mmzwxj9Pu+s42LytDWFYbu+ 3iWhKwlSCm2RrFbtzONBf2jz1+ur7l1ozzH/dnwW4yojSaCYZjXqsTRmHC291A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1719604330; a=rsa-sha256; cv=none; b=WqtFY104RoBq0adVOV11zA73JFMOo6P9KzwqVK4ly0xWMIZjLCrqwVOUVPWETnHXhz0sTR piG3Y8HYrd7FvEcEfeq5sPbBu69+SWiqFzExd23k0eacQ2KF3jN4bSUPWBsqXRvnzwDQfz t1E0Kys/nIF392qKWWtiEMMbrcYaaFgWI6eVhWUJ8HMFdG5myiSJysQea98pPE0yRl62aC hlL0n58YmygVqiSVXREOp3vNPncIPOZDhFW04S4UA0TgbipvHrIkacY486DkJZEbw2dc84 ODM4HvYes1uAc8WtMZRlt0iBXPCU+72iNuXz/+K22g/5uAi22pSYBA4x43Oz+A== 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=1719604330; 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=d4LQIjeYsPPlQT3k57oRePQVynL9WDtMk4FDXl3DkJc=; b=Ib8pV4pQhAenKoQaWryI1PF7Nlcu3xeb6nEf7FHGutkq58BV+vh/dET7pHDHOm0JQAetvx fLhZ6sP4mEwfI0RFaONrL/YROU8PIjs4hQha6ANVmkEjUyIwygJ0LJd2ErKKAm56DUzo3A tD/Ri3nX2V8eW6305NCTKFJONaCQx4tXd3zEeDRp+8EFWYETeho+CXUGlpVpLesa4swCDY Gd06MOVVaLSv8qsEzaegb/ST8UTshuUrDl70/U5wClozlkwR3lHt+jJE8eYw48hr3QNJgv BJxClRhoZBY8fSE/la6/nwkKX4jYi8zMvPANM6jUTqxiCrFSZwcjhkkg6r5ZPg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4W9mL26B7Zz189q; Fri, 28 Jun 2024 19:52:10 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 45SJqAaF053533; Fri, 28 Jun 2024 19:52:10 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 45SJqAlI053530; Fri, 28 Jun 2024 19:52:10 GMT (envelope-from git) Date: Fri, 28 Jun 2024 19:52:10 GMT Message-Id: <202406281952.45SJqAlI053530@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Jamie Gritton Subject: git: 0e391d97fbe4 - stable/13 - MFC zfs/jail: Document the zfs.mount_snapshot parameter in jail(8). 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 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jamie X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 0e391d97fbe4d0369b001f1e645f6984c8c1bca1 Auto-Submitted: auto-generated The branch stable/13 has been updated by jamie: URL: https://cgit.FreeBSD.org/src/commit/?id=0e391d97fbe4d0369b001f1e645f6984c8c1bca1 commit 0e391d97fbe4d0369b001f1e645f6984c8c1bca1 Author: Jamie Gritton AuthorDate: 2024-06-24 20:03:45 +0000 Commit: Jamie Gritton CommitDate: 2024-06-28 19:51:58 +0000 MFC zfs/jail: Document the zfs.mount_snapshot parameter in jail(8). PR: 274263 Differential Revision: https://reviews.freebsd.org/D45647 (cherry picked from commit 63875db56bd545896e019c922378f96ad5adc892) --- usr.sbin/jail/jail.8 | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/usr.sbin/jail/jail.8 b/usr.sbin/jail/jail.8 index fa2a9d472d3e..b66e3464dc5e 100644 --- a/usr.sbin/jail/jail.8 +++ b/usr.sbin/jail/jail.8 @@ -23,7 +23,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd March 12, 2023 +.Dd June 24, 2024 .Dt JAIL 8 .Os .Sh NAME @@ -757,7 +757,15 @@ the jail cannot perform any sysvmsg-related system calls. .It Va sysvsem, sysvshm Allow access to SYSV IPC semaphore and shared memory primitives, in the same manner as -.Va sysvmsg. +.Va sysvmsg . +.It Va zfs.mount_snapshot +Allow jailed users to access the contents of ZFS snapshots under the +filesystem's +.Pa .zfs +directory. +If +.Va allow.mount.zfs +is set, the snapshots may also be mounted. .El .Pp There are pseudo-parameters that are not passed to the kernel, but are From nobody Sat Jun 29 20:29:28 2024 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 4WBP6d305Gz5PjXT; Sat, 29 Jun 2024 20:29:29 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4WBP6c3bDqz4GDy; Sat, 29 Jun 2024 20:29:28 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1719692968; 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=K9u5kgdROx4knUBXqs9GrRBZsBVWBjNVOZRxSAUPzOw=; b=CH1jMdpYvd/kZ4yBIa3MYPmUfJ0Y8P8U5t25ExnlGirtw6tKXRflwXlGchh4ljn4AAnsQX +EHGkOcKXCcRNOqXm9iBqjhtHFf2Qp5sUcyxXkPH5Cgvf+aOTJkFa3JvFgpfHAslwzeraD IjOzzHNpr0CEhxZ1gqBgyb20TCMRhsVs0HW+omerR09sr3i1HoTmCZOtwjUGj1JId+1qZt acAeqke2ODA76L9gul6P4ymCu+r85f9PzgpURL5I05HBVNfVatycHJdIj2Fz+rjOSLO5P8 kQj5gu9G+RjU3ejhK0LHCKDM229mWjOMGcIfzI8vzsdJsrh+UFBRMPaoG2AOKA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1719692968; a=rsa-sha256; cv=none; b=Yajtcr2pogYGBQshVxq8l4phmeiRUUEZ1n1+GI4kEduAZzb/pgXp3HFC/SSVxeSaElM507 zIFPDnK26duRbRQdL47nXko9hd33WrEnHzK22smDIYAhbbOkxffoaHoe5wuQ/RXm4m4gzH 8m+VIF8FZhw+gyyDLJtGAlDissF9JEsrOPI3lGwzsGs12+mn4HwyZHtXEyDRqPcj8xKHMt EBfel1vLdHdY2YcJSfLVCVBVsli0NY2+43TrMLgQVDydYqqIczMB6IZ2LVSmaC/CQFPZTW 63eTDLgomvzvvGyS+Py1m31OydWXOkpBVLzvpVgyV9TaKiOD7sWfVHlf7o8TwQ== 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=1719692968; 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=K9u5kgdROx4knUBXqs9GrRBZsBVWBjNVOZRxSAUPzOw=; b=BOxZfjI/NeMVaKr6SjucOuxjSgCW1UL35rm3tuiSyFtguIxaI3AorSs6Lvy08ehdm44GhT TOjmm1SVOUXNAXTAgO3msSj/xToG0MkSsWJoghgUO6iD5Jr1AgPj7vmKn29SFaMTPr4+8q G+BJ8ZUmL7NCS8kxEkGmy0GdyVsxT7JYZPNHxbZAlWCIYzmpiMIcrySg+XxM33vMACqLwC K4T93Rqay4cHEoqye/zuRBZDe+KuhrlkQueDLryqLbdJIv0VdLvIuwcq3klk8yUZdRIKX/ Fd5GD8g6fWNbRZX/EVZPNLvK6VF0AA9adU3gG3SA89P4Oa0UNfRg6CfGqiQKcw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4WBP6c3703zt5h; Sat, 29 Jun 2024 20:29:28 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 45TKTSe6034218; Sat, 29 Jun 2024 20:29:28 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 45TKTSoB034215; Sat, 29 Jun 2024 20:29:28 GMT (envelope-from git) Date: Sat, 29 Jun 2024 20:29:28 GMT Message-Id: <202406292029.45TKTSoB034215@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Enji Cooper Subject: git: 13a031f0d73d - stable/14 - Update to OpenSSL 3.0.14 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 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: ngie X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 13a031f0d73dd39bcf89c152168f9c1d454f2d2a Auto-Submitted: auto-generated The branch stable/14 has been updated by ngie: URL: https://cgit.FreeBSD.org/src/commit/?id=13a031f0d73dd39bcf89c152168f9c1d454f2d2a commit 13a031f0d73dd39bcf89c152168f9c1d454f2d2a Author: Enji Cooper AuthorDate: 2024-06-26 23:50:13 +0000 Commit: Enji Cooper CommitDate: 2024-06-29 20:29:18 +0000 Update to OpenSSL 3.0.14 This release resolves 3 upstream found CVEs: - Fixed potential use after free after SSL_free_buffers() is called (CVE-2024-4741) - Fixed an issue where checking excessively long DSA keys or parameters may be very slow (CVE-2024-4603) - Fixed unbounded memory growth with session handling in TLSv1.3 (CVE-2024-2511) MFC after: 3 days Merge commit '1070e7dca8223387baf5155524b28f62bfe7da3c' (cherry picked from commit 44096ebd22ddd0081a357011714eff8963614b65) --- crypto/openssl/CHANGES.md | 69 ++++ crypto/openssl/CONTRIBUTING.md | 6 +- crypto/openssl/Configurations/10-main.conf | 9 +- crypto/openssl/Configurations/15-ios.conf | 6 +- crypto/openssl/Configurations/unix-Makefile.tmpl | 14 +- crypto/openssl/Configure | 3 +- crypto/openssl/INSTALL.md | 9 +- crypto/openssl/NEWS.md | 15 + crypto/openssl/NOTES-NONSTOP.md | 5 +- crypto/openssl/VERSION.dat | 4 +- crypto/openssl/apps/lib/s_cb.c | 8 +- crypto/openssl/apps/list.c | 3 +- crypto/openssl/apps/ocsp.c | 4 +- crypto/openssl/apps/pkcs12.c | 16 +- crypto/openssl/apps/req.c | 2 +- crypto/openssl/apps/speed.c | 6 +- crypto/openssl/apps/ts.c | 11 +- crypto/openssl/crypto/aes/build.info | 2 +- crypto/openssl/crypto/bio/bio_lib.c | 10 +- crypto/openssl/crypto/bio/bio_sock.c | 6 +- crypto/openssl/crypto/bn/bn_lib.c | 53 ++- crypto/openssl/crypto/bn/bn_rand.c | 166 ++++++-- crypto/openssl/crypto/bn/bn_shift.c | 8 +- crypto/openssl/crypto/dsa/dsa_check.c | 46 ++- crypto/openssl/crypto/dsa/dsa_ossl.c | 11 +- crypto/openssl/crypto/dsa/dsa_sign.c | 9 +- crypto/openssl/crypto/ec/build.info | 2 +- .../openssl/crypto/ec/curve448/arch_64/f_impl64.c | 8 +- crypto/openssl/crypto/ec/ecdsa_ossl.c | 15 +- crypto/openssl/crypto/encode_decode/encoder_lib.c | 7 +- crypto/openssl/crypto/engine/eng_pkey.c | 44 +-- crypto/openssl/crypto/err/openssl.ec | 4 +- crypto/openssl/crypto/ess/ess_lib.c | 4 +- crypto/openssl/crypto/evp/keymgmt_lib.c | 9 +- crypto/openssl/crypto/evp/p_lib.c | 12 +- crypto/openssl/crypto/evp/pmeth_lib.c | 69 +++- crypto/openssl/crypto/evp/signature.c | 33 +- crypto/openssl/crypto/init.c | 14 +- crypto/openssl/crypto/o_str.c | 4 +- crypto/openssl/crypto/property/property_parse.c | 3 +- crypto/openssl/crypto/provider_core.c | 11 +- crypto/openssl/crypto/sha/build.info | 2 +- crypto/openssl/crypto/sm2/sm2_crypt.c | 37 +- crypto/openssl/crypto/sm2/sm2_sign.c | 18 +- crypto/openssl/crypto/x509/v3_addr.c | 4 +- crypto/openssl/demos/digest/EVP_MD_demo.c | 4 +- crypto/openssl/demos/digest/EVP_MD_stdin.c | 4 +- crypto/openssl/doc/fingerprints.txt | 3 + crypto/openssl/doc/internal/man3/OPTIONS.pod | 4 +- .../doc/internal/man3/ossl_method_construct.pod | 4 +- .../doc/internal/man3/ossl_provider_new.pod | 4 +- .../internal/man3/ossl_random_add_conf_module.pod | 4 +- crypto/openssl/doc/internal/man7/EVP_PKEY.pod | 4 +- crypto/openssl/doc/man1/openssl-crl.pod.in | 5 +- crypto/openssl/doc/man1/openssl-mac.pod.in | 17 +- crypto/openssl/doc/man1/openssl-req.pod.in | 33 +- crypto/openssl/doc/man1/openssl-smime.pod.in | 18 +- crypto/openssl/doc/man1/openssl-storeutl.pod.in | 5 +- crypto/openssl/doc/man1/openssl-ts.pod.in | 8 +- crypto/openssl/doc/man3/DEFINE_STACK_OF.pod | 6 +- crypto/openssl/doc/man3/EVP_DigestInit.pod | 4 +- crypto/openssl/doc/man3/EVP_KDF.pod | 4 +- .../openssl/doc/man3/EVP_PKEY_CTX_set_params.pod | 6 +- crypto/openssl/doc/man3/EVP_PKEY_check.pod | 7 +- crypto/openssl/doc/man3/SSL_CIPHER_get_name.pod | 4 +- crypto/openssl/doc/man3/SSL_CTX_set_cert_store.pod | 6 +- crypto/openssl/doc/man3/SSL_CTX_set_verify.pod | 5 +- .../openssl/doc/man3/SSL_CTX_use_certificate.pod | 5 +- .../openssl/doc/man3/SSL_load_client_CA_file.pod | 20 +- crypto/openssl/doc/man7/EVP_PKEY-SM2.pod | 5 +- crypto/openssl/doc/man7/migration_guide.pod | 28 +- crypto/openssl/e_os.h | 20 +- crypto/openssl/engines/e_afalg.c | 6 +- crypto/openssl/engines/e_dasync.c | 4 +- crypto/openssl/fuzz/asn1.c | 16 +- crypto/openssl/include/crypto/bn.h | 10 +- crypto/openssl/include/internal/constant_time.h | 25 +- crypto/openssl/include/openssl/sslerr.h | 4 +- crypto/openssl/os-dep/Apple/PrivacyInfo.xcprivacy | 23 ++ crypto/openssl/providers/fips-sources.checksums | 272 ++++++------- crypto/openssl/providers/fips.checksum | 2 +- crypto/openssl/providers/fips/fipsprov.c | 4 +- .../providers/implementations/exchange/kdf_exch.c | 44 ++- .../implementations/include/prov/ciphercommon.h | 15 +- .../openssl/providers/implementations/kdfs/hkdf.c | 10 +- .../openssl/providers/implementations/rands/drbg.c | 5 +- .../providers/implementations/rands/drbg_ctr.c | 7 +- .../providers/implementations/rands/drbg_hash.c | 5 +- .../providers/implementations/rands/drbg_hmac.c | 5 +- .../providers/implementations/rands/drbg_local.h | 3 +- crypto/openssl/ssl/record/rec_layer_s3.c | 15 + crypto/openssl/ssl/record/record.h | 3 +- crypto/openssl/ssl/record/ssl3_buffer.c | 4 +- crypto/openssl/ssl/ssl_err.c | 6 +- crypto/openssl/ssl/ssl_lib.c | 10 +- crypto/openssl/ssl/ssl_sess.c | 36 +- crypto/openssl/ssl/statem/statem_srvr.c | 9 +- crypto/openssl/ssl/t1_lib.c | 5 +- crypto/openssl/test/bad_dtls_test.c | 4 +- crypto/openssl/test/build.info | 1 + crypto/openssl/test/cmp_hdr_test.c | 51 ++- crypto/openssl/test/ct_test.c | 11 +- crypto/openssl/test/dsatest.c | 10 +- crypto/openssl/test/ecdsatest.c | 30 +- crypto/openssl/test/ecstresstest.c | 4 +- crypto/openssl/test/evp_extra_test.c | 48 ++- crypto/openssl/test/evp_pkey_provided_test.c | 63 ++- crypto/openssl/test/evp_test.c | 15 +- crypto/openssl/test/helpers/ssltestlib.c | 35 +- crypto/openssl/test/helpers/ssltestlib.h | 3 +- crypto/openssl/test/keymgmt_internal_test.c | 10 +- crypto/openssl/test/pathed.cnf | 22 ++ crypto/openssl/test/pkey_meth_kdf_test.c | 55 ++- crypto/openssl/test/prov_config_test.c | 56 ++- .../invalid/p10240_q256_too_big.pem | 57 +++ crypto/openssl/test/recipes/25-test_req.t | 3 +- crypto/openssl/test/recipes/30-test_prov_config.t | 8 +- crypto/openssl/test/recipes/80-test_pkcs12.t | 14 +- crypto/openssl/test/recipes/90-test_shlibload.t | 3 +- crypto/openssl/test/sm2_internal_test.c | 37 +- crypto/openssl/test/ssl-tests/14-curves.cnf.in | 7 +- crypto/openssl/test/ssl-tests/20-cert-select.cnf | 216 +++++------ .../openssl/test/ssl-tests/20-cert-select.cnf.in | 70 ++-- crypto/openssl/test/ssl-tests/28-seclevel.cnf.in | 8 +- crypto/openssl/test/sslapitest.c | 426 ++++++++++++++++++--- crypto/openssl/test/sslbuffertest.c | 176 ++++++++- crypto/openssl/test/test.cnf | 6 + crypto/openssl/test/tls-provider.c | 13 +- crypto/openssl/test/v3ext.c | 17 +- 129 files changed, 2301 insertions(+), 764 deletions(-) diff --git a/crypto/openssl/CHANGES.md b/crypto/openssl/CHANGES.md index bd876eb89dd4..19e0fd6e25a5 100644 --- a/crypto/openssl/CHANGES.md +++ b/crypto/openssl/CHANGES.md @@ -28,6 +28,72 @@ breaking changes, and mappings for the large list of deprecated functions. [Migration guide]: https://github.com/openssl/openssl/tree/master/doc/man7/migration_guide.pod +### Changes between 3.0.13 and 3.0.14 [4 Jun 2024] + + * Fixed potential use after free after SSL_free_buffers() is called. + + The SSL_free_buffers function is used to free the internal OpenSSL + buffer used when processing an incoming record from the network. + The call is only expected to succeed if the buffer is not currently + in use. However, two scenarios have been identified where the buffer + is freed even when still in use. + + The first scenario occurs where a record header has been received + from the network and processed by OpenSSL, but the full record body + has not yet arrived. In this case calling SSL_free_buffers will succeed + even though a record has only been partially processed and the buffer + is still in use. + + The second scenario occurs where a full record containing application + data has been received and processed by OpenSSL but the application has + only read part of this data. Again a call to SSL_free_buffers will + succeed even though the buffer is still in use. + + ([CVE-2024-4741]) + + *Matt Caswell* + + * Fixed an issue where checking excessively long DSA keys or parameters may + be very slow. + + Applications that use the functions EVP_PKEY_param_check() or + EVP_PKEY_public_check() to check a DSA public key or DSA parameters may + experience long delays. Where the key or parameters that are being checked + have been obtained from an untrusted source this may lead to a Denial of + Service. + + To resolve this issue DSA keys larger than OPENSSL_DSA_MAX_MODULUS_BITS + will now fail the check immediately with a DSA_R_MODULUS_TOO_LARGE error + reason. + + ([CVE-2024-4603]) + + *Tomáš Mráz* + + * Fixed an issue where some non-default TLS server configurations can cause + unbounded memory growth when processing TLSv1.3 sessions. An attacker may + exploit certain server configurations to trigger unbounded memory growth that + would lead to a Denial of Service + + This problem can occur in TLSv1.3 if the non-default SSL_OP_NO_TICKET option + is being used (but not if early_data is also configured and the default + anti-replay protection is in use). In this case, under certain conditions, + the session cache can get into an incorrect state and it will fail to flush + properly as it fills. The session cache will continue to grow in an unbounded + manner. A malicious client could deliberately create the scenario for this + failure to force a Denial of Service. It may also happen by accident in + normal operation. + + ([CVE-2024-2511]) + + *Matt Caswell* + + * New atexit configuration switch, which controls whether the OPENSSL_cleanup + is registered when libcrypto is unloaded. This can be used on platforms + where using atexit() from shared libraries causes crashes on exit. + + *Randall S. Becker* + ### Changes between 3.0.12 and 3.0.13 [30 Jan 2024] * A file in PKCS12 format can contain certificates and keys and may come from @@ -19824,6 +19890,9 @@ ndif +[CVE-2024-4741]: https://www.openssl.org/news/vulnerabilities.html#CVE-2024-4741 +[CVE-2024-4603]: https://www.openssl.org/news/vulnerabilities.html#CVE-2024-4603 +[CVE-2024-2511]: https://www.openssl.org/news/vulnerabilities.html#CVE-2024-2511 [CVE-2024-0727]: https://www.openssl.org/news/vulnerabilities.html#CVE-2024-0727 [CVE-2023-6237]: https://www.openssl.org/news/vulnerabilities.html#CVE-2023-6237 [CVE-2023-6129]: https://www.openssl.org/news/vulnerabilities.html#CVE-2023-6129 diff --git a/crypto/openssl/CONTRIBUTING.md b/crypto/openssl/CONTRIBUTING.md index 15490fd9f620..fec6616e21fe 100644 --- a/crypto/openssl/CONTRIBUTING.md +++ b/crypto/openssl/CONTRIBUTING.md @@ -9,7 +9,7 @@ Development is done on GitHub in the [openssl/openssl] repository. [openssl/openssl]: -To request new a feature, ask a question, or report a bug, +To request a new feature, ask a question, or report a bug, please open an [issue on GitHub](https://github.com/openssl/openssl/issues). To submit a patch or implement a new feature, please open a @@ -67,7 +67,8 @@ guidelines: often. We do not accept merge commits, you will have to remove them (usually by rebasing) before it will be acceptable. - 4. Code provided should follow our [coding style] and compile without warnings. + 4. Code provided should follow our [coding style] and [documentation policy] + and compile without warnings. There is a [Perl tool](util/check-format.pl) that helps finding code formatting mistakes and other coding style nits. Where `gcc` or `clang` is available, you should use the @@ -77,6 +78,7 @@ guidelines: whenever a PR is created or updated by committers. [coding style]: https://www.openssl.org/policies/technical/coding-style.html + [documentation policy]: https://openssl.org/policies/technical/documentation-policy.html 5. When at all possible, code contributions should include tests. These can either be added to an existing test, or completely new. Please see diff --git a/crypto/openssl/Configurations/10-main.conf b/crypto/openssl/Configurations/10-main.conf index ff8af7146318..1155d9859c56 100644 --- a/crypto/openssl/Configurations/10-main.conf +++ b/crypto/openssl/Configurations/10-main.conf @@ -784,7 +784,14 @@ my %targets = ( asm_arch => 'aarch64', perlasm_scheme => "linux64", }, - + "linux-arm64ilp32-clang" => { # clang config abi by --target + inherit_from => [ "linux-generic32" ], + CC => "clang", + CXX => "clang++", + bn_ops => "SIXTY_FOUR_BIT RC4_CHAR", + asm_arch => 'aarch64', + perlasm_scheme => "linux64", + }, "linux-mips32" => { # Configure script adds minimally required -march for assembly # support, if no -march was specified at command line. diff --git a/crypto/openssl/Configurations/15-ios.conf b/crypto/openssl/Configurations/15-ios.conf index 54d37f63f445..81e3d68bc7f0 100644 --- a/crypto/openssl/Configurations/15-ios.conf +++ b/crypto/openssl/Configurations/15-ios.conf @@ -49,16 +49,16 @@ my %targets = ( # "iphoneos-cross" => { inherit_from => [ "ios-common" ], - cflags => add("-isysroot \$(CROSS_TOP)/SDKs/\$(CROSS_SDK) -fno-common"), + cflags => add("-isysroot \"\$(CROSS_TOP)/SDKs/\$(CROSS_SDK)\" -fno-common"), }, "ios-cross" => { inherit_from => [ "ios-xcrun" ], CC => "cc", - cflags => add("-isysroot \$(CROSS_TOP)/SDKs/\$(CROSS_SDK)"), + cflags => add("-isysroot \"\$(CROSS_TOP)/SDKs/\$(CROSS_SDK)\""), }, "ios64-cross" => { inherit_from => [ "ios64-xcrun" ], CC => "cc", - cflags => add("-isysroot \$(CROSS_TOP)/SDKs/\$(CROSS_SDK)"), + cflags => add("-isysroot \"\$(CROSS_TOP)/SDKs/\$(CROSS_SDK)\""), }, ); diff --git a/crypto/openssl/Configurations/unix-Makefile.tmpl b/crypto/openssl/Configurations/unix-Makefile.tmpl index 3754595d38b5..644540397de5 100644 --- a/crypto/openssl/Configurations/unix-Makefile.tmpl +++ b/crypto/openssl/Configurations/unix-Makefile.tmpl @@ -21,7 +21,7 @@ sub dependmagic { my $target = shift; - return "$target: build_generated\n\t\$(MAKE) depend && \$(MAKE) _$target\n_$target"; + return "$target: build_generated\n\t\"\$(MAKE)\" depend && \"\$(MAKE)\" _$target\n_$target"; } our $COLUMNS = $ENV{COLUMNS}; @@ -527,7 +527,7 @@ all: build_sw build_docs test: tests {- dependmagic('tests'); -}: build_programs_nodep build_modules_nodep link-utils - $(MAKE) run_tests + "$(MAKE)" run_tests run_tests: FORCE @ : {- output_off() if $disabled{tests}; "" -} ( SRCTOP=$(SRCDIR) \ @@ -542,7 +542,7 @@ run_tests: FORCE list-tests: @ : {- output_off() if $disabled{tests}; "" -} - $(MAKE) run_tests TESTS=list + "$(MAKE)" run_tests TESTS=list @ : {- if ($disabled{tests}) { output_on(); } else { output_off(); } "" -} @echo "Tests are not supported with your chosen Configure options" @ : {- output_on() if !$disabled{tests}; "" -} @@ -1193,12 +1193,12 @@ providers/fips.module.sources.new: configdata.pm cd sources-tmp \ && $$srcdir/Configure --banner=Configured enable-fips -O0 \ && ./configdata.pm --query 'get_sources("providers/fips")' > sources1 \ - && $(MAKE) -sj 4 build_generated providers/fips.so \ + && "$(MAKE)" -sj 4 build_generated providers/fips.so \ && find . -name '*.d' | xargs cat > dep1 \ - && $(MAKE) distclean \ + && "$(MAKE)" distclean \ && $$srcdir/Configure --banner=Configured enable-fips no-asm -O0 \ && ./configdata.pm --query 'get_sources("providers/fips")' > sources2 \ - && $(MAKE) -sj 4 build_generated providers/fips.so \ + && "$(MAKE)" -sj 4 build_generated providers/fips.so \ && find . -name '*.d' | xargs cat > dep2 \ && cat sources1 sources2 \ | grep -v ' : \\$$' | grep -v util/providers.num \ @@ -1332,7 +1332,7 @@ ordinals: build_generated $(SSLHEADERS) test_ordinals: - $(MAKE) run_tests TESTS=test_ordinals + "$(MAKE)" run_tests TESTS=test_ordinals tags TAGS: FORCE rm -f TAGS tags diff --git a/crypto/openssl/Configure b/crypto/openssl/Configure index 84cc4094644a..40c03ad0af32 100755 --- a/crypto/openssl/Configure +++ b/crypto/openssl/Configure @@ -1,6 +1,6 @@ #! /usr/bin/env perl # -*- mode: perl; -*- -# Copyright 2016-2023 The OpenSSL Project Authors. All Rights Reserved. +# Copyright 2016-2024 The OpenSSL Project Authors. All Rights Reserved. # # Licensed under the Apache License 2.0 (the "License"). You may not use # this file except in compliance with the License. You can obtain a copy @@ -405,6 +405,7 @@ my @disablables = ( "asan", "asm", "async", + "atexit", "autoalginit", "autoerrinit", "autoload-config", diff --git a/crypto/openssl/INSTALL.md b/crypto/openssl/INSTALL.md index fef408e9d1e3..c0dae491c94d 100644 --- a/crypto/openssl/INSTALL.md +++ b/crypto/openssl/INSTALL.md @@ -480,7 +480,7 @@ Setting the FIPS HMAC key As part of its self-test validation, the FIPS module must verify itself by performing a SHA-256 HMAC computation on itself. The default key is -the SHA256 value of "the holy handgrenade of antioch" and is sufficient +the SHA256 value of "holy hand grenade of antioch" and is sufficient for meeting the FIPS requirements. To change the key to a different value, use this flag. The value should @@ -546,6 +546,13 @@ be used even with this option. Do not build support for async operations. +### no-atexit + +Do not use `atexit()` in libcrypto builds. + +`atexit()` has varied semantics between platforms and can cause SIGSEGV in some +circumstances. This option disables the atexit registration of OPENSSL_cleanup. + ### no-autoalginit Don't automatically load all supported ciphers and digests. diff --git a/crypto/openssl/NEWS.md b/crypto/openssl/NEWS.md index d9a48b157eb1..fb231bcd8459 100644 --- a/crypto/openssl/NEWS.md +++ b/crypto/openssl/NEWS.md @@ -18,6 +18,18 @@ OpenSSL Releases OpenSSL 3.0 ----------- +### Major changes between OpenSSL 3.0.13 and OpenSSL 3.0.14 [4 Jun 2024] + + * Fixed potential use after free after SSL_free_buffers() is called + ([CVE-2024-4741]) + + * Fixed an issue where checking excessively long DSA keys or parameters may + be very slow + ([CVE-2024-4603]) + + * Fixed unbounded memory growth with session handling in TLSv1.3 + ([CVE-2024-2511]) + ### Major changes between OpenSSL 3.0.12 and OpenSSL 3.0.13 [30 Jan 2024] * Fixed PKCS12 Decoding crashes @@ -1470,6 +1482,9 @@ OpenSSL 0.9.x +[CVE-2024-4741]: https://www.openssl.org/news/vulnerabilities.html#CVE-2024-4741 +[CVE-2024-4603]: https://www.openssl.org/news/vulnerabilities.html#CVE-2024-4603 +[CVE-2024-2511]: https://www.openssl.org/news/vulnerabilities.html#CVE-2024-2511 [CVE-2024-0727]: https://www.openssl.org/news/vulnerabilities.html#CVE-2024-0727 [CVE-2023-6237]: https://www.openssl.org/news/vulnerabilities.html#CVE-2023-6237 [CVE-2023-6129]: https://www.openssl.org/news/vulnerabilities.html#CVE-2023-6129 diff --git a/crypto/openssl/NOTES-NONSTOP.md b/crypto/openssl/NOTES-NONSTOP.md index 68438b998884..ab13de7d3a76 100644 --- a/crypto/openssl/NOTES-NONSTOP.md +++ b/crypto/openssl/NOTES-NONSTOP.md @@ -56,7 +56,10 @@ relating to `atexit()` processing when a shared library is unloaded and when the program terminates. This limitation applies to all OpenSSL shared library components. -A resolution to this situation is under investigation. +It is possible to configure the build with `no-atexit` to avoid the SIGSEGV. +Preferably, you can explicitly call `OPENSSL_cleanup()` from your application. +It is not mandatory as it just deallocates various global data structures +OpenSSL allocated. About Prefix and OpenSSLDir --------------------------- diff --git a/crypto/openssl/VERSION.dat b/crypto/openssl/VERSION.dat index 3ee1a6f829f4..5de9bf3d01ba 100644 --- a/crypto/openssl/VERSION.dat +++ b/crypto/openssl/VERSION.dat @@ -1,7 +1,7 @@ MAJOR=3 MINOR=0 -PATCH=13 +PATCH=14 PRE_RELEASE_TAG= BUILD_METADATA= -RELEASE_DATE="30 Jan 2024" +RELEASE_DATE="4 Jun 2024" SHLIB_VERSION=3 diff --git a/crypto/openssl/apps/lib/s_cb.c b/crypto/openssl/apps/lib/s_cb.c index f2ddd94c3de4..7881c1667626 100644 --- a/crypto/openssl/apps/lib/s_cb.c +++ b/crypto/openssl/apps/lib/s_cb.c @@ -1,5 +1,5 @@ /* - * Copyright 1995-2022 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 1995-2024 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the Apache License 2.0 (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy @@ -1318,7 +1318,8 @@ int ssl_load_stores(SSL_CTX *ctx, if (vfyCAstore != NULL && !X509_STORE_load_store(vfy, vfyCAstore)) goto err; add_crls_store(vfy, crls); - SSL_CTX_set1_verify_cert_store(ctx, vfy); + if (SSL_CTX_set1_verify_cert_store(ctx, vfy) == 0) + goto err; if (crl_download) store_setup_crl_download(vfy); } @@ -1332,7 +1333,8 @@ int ssl_load_stores(SSL_CTX *ctx, goto err; if (chCAstore != NULL && !X509_STORE_load_store(ch, chCAstore)) goto err; - SSL_CTX_set1_chain_cert_store(ctx, ch); + if (SSL_CTX_set1_chain_cert_store(ctx, ch) == 0) + goto err; } rv = 1; err: diff --git a/crypto/openssl/apps/list.c b/crypto/openssl/apps/list.c index 0fcbcbb083cb..7d3136a8a161 100644 --- a/crypto/openssl/apps/list.c +++ b/crypto/openssl/apps/list.c @@ -1,5 +1,5 @@ /* - * Copyright 1995-2022 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 1995-2024 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the Apache License 2.0 (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy @@ -1230,6 +1230,7 @@ static void list_provider_info(void) } if (OSSL_PROVIDER_do_all(NULL, &collect_providers, providers) != 1) { + sk_OSSL_PROVIDER_free(providers); BIO_printf(bio_err, "ERROR: Memory allocation\n"); return; } diff --git a/crypto/openssl/apps/ocsp.c b/crypto/openssl/apps/ocsp.c index 821e224c6ce4..fb3105da5526 100644 --- a/crypto/openssl/apps/ocsp.c +++ b/crypto/openssl/apps/ocsp.c @@ -1,5 +1,5 @@ /* - * Copyright 2001-2022 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 2001-2024 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the Apache License 2.0 (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy @@ -11,7 +11,7 @@ #ifdef OPENSSL_SYS_VMS /* So fd_set and friends get properly defined on OpenVMS */ -# define _XOPEN_SOURCE_EXTENDED +# define _XOPEN_SOURCE_EXTENDED 1 #endif #include diff --git a/crypto/openssl/apps/pkcs12.c b/crypto/openssl/apps/pkcs12.c index b442d358f8b7..ab78903ee9cd 100644 --- a/crypto/openssl/apps/pkcs12.c +++ b/crypto/openssl/apps/pkcs12.c @@ -1,5 +1,5 @@ /* - * Copyright 1999-2022 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 1999-2024 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the Apache License 2.0 (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy @@ -712,9 +712,6 @@ int pkcs12_main(int argc, char **argv) in = bio_open_default(infile, 'r', FORMAT_PKCS12); if (in == NULL) goto end; - out = bio_open_owner(outfile, FORMAT_PEM, private); - if (out == NULL) - goto end; p12 = PKCS12_init_ex(NID_pkcs7_data, app_get0_libctx(), app_get0_propq()); if (p12 == NULL) { @@ -814,6 +811,11 @@ int pkcs12_main(int argc, char **argv) dump: assert(private); + + out = bio_open_owner(outfile, FORMAT_PEM, private); + if (out == NULL) + goto end; + if (!dump_certs_keys_p12(out, p12, cpass, -1, options, passout, enc)) { BIO_printf(bio_err, "Error outputting keys and certificates\n"); ERR_print_errors(bio_err); @@ -855,7 +857,11 @@ int dump_certs_keys_p12(BIO *out, const PKCS12 *p12, const char *pass, } else if (bagnid == NID_pkcs7_encrypted) { if (options & INFO) { BIO_printf(bio_err, "PKCS7 Encrypted data: "); - alg_print(p7->d.encrypted->enc_data->algorithm); + if (p7->d.encrypted == NULL) { + BIO_printf(bio_err, "\n"); + } else { + alg_print(p7->d.encrypted->enc_data->algorithm); + } } bags = PKCS12_unpack_p7encdata(p7, pass, passlen); } else { diff --git a/crypto/openssl/apps/req.c b/crypto/openssl/apps/req.c index c7d4c7822cda..2fc53d4bfcfa 100644 --- a/crypto/openssl/apps/req.c +++ b/crypto/openssl/apps/req.c @@ -569,7 +569,7 @@ int req_main(int argc, char **argv) X509V3_CTX ctx; X509V3_set_ctx_test(&ctx); - X509V3_set_nconf(&ctx, addext_conf); + X509V3_set_nconf(&ctx, req_conf); if (!X509V3_EXT_add_nconf(addext_conf, &ctx, "default", NULL)) { BIO_printf(bio_err, "Error checking extensions defined using -addext\n"); goto end; diff --git a/crypto/openssl/apps/speed.c b/crypto/openssl/apps/speed.c index 1113d775b8ab..d8e2c70e6128 100644 --- a/crypto/openssl/apps/speed.c +++ b/crypto/openssl/apps/speed.c @@ -1,5 +1,5 @@ /* - * Copyright 1995-2023 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 1995-2024 The OpenSSL Project Authors. All Rights Reserved. * Copyright (c) 2002, Oracle and/or its affiliates. All rights reserved * * Licensed under the Apache License 2.0 (the "License"). You may not use @@ -727,8 +727,12 @@ static int EVP_Update_loop(void *args) unsigned char *buf = tempargs->buf; EVP_CIPHER_CTX *ctx = tempargs->ctx; int outl, count, rc; + unsigned char faketag[16] = { 0xcc }; if (decrypt) { + if (EVP_CIPHER_get_flags(EVP_CIPHER_CTX_get0_cipher(ctx)) & EVP_CIPH_FLAG_AEAD_CIPHER) { + (void)EVP_CIPHER_CTX_ctrl(ctx, EVP_CTRL_AEAD_SET_TAG, sizeof(faketag), faketag); + } for (count = 0; COND(c[D_EVP][testnum]); count++) { rc = EVP_DecryptUpdate(ctx, buf, &outl, buf, lengths[testnum]); if (rc != 1) { diff --git a/crypto/openssl/apps/ts.c b/crypto/openssl/apps/ts.c index 57292e187cd2..01b73f380428 100644 --- a/crypto/openssl/apps/ts.c +++ b/crypto/openssl/apps/ts.c @@ -1,5 +1,5 @@ /* - * Copyright 2006-2022 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 2006-2024 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the Apache License 2.0 (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy @@ -535,15 +535,18 @@ static int create_digest(BIO *input, const char *digest, const EVP_MD *md, *md_value = OPENSSL_hexstr2buf(digest, &digest_len); if (*md_value == NULL || md_value_len != digest_len) { - OPENSSL_free(*md_value); - *md_value = NULL; BIO_printf(bio_err, "bad digest, %d bytes " "must be specified\n", md_value_len); - return 0; + goto err; } } rv = md_value_len; err: + if (rv <= 0) { + OPENSSL_free(*md_value); + *md_value = NULL; + rv = 0; + } EVP_MD_CTX_free(md_ctx); return rv; } diff --git a/crypto/openssl/crypto/aes/build.info b/crypto/openssl/crypto/aes/build.info index b250903fa6e2..271015e35e1b 100644 --- a/crypto/openssl/crypto/aes/build.info +++ b/crypto/openssl/crypto/aes/build.info @@ -76,7 +76,7 @@ DEFINE[../../providers/libdefault.a]=$AESDEF # already gets everything that the static libcrypto.a has, and doesn't need it # added again. IF[{- !$disabled{module} && !$disabled{shared} -}] - DEFINE[../providers/liblegacy.a]=$AESDEF + DEFINE[../../providers/liblegacy.a]=$AESDEF ENDIF GENERATE[aes-ia64.s]=asm/aes-ia64.S diff --git a/crypto/openssl/crypto/bio/bio_lib.c b/crypto/openssl/crypto/bio/bio_lib.c index c86b9ac198ca..245a75afa1b8 100644 --- a/crypto/openssl/crypto/bio/bio_lib.c +++ b/crypto/openssl/crypto/bio/bio_lib.c @@ -1,5 +1,5 @@ /* - * Copyright 1995-2023 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 1995-2024 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the Apache License 2.0 (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy @@ -869,8 +869,12 @@ static int bio_wait(BIO *bio, time_t max_time, unsigned int nap_milliseconds) return 1; #ifndef OPENSSL_NO_SOCK - if (BIO_get_fd(bio, &fd) > 0 && fd < FD_SETSIZE) - return BIO_socket_wait(fd, BIO_should_read(bio), max_time); + if (BIO_get_fd(bio, &fd) > 0) { + int ret = BIO_socket_wait(fd, BIO_should_read(bio), max_time); + + if (ret != -1) + return ret; + } #endif /* fall back to polling since no sockets are available */ diff --git a/crypto/openssl/crypto/bio/bio_sock.c b/crypto/openssl/crypto/bio/bio_sock.c index 476cbcc5cef1..12e6a68e3a25 100644 --- a/crypto/openssl/crypto/bio/bio_sock.c +++ b/crypto/openssl/crypto/bio/bio_sock.c @@ -1,5 +1,5 @@ /* - * Copyright 1995-2022 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 1995-2024 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the Apache License 2.0 (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy @@ -396,7 +396,11 @@ int BIO_socket_wait(int fd, int for_read, time_t max_time) struct timeval tv; time_t now; +#ifdef _WIN32 + if ((SOCKET)fd == INVALID_SOCKET) +#else if (fd < 0 || fd >= FD_SETSIZE) +#endif return -1; if (max_time == 0) return 1; diff --git a/crypto/openssl/crypto/bn/bn_lib.c b/crypto/openssl/crypto/bn/bn_lib.c index cf1bfe8ab085..9677a603cb2d 100644 --- a/crypto/openssl/crypto/bn/bn_lib.c +++ b/crypto/openssl/crypto/bn/bn_lib.c @@ -1,5 +1,5 @@ /* - * Copyright 1995-2023 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 1995-2024 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the Apache License 2.0 (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy @@ -618,14 +618,29 @@ int BN_ucmp(const BIGNUM *a, const BIGNUM *b) int i; BN_ULONG t1, t2, *ap, *bp; + ap = a->d; + bp = b->d; + + if (BN_get_flags(a, BN_FLG_CONSTTIME) + && a->top == b->top) { + int res = 0; + + for (i = 0; i < b->top; i++) { + res = constant_time_select_int(constant_time_lt_bn(ap[i], bp[i]), + -1, res); + res = constant_time_select_int(constant_time_lt_bn(bp[i], ap[i]), + 1, res); + } + return res; + } + bn_check_top(a); bn_check_top(b); i = a->top - b->top; if (i != 0) return i; - ap = a->d; - bp = b->d; + for (i = a->top - 1; i >= 0; i--) { t1 = ap[i]; t2 = bp[i]; @@ -737,11 +752,10 @@ int BN_is_bit_set(const BIGNUM *a, int n) return (int)(((a->d[i]) >> j) & ((BN_ULONG)1)); } -int BN_mask_bits(BIGNUM *a, int n) +int ossl_bn_mask_bits_fixed_top(BIGNUM *a, int n) { int b, w; - bn_check_top(a); if (n < 0) return 0; @@ -755,10 +769,21 @@ int BN_mask_bits(BIGNUM *a, int n) a->top = w + 1; a->d[w] &= ~(BN_MASK2 << b); } - bn_correct_top(a); + a->flags |= BN_FLG_FIXED_TOP; return 1; } +int BN_mask_bits(BIGNUM *a, int n) +{ + int ret; + + bn_check_top(a); + ret = ossl_bn_mask_bits_fixed_top(a, n); + if (ret) + bn_correct_top(a); + return ret; +} + void BN_set_negative(BIGNUM *a, int b) { if (b && !BN_is_zero(a)) @@ -935,6 +960,22 @@ int BN_is_word(const BIGNUM *a, const BN_ULONG w) return BN_abs_is_word(a, w) && (!w || !a->neg); } +int ossl_bn_is_word_fixed_top(const BIGNUM *a, BN_ULONG w) +{ + int res, i; + const BN_ULONG *ap = a->d; + + if (a->neg || a->top == 0) + return 0; + + res = constant_time_select_int(constant_time_eq_bn(ap[0], w), 1, 0); + + for (i = 1; i < a->top; i++) + res = constant_time_select_int(constant_time_is_zero_bn(ap[i]), + res, 0); + return res; +} + int BN_is_odd(const BIGNUM *a) { return (a->top > 0) && (a->d[0] & 1); diff --git a/crypto/openssl/crypto/bn/bn_rand.c b/crypto/openssl/crypto/bn/bn_rand.c index 2ca426ff76ed..ba0970b1f87d 100644 --- a/crypto/openssl/crypto/bn/bn_rand.c +++ b/crypto/openssl/crypto/bn/bn_rand.c @@ -1,5 +1,5 @@ /* - * Copyright 1995-2023 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 1995-2024 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the Apache License 2.0 (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy @@ -186,8 +186,8 @@ static int bnrand_range(BNRAND_FLAG flag, BIGNUM *r, const BIGNUM *range, } else { do { /* range = 11..._2 or range = 101..._2 */ - if (!bnrand(flag, r, n, BN_RAND_TOP_ANY, BN_RAND_BOTTOM_ANY, 0, - ctx)) + if (!bnrand(flag, r, n, BN_RAND_TOP_ANY, BN_RAND_BOTTOM_ANY, + strength, ctx)) return 0; if (!--count) { @@ -240,17 +240,63 @@ int BN_pseudo_rand_range(BIGNUM *r, const BIGNUM *range) # endif #endif +int ossl_bn_priv_rand_range_fixed_top(BIGNUM *r, const BIGNUM *range, + unsigned int strength, BN_CTX *ctx) +{ + int n; + int count = 100; + + if (r == NULL) { + ERR_raise(ERR_LIB_BN, ERR_R_PASSED_NULL_PARAMETER); + return 0; + } + + if (range->neg || BN_is_zero(range)) { + ERR_raise(ERR_LIB_BN, BN_R_INVALID_RANGE); + return 0; + } + + n = BN_num_bits(range); /* n > 0 */ + + /* BN_is_bit_set(range, n - 1) always holds */ + + if (n == 1) { + BN_zero(r); + } else { + BN_set_flags(r, BN_FLG_CONSTTIME); + do { + if (!bnrand(PRIVATE, r, n + 1, BN_RAND_TOP_ONE, BN_RAND_BOTTOM_ANY, + strength, ctx)) + return 0; + + if (!--count) { + ERR_raise(ERR_LIB_BN, BN_R_TOO_MANY_ITERATIONS); + return 0; + } + ossl_bn_mask_bits_fixed_top(r, n); + } + while (BN_ucmp(r, range) >= 0); +#ifdef BN_DEBUG + /* With BN_DEBUG on a fixed top number cannot be returned */ + bn_correct_top(r); +#endif + } + + return 1; +} + /* - * BN_generate_dsa_nonce generates a random number 0 <= out < range. Unlike - * BN_rand_range, it also includes the contents of |priv| and |message| in - * the generation so that an RNG failure isn't fatal as long as |priv| + * ossl_bn_gen_dsa_nonce_fixed_top generates a random number 0 <= out < range. + * Unlike BN_rand_range, it also includes the contents of |priv| and |message| + * in the generation so that an RNG failure isn't fatal as long as |priv| * remains secret. This is intended for use in DSA and ECDSA where an RNG * weakness leads directly to private key exposure unless this function is * used. */ -int BN_generate_dsa_nonce(BIGNUM *out, const BIGNUM *range, - const BIGNUM *priv, const unsigned char *message, - size_t message_len, BN_CTX *ctx) +int ossl_bn_gen_dsa_nonce_fixed_top(BIGNUM *out, const BIGNUM *range, + const BIGNUM *priv, + const unsigned char *message, + size_t message_len, BN_CTX *ctx) { EVP_MD_CTX *mdctx = EVP_MD_CTX_new(); /* @@ -260,20 +306,24 @@ int BN_generate_dsa_nonce(BIGNUM *out, const BIGNUM *range, unsigned char random_bytes[64]; unsigned char digest[SHA512_DIGEST_LENGTH]; unsigned done, todo; - /* We generate |range|+8 bytes of random output. */ - const unsigned num_k_bytes = BN_num_bytes(range) + 8; + /* We generate |range|+1 bytes of random output. */ + const unsigned num_k_bytes = BN_num_bytes(range) + 1; unsigned char private_bytes[96]; unsigned char *k_bytes = NULL; + const int max_n = 64; /* Pr(failure to generate) < 2^max_n */ + int n; int ret = 0; EVP_MD *md = NULL; OSSL_LIB_CTX *libctx = ossl_bn_get_libctx(ctx); if (mdctx == NULL) - goto err; + goto end; k_bytes = OPENSSL_malloc(num_k_bytes); if (k_bytes == NULL) - goto err; + goto end; + /* Ensure top byte is set to avoid non-constant time in bin2bn */ + k_bytes[0] = 0xff; /* We copy |priv| into a local buffer to avoid exposing its length. */ if (BN_bn2binpad(priv, private_bytes, sizeof(private_bytes)) < 0) { @@ -283,41 +333,60 @@ int BN_generate_dsa_nonce(BIGNUM *out, const BIGNUM *range, * length of the private key. */ ERR_raise(ERR_LIB_BN, BN_R_PRIVATE_KEY_TOO_LARGE); - goto err; + goto end; } md = EVP_MD_fetch(libctx, "SHA512", NULL); if (md == NULL) { ERR_raise(ERR_LIB_BN, BN_R_NO_SUITABLE_DIGEST); - goto err; - } - for (done = 0; done < num_k_bytes;) { - if (RAND_priv_bytes_ex(libctx, random_bytes, sizeof(random_bytes), 0) <= 0) - goto err; - - if (!EVP_DigestInit_ex(mdctx, md, NULL) - || !EVP_DigestUpdate(mdctx, &done, sizeof(done)) - || !EVP_DigestUpdate(mdctx, private_bytes, - sizeof(private_bytes)) - || !EVP_DigestUpdate(mdctx, message, message_len) - || !EVP_DigestUpdate(mdctx, random_bytes, sizeof(random_bytes)) - || !EVP_DigestFinal_ex(mdctx, digest, NULL)) - goto err; - - todo = num_k_bytes - done; - if (todo > SHA512_DIGEST_LENGTH) - todo = SHA512_DIGEST_LENGTH; - memcpy(k_bytes + done, digest, todo); - done += todo; + goto end; } + for (n = 0; n < max_n; n++) { + unsigned char i = 0; *** 5529 LINES SKIPPED *** From nobody Sun Jun 30 05:30:34 2024 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 4WBd6y6CNWz5NmS3; Sun, 30 Jun 2024 05:30: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4WBd6y5jjxz47XC; Sun, 30 Jun 2024 05:30:34 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1719725434; 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=9RAkCbKc7Ygoyw5DZlCYhkPH5rQkXhywS0KqbDTRGcM=; b=sAFMMQEZMq4Gd1sWhVxnL/a5YOT8rATL57LRSji7Pqjf9njdvj09CjQ0M8ilngXURLVmD3 RHYvqeyehOWLknUSEIBpHft6CQrMWGh4cGYsw5l6EJaC66Xyujqi+cAyNxT0RQ5hccvj7l qq9nJ7RuSAWxcGX192I36TJw/hs8GANCaNOTzS7sUXYkXISVa95qg1euayJjUhQXo+ocXB ICTfROgE9fW5Rjokcsy0tVZp/Ac7jZfqlVAlF+NmvYQu5f0P6UqEWEjQ6Wqe3Ra/14tdWh 4TWWnCQ+eTAp/z+v2J2WOCZRvyWyRxWvyiXjXfhC1st0FQTbvrTo5OoOc33gsA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1719725434; a=rsa-sha256; cv=none; b=fVn0MPtk4+7HAx1uUxQ/ZBJllU9Ey0Bm2VfjO3lwrsCvg3POSn2chAvPI+Crxt1wvystRK K7Ucxr9zdAq3J/nxx2Q5mOi5+R1lhmzfoCdS1hICfs5B53p3Nm8M0Bi1RuAZ/A0Dgal+u2 9YG8pEJZr3qbW6rm3r6xwhNvxNZOI+5/yo3az5KSK8uOiMvMJfxklMHkLnwuqA2vCyS7Dl GDXEz3obUW674qZfuh/m1o2WWSLgVAqvc+9Lr0UqPbCzHNuXGnt1kichfhWFAdQIkLLVz8 kK3wPJ6yEA6eJ8YsCZ7a8Nt8rxOPXgKvu0SfZe/qnHGJrI/Pm82tTEKIkzWr9g== 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=1719725434; 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=9RAkCbKc7Ygoyw5DZlCYhkPH5rQkXhywS0KqbDTRGcM=; b=K1iNpfUWyG/RnvWnbETRw6QB3hiO9DeJ+c42Gwzre2go95WHau4XX8mLM5/RjCbbwRnCHs gG7j4uCMtugVB/dm0CLaqQlO9uRrzNlOFUqrvrbgKB7Y1o9ZdEKi+QO0Ovolpe7J3T/Cv3 WkT1fx0GkX7MwblJgOVhbq3G5i+c/wUwc0B8JK/rN5/19TediaeVH743nm8MW8d63hh59m uys3kfu6OT0FB5v2FVQk9R47786bpFCyh+J3Oq2vtrcU7QuiYWHcntgtlHa49UAelB20/f 9k50yPSbobD6EvAG36sH0BHyOQpjylhotr5fllqsMIE2cGCdrIh47Or5DB/AaA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4WBd6y5Jbgz18ST; Sun, 30 Jun 2024 05:30:34 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 45U5UYed054460; Sun, 30 Jun 2024 05:30:34 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 45U5UYAC054457; Sun, 30 Jun 2024 05:30:34 GMT (envelope-from git) Date: Sun, 30 Jun 2024 05:30:34 GMT Message-Id: <202406300530.45U5UYAC054457@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Gordon Bergling Subject: git: 939f5a7b2bfb - stable/14 - erf.3: Add a STANDARDS section 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 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: gbe X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 939f5a7b2bfbd7ba3b23ddc691e12e8a332623f4 Auto-Submitted: auto-generated The branch stable/14 has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=939f5a7b2bfbd7ba3b23ddc691e12e8a332623f4 commit 939f5a7b2bfbd7ba3b23ddc691e12e8a332623f4 Author: Gordon Bergling AuthorDate: 2024-06-23 10:50:47 +0000 Commit: Gordon Bergling CommitDate: 2024-06-30 05:29:47 +0000 erf.3: Add a STANDARDS section Add a STANDARDS section for the erf(3) manual page. PR: 273413 Reviewed by: pauamma_gundo.com MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D44140 (cherry picked from commit 16c3d7e1fa150ee136b910448cf431e8deab5293) --- lib/msun/man/erf.3 | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/lib/msun/man/erf.3 b/lib/msun/man/erf.3 index e0771863cca1..8d66017ed11c 100644 --- a/lib/msun/man/erf.3 +++ b/lib/msun/man/erf.3 @@ -25,9 +25,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" from: @(#)erf.3 6.4 (Berkeley) 4/20/91 -.\" -.Dd July 13, 2014 +.Dd June 23, 2024 .Dt ERF 3 .Os .Sh NAME @@ -88,6 +86,17 @@ subtracts the result of the error function from 1.0. .Sh SEE ALSO .Xr math 3 +.Sh STANDARDS +The +.Fn erf , +.Fn erff , +.Fn erfl , +.Fn erfc , +.Fn erfcf +and +.Fn erfcl +functions conform to +.St -isoC-99 . .Sh HISTORY The .Fn erf From nobody Sun Jun 30 05:32:05 2024 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 4WBd8j1bZKz5NmVq; Sun, 30 Jun 2024 05:32: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4WBd8j17pFz49Wb; Sun, 30 Jun 2024 05:32:05 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1719725525; 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=EEMWa8WD6lu7RViClrdXZkTDr/1TB9zW6bDWTRVyyRM=; b=l2oBagiKwz/1VJUvs44S83g3YfIw5yjPeuJR893AeZ0ordC0SrjnkjASo1Ax4T5vLnxgxd rTBC5cK62D56905jZpg2vxYdix0TkEJUJUV76zAAAoUKincO1ZvjozxXZbatUg2+GqMMzj z03IIkepqBiOnsMgOuhUFt5jVaDoMwxdQNvw3i0kDjRO3yotseKr/HZKV/+xkS31DZJzZu 9l39NiaznBv7blPveDhPln8/y0cNmcmscVXSuedOR5IGu6hWmQPT8Bxm0B8wMCJgHEO8+j elB5jnSfmslis5THqVyx5LNCMu8IC3uwTd1U5OWr+b/nL/zZ2WdGMjIDxPgh8w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1719725525; a=rsa-sha256; cv=none; b=SJZaa1L55m4Va8voNQklqcMguQznMO44hJ2OqZqkEynHH/yDmnzCWZHftVCO8BU3Kf8+w5 d99g3mSnpOIkoy8JMJx/zhLEzkx+pOFkybG79gHaQ4QUUQhfptzU9vLnOcTXdoK8i54qqg uirzxFZTpEyCPrwsqYzUPkMvzJ04fpjskhaf2x+C55vxcUbxrQYYuSjMQjs4qhR7EWo0oO MJfzmJvoIt/c9UhRYtNA9urhYzLdcVqEiz5V/nMJfR411WO+vPFDfYF+CeeB9g3xZDEAIR BXBW5Yi2OJjvvxs6WSslR8JyEVjBuHy7DNAOesfPsGMcuIc16Cy3X9eMmPyZbg== 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=1719725525; 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=EEMWa8WD6lu7RViClrdXZkTDr/1TB9zW6bDWTRVyyRM=; b=sxLtvzncOhrzbmtU66vYLNhGR1eRif+UTFmWDMvul5pEfAX+izVM/jWmhIdCFZacZA693i SjBmjjhSKp2Pd3M07uhZv+6VPKpW+9b/4YU8jVDsA1VO5teg590kM4VY500hpSonPX7EOe ncmOTafMOdTimZVqdTlryDBPMyMlRR8D+c0DB6l0JZ8/zEyx2a4Sn5xdrGGtxN0Zu40HV5 UUBbQcats/Uurgt94yner22Kzs2Q0rQrrRMN2ijgfNJtPS2uajK/TWDndlACj/MwC4o4my aRecqKMBUn+js/1PqP8u1ir+HyvDpOB/rpEgaWLZiRsTW8ZtjJKYYpSRSVMtAA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4WBd8j0l6Yz18T8; Sun, 30 Jun 2024 05:32:05 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 45U5W5Ih061259; Sun, 30 Jun 2024 05:32:05 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 45U5W5j3061256; Sun, 30 Jun 2024 05:32:05 GMT (envelope-from git) Date: Sun, 30 Jun 2024 05:32:05 GMT Message-Id: <202406300532.45U5W5j3061256@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Gordon Bergling Subject: git: 9242934b6fbf - stable/13 - erf.3: Add a STANDARDS section 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 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: gbe X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 9242934b6fbf00fc5cb1f161c0c7d60a3ba3ec4d Auto-Submitted: auto-generated The branch stable/13 has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=9242934b6fbf00fc5cb1f161c0c7d60a3ba3ec4d commit 9242934b6fbf00fc5cb1f161c0c7d60a3ba3ec4d Author: Gordon Bergling AuthorDate: 2024-06-23 10:50:47 +0000 Commit: Gordon Bergling CommitDate: 2024-06-30 05:31:52 +0000 erf.3: Add a STANDARDS section Add a STANDARDS section for the erf(3) manual page. PR: 273413 Reviewed by: pauamma_gundo.com Differential Revision: https://reviews.freebsd.org/D44140 (cherry picked from commit 16c3d7e1fa150ee136b910448cf431e8deab5293) --- lib/msun/man/erf.3 | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/lib/msun/man/erf.3 b/lib/msun/man/erf.3 index e0771863cca1..8d66017ed11c 100644 --- a/lib/msun/man/erf.3 +++ b/lib/msun/man/erf.3 @@ -25,9 +25,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" from: @(#)erf.3 6.4 (Berkeley) 4/20/91 -.\" -.Dd July 13, 2014 +.Dd June 23, 2024 .Dt ERF 3 .Os .Sh NAME @@ -88,6 +86,17 @@ subtracts the result of the error function from 1.0. .Sh SEE ALSO .Xr math 3 +.Sh STANDARDS +The +.Fn erf , +.Fn erff , +.Fn erfl , +.Fn erfc , +.Fn erfcf +and +.Fn erfcl +functions conform to +.St -isoC-99 . .Sh HISTORY The .Fn erf