From nobody Mon Jun 17 04:03: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 4W2bpQ6LqVz5NC8n;
Mon, 17 Jun 2024 04:03: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 4W2bpQ5sPKz4qtr;
Mon, 17 Jun 2024 04:03:26 +0000 (UTC)
(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
t=1718597006;
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=rFgrmQV0aKKxvlho4UHvVemAXa3d4FQh8SoKcFS2CSI=;
b=cT1LjdQit8beGBM17YrBigJ/NrGcD+SVHacnx+4WPcnUvhJTJlzUHaYmlfZoPPaeJhV2LF
NU/RisiCsP14ZYNwzmP2ICPqxertcu2SHBx9AYiK+DbKF1+g4i71SL0yO9fso5NVvukWnG
3OXV2QB8sqMsvO8Nh6R/Dx4BBPcP3rdQJhfwgi9kmVMYoUKWICfv/Hx2ntJ3VkYMzbWFmb
+zDdaezjrFcLSdMjJTC8j/d7QM15aqt1VMY45bwAhUAzHPz7ROTZETfJ7JN0IsV2djNdRT
4ScykT9WntvsMldX/3mJ6/Z6eo1ghMqwR46zy0ocfCVD8lPLorkm3HCuLQAPWg==
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1718597006; a=rsa-sha256; cv=none;
b=MDMOXXEJRCCAdSySwUmFgKCsSYL5v4qOWQQikfB9jJ3ol2nPLVfadXYgaD5R/Imnnch6Db
4UKa7Ckh9NRTI1/PLCnO7W/q6aZgvNPincYiwAD410tSJnvCBs6L8rrRe/iy31apNi6kW1
kh06tYqMnLJestHbmq7charj8lAvrdPO08RS1Rgd2ONriISc1EOioCtIfMaJXaU9HjZBR5
p3Sp/TyupG9YYa6fM63BRA7CeN6mBE0WcW5VefhFsOv6H06O+46mRlMDtXo7TjIv7b7i5G
gOKGvXU8Rd6dlPRzQYqKtICfRD1Fe+BeBcn6wgaoaLvnFnPcmfI2AhteDrPW/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=1718597006;
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=rFgrmQV0aKKxvlho4UHvVemAXa3d4FQh8SoKcFS2CSI=;
b=REgFYCXoATB3qK5BskQk10Ak5kQJaQIWpr3SCzz4WIxWVf+U9qtcrPkqFbe6E0dhR5Phv0
M+fMCXF9dMAfWhw2YK4Sf8Fb1ktwuWQXjlsTDYr81PdNf2cwX8ZDhRvmAhSBJF8CtycckA
Xl1JCMhmjISREA0Xs5O7zgfV/9KO5XYbyDBs1ZoiROZ85tv9ZD0YIr5Woq83c6c7nsfRxi
0Mbak/xvBPTpSFF0mZ5STMqSohCb5ZaX8spby/JGFg0A3R+MpGjHy6JlMBbq4DrJHW99L/
GTXVWdp10Qx83ou9XxuKTKcu42oqbYJUgdVuit6UXubEfVNn+FnGGzyfAe/caA==
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 4W2bpQ5Sqjz1Fvk;
Mon, 17 Jun 2024 04:03: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 45H43QCX039546;
Mon, 17 Jun 2024 04:03:26 GMT
(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 45H43QBS039543;
Mon, 17 Jun 2024 04:03:26 GMT
(envelope-from git)
Date: Mon, 17 Jun 2024 04:03:26 GMT
Message-Id: <202406170403.45H43QBS039543@gitrepo.freebsd.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
dev-commits-src-branches@FreeBSD.org
From: Zhenlei Huang <zlei@FreeBSD.org>
Subject: git: 049b3c953e1e - stable/14 - bhyve: avoid side effect
in assertion
List-Id: Commits to the stable branches of the FreeBSD src repository <dev-commits-src-branches.freebsd.org>
List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches
List-Help: <mailto:dev-commits-src-branches+help@freebsd.org>
List-Post: <mailto:dev-commits-src-branches@freebsd.org>
List-Subscribe: <mailto:dev-commits-src-branches+subscribe@freebsd.org>
List-Unsubscribe: <mailto:dev-commits-src-branches+unsubscribe@freebsd.org>
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: 049b3c953e1eb81851c8668092beda377c3dbf0b
Auto-Submitted: auto-generated
The branch stable/14 has been updated by zlei:
URL: https://cgit.FreeBSD.org/src/commit/?id=049b3c953e1eb81851c8668092beda377c3dbf0b
commit 049b3c953e1eb81851c8668092beda377c3dbf0b
Author: Pierre Pronchery <pierre@freebsdfoundation.org>
AuthorDate: 2024-05-17 07:31:32 +0000
Commit: Zhenlei Huang <zlei@FreeBSD.org>
CommitDate: 2024-06-17 03:58:35 +0000
bhyve: avoid side effect in assertion
An assert() was setting the error variable instead of checking it.
Reported by: Coverity Scan
CID: 1521431
Reviewed by: jhb
Sponsored by: The FreeBSD Foundation
Pull Request: https://github.com/freebsd/freebsd-src/pull/1244
(cherry picked from commit f7d45c5443edc99857fdda19c68301b5ec4a8971)
---
usr.sbin/bhyve/tpm_ppi_qemu.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/usr.sbin/bhyve/tpm_ppi_qemu.c b/usr.sbin/bhyve/tpm_ppi_qemu.c
index 8bea45ea3208..da0edf84798f 100644
--- a/usr.sbin/bhyve/tpm_ppi_qemu.c
+++ b/usr.sbin/bhyve/tpm_ppi_qemu.c
@@ -162,7 +162,7 @@ tpm_ppi_deinit(void *sc)
ppi = sc;
error = unregister_mem(&ppi_mmio);
- assert(error = 0);
+ assert(error == 0);
free(ppi);
}
From nobody Mon Jun 17 04:03: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 4W2bpS145mz5NCqC;
Mon, 17 Jun 2024 04:03:28 +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 4W2bpS0RbNz4ql6;
Mon, 17 Jun 2024 04:03:28 +0000 (UTC)
(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
t=1718597008;
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=RLBvz3mgn41s0B5Y5eZa1c9FUYNzJbQPCNgdf38k25M=;
b=ixtIDQrHMY1Q1Dt1INacC9pB9j8NfXieSWhzoLAjcsGgpzOXxvOyAxR+kuKzQV2DqfhX8D
ApCKPR63kkxpPR1J12d4EPJzE7MY8ebQ/oGJCzxcWh2rttj501Ihm7hy+cPkEZhMGyDlzx
lpq7UQqXaysvx7mKeePaK8f/6nH/ArliQl/qfFrEf423NYlFpq5cEQf7mlVU1LPoQC8YDu
E0ESCNW9/8fjFpYzzPeURGtmu2oq31rvAW6Wjvqkz4WbPgH4jDzRYfO+P7h5tvSszYUgNI
x5EeCVM8rZfrp+QYJJosM88+lkKSo1DaM0o/W74KwXO+PIQDbZjlAZUJ2NDIew==
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1718597008; a=rsa-sha256; cv=none;
b=nw7oZ26Q/guy5OJuhvq8SusNTC4dWF+wqjCkind9TC/YNCHxKgkpPRSzNvf6gRIbofR8Kz
UMOtegrRXCICNoSeNUHiJ0IgyfcRfoDCNl5XRwfkGh06/UKUyIJNfccdVbCxjHRgykc+uE
KUQ96eihG4QVsC6KI/IaQrHw0x0Nk7Ya+qgmyg+2TETbo2sW9RZrJn7ZlKes4dXGitn0xx
mOfe69ErROmAnHeuoS9NcF3PwbZqpF2fleFGGXsVPQb6c4YxYuHS22HPhMVWD83RTGSgZZ
hiGlAAit+2QfX3TObHRcE8wbIyucx+V9dK55cOadeSEVXmf89LZZrOiL0r/xeg==
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=1718597008;
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=RLBvz3mgn41s0B5Y5eZa1c9FUYNzJbQPCNgdf38k25M=;
b=p+DfTtYeJdc348FFdFNwFznuzWfPD9EcaLj8Im4fboiNCzPC5z1gNBC16dMnTVisX+tenb
2BLYja/mCBxyuMDNTpQL8lY2bFsJgTTgOL4Nf19yaWIyRGKdrA/rIlFY2SrIKhrQGl3RqV
+kkw0Gd2j7ZpJmWK3/BOFosiWs6J3rEKdpn9ezTBR/513r4xZWwqKSLAlkPlJBrKQCSdjB
T2A3gb6iGRnWk0Yz1M+8J5iGDVPyG0F/J/flDfEtToer5juvIVRBjJNjZjzTtSQwWmHYXe
57ENnuxCpsaRj5Z2ERTxqL2J+hQTOflTPw8rswJhmgsGhAv2GZrbpKwETflgKw==
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 4W2bpR6VBwz1Fxl;
Mon, 17 Jun 2024 04:03: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 45H43RhU039610;
Mon, 17 Jun 2024 04:03:27 GMT
(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 45H43RhZ039607;
Mon, 17 Jun 2024 04:03:27 GMT
(envelope-from git)
Date: Mon, 17 Jun 2024 04:03:27 GMT
Message-Id: <202406170403.45H43RhZ039607@gitrepo.freebsd.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
dev-commits-src-branches@FreeBSD.org
From: Zhenlei Huang <zlei@FreeBSD.org>
Subject: git: a674f992a135 - stable/14 - if_enc(4): Prefer the
boolean form when calling bpf_peers_present()
List-Id: Commits to the stable branches of the FreeBSD src repository <dev-commits-src-branches.freebsd.org>
List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches
List-Help: <mailto:dev-commits-src-branches+help@freebsd.org>
List-Post: <mailto:dev-commits-src-branches@freebsd.org>
List-Subscribe: <mailto:dev-commits-src-branches+subscribe@freebsd.org>
List-Unsubscribe: <mailto:dev-commits-src-branches+unsubscribe@freebsd.org>
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: a674f992a135728648908874034408d43b3d1903
Auto-Submitted: auto-generated
The branch stable/14 has been updated by zlei:
URL: https://cgit.FreeBSD.org/src/commit/?id=a674f992a135728648908874034408d43b3d1903
commit a674f992a135728648908874034408d43b3d1903
Author: Zhenlei Huang <zlei@FreeBSD.org>
AuthorDate: 2024-06-06 04:20:26 +0000
Commit: Zhenlei Huang <zlei@FreeBSD.org>
CommitDate: 2024-06-17 03:59:18 +0000
if_enc(4): Prefer the boolean form when calling bpf_peers_present()
No functional change intended.
MFC after: 1 week
(cherry picked from commit 215a18d502cba2cf57251e82a84484219f2c432a)
---
sys/net/if_enc.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sys/net/if_enc.c b/sys/net/if_enc.c
index 971afdabfff6..eaac0a843189 100644
--- a/sys/net/if_enc.c
+++ b/sys/net/if_enc.c
@@ -217,7 +217,7 @@ enc_bpftap(struct ifnet *ifp, struct mbuf *m, const struct secasvar *sav,
else if (hhook_type == HHOOK_TYPE_IPSEC_OUT &&
(enc & V_bpf_mask_out) == 0)
return;
- if (bpf_peers_present(ifp->if_bpf) == 0)
+ if (!bpf_peers_present(ifp->if_bpf))
return;
hdr.af = af;
hdr.spi = sav->spi;
From nobody Mon Jun 17 04:03: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 4W2bpT1pQ4z5NC8r;
Mon, 17 Jun 2024 04:03: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 4W2bpT0pN0z4qtx;
Mon, 17 Jun 2024 04:03:29 +0000 (UTC)
(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
t=1718597009;
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=YNkoqzafjjLAZlCJlsqXnZZrg58awwvb1c7IjFzQbYw=;
b=cvMLBs+5Jw0vOifXZVLmk/i8ECy85bXw3640wsqWZdHg/Wv1bOLpiRz2/Qo+H5u200KKqa
ZCHFJPZlPnez9pV+hNqArpicCi+f7TN4x5YNVMqXIQRD2Qpu+hyJglRM4KMFKlv77phFem
BBk6UQ0JjvKUASFL7u3ZdWZzxLS868xa5jGXlAsO7dV9ISzuv4EU3A273jXyBx2IrIL3m2
gRurhJ8rMEf48/no6kGRh2HINNcitVFXMim61xuXQcbkKn7jf0NxWgZqTJuR8/tu1xFDx6
7tOSAnyBz4/avA9LfK//iJ1ad32anDRmaJHYnWAt2iK+l8WzQKzOPWccxkq0yA==
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1718597009; a=rsa-sha256; cv=none;
b=vq84zWMSeF3407Lf0nV4G4OlZuRaA2SQVcUI9HO/ncG3mQAyP7mhVlUSw//73br4N7y9mS
jkuj88q8cHVlxthUj3IZjLFk6KYqfg+3XfB/xGdUcnSPGfgNPJThFaB+bBBZ4ivqzx41Vl
GgDQUB8gddvWRN2Ys2CmWo6jmGt3JVqvcCBhldMOEFPKgG6GjMj/FbUCQ0FECug7XkHSgK
NFbqNpAxRAQOv3VViChszUZxEfbet9Ft2tLY1UhnPtIHpjFHyjmQ18L4K8fBbWfPQnfG6p
aK7SOp/E2Tkd5arQy37ftxouv0FZuuqYwInWlX1TGIgO/W8TMFrD5Wljj9uk7g==
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=1718597009;
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=YNkoqzafjjLAZlCJlsqXnZZrg58awwvb1c7IjFzQbYw=;
b=Ci5oVtZIfzwq0dnIny6WnI5KUGISIg2ZYc1mslVYimWKCrAo5orzCczYnxU+Hnw8UOwbm/
gxZPzc0FFnWwRAKUaBUs/sOUVgY0sXYOIWHmk4lkziaPt24qcGYi1d/AHysdgRxv2pwhDi
jx+XYTcc8wfN/L7Qu5CI1ShN0eRTmS1j8M7MrM8tI3dWiT8Wpze0mrYaoSVGUSM/yAA+2y
sTCebosLy+daS5kG2x4hJkMrXOOx9H9tgDXx750AYvWrqn3DFu3nJNc9PLEbTy1xZvd/d6
I0JArwN0QOctOW+fSka3nEGPiF0G7EIs6YynUFL21HAA572JFzMaa70F9PHTmA==
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 4W2bpT0PtLz1Ft3;
Mon, 17 Jun 2024 04:03: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 45H43STw039658;
Mon, 17 Jun 2024 04:03:28 GMT
(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 45H43S08039655;
Mon, 17 Jun 2024 04:03:28 GMT
(envelope-from git)
Date: Mon, 17 Jun 2024 04:03:28 GMT
Message-Id: <202406170403.45H43S08039655@gitrepo.freebsd.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
dev-commits-src-branches@FreeBSD.org
From: Zhenlei Huang <zlei@FreeBSD.org>
Subject: git: 6ad2e347fcf8 - stable/14 - bpf: Make bpf_peers_present
a boolean inline function
List-Id: Commits to the stable branches of the FreeBSD src repository <dev-commits-src-branches.freebsd.org>
List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches
List-Help: <mailto:dev-commits-src-branches+help@freebsd.org>
List-Post: <mailto:dev-commits-src-branches@freebsd.org>
List-Subscribe: <mailto:dev-commits-src-branches+subscribe@freebsd.org>
List-Unsubscribe: <mailto:dev-commits-src-branches+unsubscribe@freebsd.org>
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: 6ad2e347fcf8fa6aa9ebd84cfa4c71a1af90b4dd
Auto-Submitted: auto-generated
The branch stable/14 has been updated by zlei:
URL: https://cgit.FreeBSD.org/src/commit/?id=6ad2e347fcf8fa6aa9ebd84cfa4c71a1af90b4dd
commit 6ad2e347fcf8fa6aa9ebd84cfa4c71a1af90b4dd
Author: Zhenlei Huang <zlei@FreeBSD.org>
AuthorDate: 2024-06-07 15:06:08 +0000
Commit: Zhenlei Huang <zlei@FreeBSD.org>
CommitDate: 2024-06-17 03:59:29 +0000
bpf: Make bpf_peers_present a boolean inline function
This function was introduced in commit [1] and is actually used as a
boolean function although it was not defined as so.
No functional change intended.
1. 16d878cc99ef Fix the following bpf(4) race condition which can result in a panic
Reviewed by: markj, kp, #network
MFC after: 1 week
Differential Revision: https://reviews.freebsd.org/D45509
(cherry picked from commit 0dfd11abc4bd0dcb96a6d287cc4e52e8f59b64c1)
---
sys/net/bpf.h | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)
diff --git a/sys/net/bpf.h b/sys/net/bpf.h
index 924dea5fc9f4..7b76129aec94 100644
--- a/sys/net/bpf.h
+++ b/sys/net/bpf.h
@@ -435,15 +435,13 @@ int bpf_get_bp_params(struct bpf_if *, u_int *, u_int *);
void bpfilterattach(int);
u_int bpf_filter(const struct bpf_insn *, u_char *, u_int, u_int);
-static __inline int
+static __inline bool
bpf_peers_present(struct bpf_if *bpf)
{
struct bpf_if_ext *ext;
ext = (struct bpf_if_ext *)bpf;
- if (!CK_LIST_EMPTY(&ext->bif_dlist))
- return (1);
- return (0);
+ return (!CK_LIST_EMPTY(&ext->bif_dlist));
}
#define BPF_TAP(_ifp,_pkt,_pktlen) \
From nobody Mon Jun 17 04:03:30 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 4W2bpV3sWGz5NCg5;
Mon, 17 Jun 2024 04:03: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 4W2bpV1rqvz4qvH;
Mon, 17 Jun 2024 04:03:30 +0000 (UTC)
(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
t=1718597010;
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=mlkj/8HTILA+UHkzpdV8ZbBPkeD82Tf0EHx3e+rrmno=;
b=hKAsffAqZfPrRHk5RkzKw9ol60+GI7wvLLZ+pXiBwMs4AVJks6FKE4ezZ6D94QwO0hGnZi
x4thBnd6mpgLB8wxttYJHgXTk013VUG76rqqpBSMCkOv//gm4oYRQHUqZs3WXuWGMRA3yy
zXOVFWG0aFgmFZouzz5vcv4XeLAjswzk7CHHmhPsBHTXklQYY506uxkFQIddPi3/u/3khU
FIIjce6wF+KYXAHIlig9XZ5BVE6t2fXOzrZlHxtXJXZ5X5yWwxKV8dq6XkBtDuU9QfAysd
/aaE22iPpLWBt6Hg8GPn0K6+Ta6dziceZhrFJAJH2H/kI9woUb2SMCmq4pYhBQ==
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1718597010; a=rsa-sha256; cv=none;
b=DTrbyCn1xI4P+q8QEmlvTxPZwxlnZ+R+fFVVqnMCP4vd8fKENfIv/ziITPrPih4oejhcMO
pD1uB5pqbegL4VlyflYVhfilkqLYcaT3/aNM1uGU46fMU6i3CV/kQ4pR1TD7mAohSzEwOx
KD3AxcLhCoVKvr7/yPXFLJsRTTm0tizOX8BMPTXFjPszhwN7Rjqtz3JZBu0pcrcc2Xpo15
522myRxAkB0EcPg0qohXmR9WwEPGFXaRFgmsQpMg7amLrFxDe3Rx4qAoL5Qm2b0m0aUqzJ
j+5tFNgdjkK56MsqAWMTU5MWeJlciJ0atZjBjVszaSDh892Ng+wVg4B9KHak5Q==
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=1718597010;
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=mlkj/8HTILA+UHkzpdV8ZbBPkeD82Tf0EHx3e+rrmno=;
b=oKEYvno0XMmauf7cAt620eiiyQb455IGLLrcYgWLCdORGPNwEESurw5+WOsozKU0yklBFJ
FkTUj1e4vQtRsHBTIvlBIZ6ResOXh8eoqdM1qQpUmLb7026molhbDW0xj0qqxwyfU6wqif
JCNBd1uHBwXBNx3IUfdiDeD2zRrsQUhrua8Lv8fc/OLnNrDuTDQpSKReMrryQ5rQ1aqfDr
MmXH4SJHEqOmYWeOGlBWmq+X+7w7A6JoWu6AF3xxW/slkC/Dyj27HhBk1OttPnVvjNX1PM
mxo0pGTIZfjsPg9w0TUBrOUh3j2pbD1wIIvuXC/W8V6BzFXBUe5xPeXWxqLj2g==
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 4W2bpV1Sxcz1Fxm;
Mon, 17 Jun 2024 04:03:30 +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 45H43UDK039709;
Mon, 17 Jun 2024 04:03:30 GMT
(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 45H43UDI039706;
Mon, 17 Jun 2024 04:03:30 GMT
(envelope-from git)
Date: Mon, 17 Jun 2024 04:03:30 GMT
Message-Id: <202406170403.45H43UDI039706@gitrepo.freebsd.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
dev-commits-src-branches@FreeBSD.org
From: Zhenlei Huang <zlei@FreeBSD.org>
Subject: git: 954e548b7e88 - stable/14 - pflog: Correctly check if
bpf peers are present
List-Id: Commits to the stable branches of the FreeBSD src repository <dev-commits-src-branches.freebsd.org>
List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches
List-Help: <mailto:dev-commits-src-branches+help@freebsd.org>
List-Post: <mailto:dev-commits-src-branches@freebsd.org>
List-Subscribe: <mailto:dev-commits-src-branches+subscribe@freebsd.org>
List-Unsubscribe: <mailto:dev-commits-src-branches+unsubscribe@freebsd.org>
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: 954e548b7e88b7490aa5b23d16df7972c407bef1
Auto-Submitted: auto-generated
The branch stable/14 has been updated by zlei:
URL: https://cgit.FreeBSD.org/src/commit/?id=954e548b7e88b7490aa5b23d16df7972c407bef1
commit 954e548b7e88b7490aa5b23d16df7972c407bef1
Author: Zhenlei Huang <zlei@FreeBSD.org>
AuthorDate: 2024-06-09 01:05:22 +0000
Commit: Zhenlei Huang <zlei@FreeBSD.org>
CommitDate: 2024-06-17 03:59:49 +0000
pflog: Correctly check if bpf peers are present
On creating the pflog(4) interface, pflog_clone_create() does an
unconditional bpfattach(). Use bpf_peers_present() which was introduced
in commit 16d878cc99ef [1] to check the presence of bpf peers.
This will save a little CPU cycles when no bpf peers present. There
should be no functional change.
1. 16d878cc99ef Fix the following bpf(4) race condition which can result in a panic
Reviewed by: kp
MFC after: 1 week
Differential Revision: https://reviews.freebsd.org/D45532
(cherry picked from commit ebc2bab04823c24c524f913457d6b88dc7ea9fac)
---
sys/netpfil/pf/if_pflog.c | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/sys/netpfil/pf/if_pflog.c b/sys/netpfil/pf/if_pflog.c
index 82e0daa01898..f20dc214f56e 100644
--- a/sys/netpfil/pf/if_pflog.c
+++ b/sys/netpfil/pf/if_pflog.c
@@ -223,9 +223,10 @@ pflog_packet(struct pfi_kkif *kif, struct mbuf *m, sa_family_t af,
struct pfloghdr hdr;
if (kif == NULL || m == NULL || rm == NULL || pd == NULL)
- return ( 1);
+ return (1);
- if ((ifn = V_pflogifs[rm->logif]) == NULL || !ifn->if_bpf)
+ ifn = V_pflogifs[rm->logif];
+ if (ifn == NULL || !bpf_peers_present(ifn->if_bpf))
return (0);
bzero(&hdr, sizeof(hdr));
@@ -274,7 +275,7 @@ pflog_packet(struct pfi_kkif *kif, struct mbuf *m, sa_family_t af,
if_inc_counter(ifn, IFCOUNTER_OPACKETS, 1);
if_inc_counter(ifn, IFCOUNTER_OBYTES, m->m_pkthdr.len);
- BPF_MTAP2(ifn, &hdr, PFLOG_HDRLEN, m);
+ bpf_mtap2(ifn->if_bpf, &hdr, PFLOG_HDRLEN, m);
return (0);
}
From nobody Mon Jun 17 04:03: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 4W2bpW6NTCz5NCl5;
Mon, 17 Jun 2024 04:03: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 4W2bpW2TDGz4qp7;
Mon, 17 Jun 2024 04:03:31 +0000 (UTC)
(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
t=1718597011;
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=jCcLY/u3Lb5GhLTVchThsi8RcR+eeElEdCzEiPshTkU=;
b=i8NdbQylSc/RRMD4cxJBh5XaT3fIrSc6j+4qhrTVdpuJxWL3iHkbw4MWEfTprADJCuTFoD
kG6GlKwKUrnIEpKx4AGU6gu83yIKf2fEGXLkwSHhmB33zlDWCpbP1dVTOzWUK86OQsoFfX
LGg+bY1pOX1bMYEf4WXKm+dYH8tZWoX7g5g54NfMAbGnFBNQ+1m4/rAn4HqvDYW0yuGvO2
tIatboSdX/6c/UJUtmhdbPe7YzVGFc4vYDOHLdCVFA/WkYxhmqBswzJlOCVexQFd+hjYp/
17a1pqLm/sGAtytrkg8aGvEwqoAs6xZPqEHfMyPa86IjRsr45wQkqe1EqIRBNA==
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1718597011; a=rsa-sha256; cv=none;
b=S7+Wh1paUOFP0PqRvXEZyex8vCcsH+BWJ74TigUEdFGi4Vy6CKoKwTUd6X/oarCL4xcOP+
PdGDElddrViWvWGsYVMxK7Q7Ok9/zJdXsT0YYh+x1uZFM4Y529/h41vKXsK7g7RdaRzY6q
wEuOnRy1d2fiQE1JSfe1IULGj9nw3jdJ5O12yg+0o4i5C8hTeQFW2xhdXJEw26PgjvqYNU
lgWpmhMuPu1VyWf368EwdmBnAeDQeqVLXxKbQT1Jvko6tSEQWuM5gfc4/dqLTgLoNlAOOo
y7rWCd69vmFGzrTZXmywKgcFI+8zO3tqmzShuxbnfPErvjKduc5WXwVo0s5Bcw==
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=1718597011;
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=jCcLY/u3Lb5GhLTVchThsi8RcR+eeElEdCzEiPshTkU=;
b=a2h2ojjQsyjTHNPVmB9G8CuQ6SX0q86VUBDCzuZy3b8Z4/sxD721RTgCHwdXewC3BKLJ4Z
2ehDvl9mqsOCGD3n3is/gUgxg9aet8IQ28pJV4XxKvCKLezCzAaKcRIuWbbSD1ik+wzQei
83JsP2rMEey/dd186HakRSKJFVbXpgyRiPBwUqh00EgUO2vXqhYGA+zSNJiuPNt3d0D8um
3PXZqcj+YPLauW3kxmFuNMMePWrM1NW4LcpIebgsocReMnFea5BGkzxukxz4MHBeaffmY+
5brsay/XbyJI8cRBgnqvwhHNqmH3p5zBAp1HO/q+IKget9mo92wYNOMzIEe7oQ==
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 4W2bpW25WVz1Ft4;
Mon, 17 Jun 2024 04:03: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 45H43VDk039760;
Mon, 17 Jun 2024 04:03:31 GMT
(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 45H43VHp039757;
Mon, 17 Jun 2024 04:03:31 GMT
(envelope-from git)
Date: Mon, 17 Jun 2024 04:03:31 GMT
Message-Id: <202406170403.45H43VHp039757@gitrepo.freebsd.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
dev-commits-src-branches@FreeBSD.org
From: Zhenlei Huang <zlei@FreeBSD.org>
Subject: git: f14b540dc4c1 - stable/14 - pfsync: Correctly check
if bpf peers are present
List-Id: Commits to the stable branches of the FreeBSD src repository <dev-commits-src-branches.freebsd.org>
List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches
List-Help: <mailto:dev-commits-src-branches+help@freebsd.org>
List-Post: <mailto:dev-commits-src-branches@freebsd.org>
List-Subscribe: <mailto:dev-commits-src-branches+subscribe@freebsd.org>
List-Unsubscribe: <mailto:dev-commits-src-branches+unsubscribe@freebsd.org>
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: f14b540dc4c17f6b60e23274153985fb7a2f0cb7
Auto-Submitted: auto-generated
The branch stable/14 has been updated by zlei:
URL: https://cgit.FreeBSD.org/src/commit/?id=f14b540dc4c17f6b60e23274153985fb7a2f0cb7
commit f14b540dc4c17f6b60e23274153985fb7a2f0cb7
Author: Zhenlei Huang <zlei@FreeBSD.org>
AuthorDate: 2024-06-09 01:05:22 +0000
Commit: Zhenlei Huang <zlei@FreeBSD.org>
CommitDate: 2024-06-17 04:00:02 +0000
pfsync: Correctly check if bpf peers are present
On creating the pfsync(4) interface, pfsync_clone_create() does an
unconditional bpfattach(). Use bpf_peers_present() which was introduced
in commit 16d878cc99ef [1] to check the presence of bpf peers.
This will save a little CPU cycles and memory usage when the
synchronisation interface is not configured and there is no bpf peers
present. There should be no functional change.
1. 16d878cc99ef Fix the following bpf(4) race condition which can result in a panic
Reviewed by: kp
MFC after: 1 week
Differential Revision: https://reviews.freebsd.org/D45533
(cherry picked from commit 2671bde99295d9e01d10316d0f3fb8b6d21f0f4d)
---
sys/netpfil/pf/if_pfsync.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/sys/netpfil/pf/if_pfsync.c b/sys/netpfil/pf/if_pfsync.c
index def06cd0c113..b188813cb8d1 100644
--- a/sys/netpfil/pf/if_pfsync.c
+++ b/sys/netpfil/pf/if_pfsync.c
@@ -1796,7 +1796,7 @@ pfsync_sendout(int schedswi, int c)
("%s: sc_len %zu", __func__, b->b_len));
PFSYNC_BUCKET_LOCK_ASSERT(b);
- if (ifp->if_bpf == NULL && sc->sc_sync_if == NULL) {
+ if (!bpf_peers_present(ifp->if_bpf) && sc->sc_sync_if == NULL) {
pfsync_drop(sc);
return;
}
@@ -1925,10 +1925,10 @@ pfsync_sendout(int schedswi, int c)
V_pfsyncstats.pfsyncs_oacts[PFSYNC_ACT_EOF]++;
/* we're done, let's put it on the wire */
- if (ifp->if_bpf) {
+ if (bpf_peers_present(ifp->if_bpf)) {
m->m_data += aflen;
m->m_len = m->m_pkthdr.len = len - aflen;
- BPF_MTAP(ifp, m);
+ bpf_mtap(ifp->if_bpf, m);
m->m_data -= aflen;
m->m_len = m->m_pkthdr.len = len;
}
From nobody Mon Jun 17 04:28: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 4W2cLm5Lqnz5NFql;
Mon, 17 Jun 2024 04:28: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 4W2cLm4mTHz4tVs;
Mon, 17 Jun 2024 04:28:00 +0000 (UTC)
(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
t=1718598480;
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=yqnzHO+qDazP9cJfxnM6bBGa4Rck1uOIiXuwAaKCLx4=;
b=Tk1lYho8cGtUuxlKYQ/eL2SjdqsSp9lXeGdf2wbbiBV/oaoc4a7a6OQWjfoTw/QM/b5oDM
xYF5LAdhIZ9Veg4kovcqPzW1QztpWM7zWn3Os8K7ieWrGJ4vey9aAXRK5N/z9RzKGncS3N
yk7hqTH5dXpyXvJVZ36fIgdWoO5mKQM9FO2MxU+LxmG/q0dEBYnzUyIRfVzWElB7lTgxzX
ug2sZAOF6ha0faFCagt9T4nm2wRpAe34bl9ECZr1CRjAAZ+15XaJajZaipH0Gg0N3neMxt
Pqn2cnDOo3+CQBJ9bhuM1/UBM7SFckCzKYTAwAayCMw65mbn+xzBH/rgOx5hIA==
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1718598480; a=rsa-sha256; cv=none;
b=HBI4eTqgESUDHRR/jXZR5irVuXKdIdAlnKOIJWJTS8I/qKOgSp5bzuSNG9n8ZcZ3jwX/7G
1GwZVRY4pR9duFXgFN7epf6WcAXiVTFUA+1W+cZoaIdW/KZuYyjnE9XpMhvTrQl9i0I1qh
nLdLDqaSto1UlvDFVe7JZ11l2AxF2Ilj5v/A7qfGezqCU0JCAPaBS1ih3fnGJ7A2Csp9vi
pIf8Z6OzZvYTp1ZuYqVriyyChi/7HiccBBYXGCv8L9O7H3tTsC5ql0fqtynSF9c94FmMR1
i0FU1ppsXIXbxSDCRkhpAQRMA6mQSiyfrRveqPpqxclbBXGu0plb+JszyIbWqg==
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=1718598480;
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=yqnzHO+qDazP9cJfxnM6bBGa4Rck1uOIiXuwAaKCLx4=;
b=dezyJfvL0IdPFfomEV7nAi/DWSS6j/2OtdXhC5Ym9sz4bIT5oipQ7Fmobhel2F79B+ZaUL
T4/UIBQf6j91tmeC9gPCFa3YlBxRBu2tNqTs/g23oGMUTyh1mivD2768lUwUiJtmMoM93j
kolnpzs9AJXoJC43Bt8hyCw2q0Xl/p7FF1deUpPCTWwn6r8dvInd3ZNNaX0y1npkpBANwZ
oiklYgypzKRTK8+oEM7WcDwyquZ0d18h+aUENlrWgdNBU6BAMbTUH1Yxe3IbnrQKCa4cgJ
keoedicwrwUEE73bv5OvRskKWI+sSNnDq0C36t2CnfLgacC4mKqDprxxuofrNg==
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 4W2cLm4Mpvz1GLx;
Mon, 17 Jun 2024 04:28: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 45H4S0lB073932;
Mon, 17 Jun 2024 04:28:00 GMT
(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 45H4S0To073929;
Mon, 17 Jun 2024 04:28:00 GMT
(envelope-from git)
Date: Mon, 17 Jun 2024 04:28:00 GMT
Message-Id: <202406170428.45H4S0To073929@gitrepo.freebsd.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
dev-commits-src-branches@FreeBSD.org
From: Zhenlei Huang <zlei@FreeBSD.org>
Subject: git: 43bb3553f1d5 - stable/13 - if_enc(4): Prefer the
boolean form when calling bpf_peers_present()
List-Id: Commits to the stable branches of the FreeBSD src repository <dev-commits-src-branches.freebsd.org>
List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches
List-Help: <mailto:dev-commits-src-branches+help@freebsd.org>
List-Post: <mailto:dev-commits-src-branches@freebsd.org>
List-Subscribe: <mailto:dev-commits-src-branches+subscribe@freebsd.org>
List-Unsubscribe: <mailto:dev-commits-src-branches+unsubscribe@freebsd.org>
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: 43bb3553f1d523eec20d4078bf9bdaa222323940
Auto-Submitted: auto-generated
The branch stable/13 has been updated by zlei:
URL: https://cgit.FreeBSD.org/src/commit/?id=43bb3553f1d523eec20d4078bf9bdaa222323940
commit 43bb3553f1d523eec20d4078bf9bdaa222323940
Author: Zhenlei Huang <zlei@FreeBSD.org>
AuthorDate: 2024-06-06 04:20:26 +0000
Commit: Zhenlei Huang <zlei@FreeBSD.org>
CommitDate: 2024-06-17 04:10:11 +0000
if_enc(4): Prefer the boolean form when calling bpf_peers_present()
No functional change intended.
MFC after: 1 week
(cherry picked from commit 215a18d502cba2cf57251e82a84484219f2c432a)
(cherry picked from commit a674f992a135728648908874034408d43b3d1903)
---
sys/net/if_enc.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sys/net/if_enc.c b/sys/net/if_enc.c
index cf7f763c33c6..752fbf207fb4 100644
--- a/sys/net/if_enc.c
+++ b/sys/net/if_enc.c
@@ -216,7 +216,7 @@ enc_bpftap(struct ifnet *ifp, struct mbuf *m, const struct secasvar *sav,
else if (hhook_type == HHOOK_TYPE_IPSEC_OUT &&
(enc & V_bpf_mask_out) == 0)
return;
- if (bpf_peers_present(ifp->if_bpf) == 0)
+ if (!bpf_peers_present(ifp->if_bpf))
return;
hdr.af = af;
hdr.spi = sav->spi;
From nobody Mon Jun 17 04:28: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 4W2cLn71Wlz5NGL2;
Mon, 17 Jun 2024 04:28: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 4W2cLn5Pjmz4thh;
Mon, 17 Jun 2024 04:28:01 +0000 (UTC)
(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
t=1718598481;
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=89Ak88Ug5DTFJ5lxryQ4ztavxRplTLrf+9IwGXtEUf4=;
b=e2n3nwhJRevW3WHXQKKDVWFssCRzeEw9KRe6X8d7J8jFSPZL7c4/GmAwYVTRzbI7GitZOi
gpv7NuISLvLM02INGvdpQXPSfGybNZGoB4p1vCMQczR30SAH2X99ibQeo8jBRKh4N8/7bb
RH3g3clc3UkbKzs1XP+w8npayP1w/h6ve/Kpguk1Raim8hFfqfL7kbdg4fistu895abgei
yJflOQfQDJ93Y1WEefzim46Aoz18OVrhztIAZQz591VwSV713DXzvg3QLgIxljZ6qE/+LF
zMRVzh6K3/HPFCxxDCaKgLd/23zypYYyDooUS/s30/7NdpOg+VZ+ca7h/3hq8Q==
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1718598481; a=rsa-sha256; cv=none;
b=r5s54XhxgHcdf2AxbLLVgJfEJh2O+kS22sn8CKe/SMqwehyD3nOqc3O/kWpOg5h7MRtBCe
KhjoJVdP81OotjcTK8J7McX7Y+Kt9JCtwwLtB4KL+eWI07lDuIYCFu4ZXbJOR/Mk0ClbuP
jGla4Mtb7YMguTC+ETMSw5GUtmbvGk8hKhgwc+oDJdsk1FG6/9H3YcxofqtlxXR5O3EsEt
Y+1eF3OVje1TsT/dpVjN7GhGCtj9yYFLVv2ClEUXIRPjM3Zmk0xgvgAkxcV3iEvrHqqt4U
u1xyxLioXGrS5Qn3lNTPKf8yslntFjSW5rSWMViK6SBIRkKDaJ7jJ/mzfZ1vJQ==
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=1718598481;
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=89Ak88Ug5DTFJ5lxryQ4ztavxRplTLrf+9IwGXtEUf4=;
b=EChoIrMjUAle8nPQaV6Q02TLhxWOSGLpWaokQooWxx1gMsvtF5J5aDgXD8E8udC3Ipan1u
fJAn4UyfrNkpNGPz0QP/GV3J341rgYSyVwDoBlfIRVqmKGM/zn2G1/Tfgz8m0h5Z58tlZ8
ct+VSfkEibQHbodS48UTjCiSaLMep3yw2qGzGwOmkrhETPQck5f9cVsqHoKASHH9+86nXT
6ebzCvfnyAt6OUlT4EZO6svX/lWRrQ5h80vRBT470Ue2jWv3BKBcUER2NUGUL7gTdJ/Y6P
ntvMrzn945qn2xXeB9KcPY7MuWW3zdtntP+Jkq20d+vWeEXen6waMh7N54N7nA==
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 4W2cLn51X9z1GJc;
Mon, 17 Jun 2024 04:28: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 45H4S1fC073985;
Mon, 17 Jun 2024 04:28:01 GMT
(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 45H4S1De073982;
Mon, 17 Jun 2024 04:28:01 GMT
(envelope-from git)
Date: Mon, 17 Jun 2024 04:28:01 GMT
Message-Id: <202406170428.45H4S1De073982@gitrepo.freebsd.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
dev-commits-src-branches@FreeBSD.org
From: Zhenlei Huang <zlei@FreeBSD.org>
Subject: git: d27149888c39 - stable/13 - bpf: Make bpf_peers_present
a boolean inline function
List-Id: Commits to the stable branches of the FreeBSD src repository <dev-commits-src-branches.freebsd.org>
List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches
List-Help: <mailto:dev-commits-src-branches+help@freebsd.org>
List-Post: <mailto:dev-commits-src-branches@freebsd.org>
List-Subscribe: <mailto:dev-commits-src-branches+subscribe@freebsd.org>
List-Unsubscribe: <mailto:dev-commits-src-branches+unsubscribe@freebsd.org>
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: d27149888c39fbf9a7cc174af50888cce0ca297d
Auto-Submitted: auto-generated
The branch stable/13 has been updated by zlei:
URL: https://cgit.FreeBSD.org/src/commit/?id=d27149888c39fbf9a7cc174af50888cce0ca297d
commit d27149888c39fbf9a7cc174af50888cce0ca297d
Author: Zhenlei Huang <zlei@FreeBSD.org>
AuthorDate: 2024-06-07 15:06:08 +0000
Commit: Zhenlei Huang <zlei@FreeBSD.org>
CommitDate: 2024-06-17 04:10:23 +0000
bpf: Make bpf_peers_present a boolean inline function
This function was introduced in commit [1] and is actually used as a
boolean function although it was not defined as so.
No functional change intended.
1. 16d878cc99ef Fix the following bpf(4) race condition which can result in a panic
Reviewed by: markj, kp, #network
MFC after: 1 week
Differential Revision: https://reviews.freebsd.org/D45509
(cherry picked from commit 0dfd11abc4bd0dcb96a6d287cc4e52e8f59b64c1)
(cherry picked from commit 6ad2e347fcf8fa6aa9ebd84cfa4c71a1af90b4dd)
---
sys/net/bpf.h | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)
diff --git a/sys/net/bpf.h b/sys/net/bpf.h
index 88331c2f663a..347b764735d0 100644
--- a/sys/net/bpf.h
+++ b/sys/net/bpf.h
@@ -431,15 +431,13 @@ int bpf_get_bp_params(struct bpf_if *, u_int *, u_int *);
void bpfilterattach(int);
u_int bpf_filter(const struct bpf_insn *, u_char *, u_int, u_int);
-static __inline int
+static __inline bool
bpf_peers_present(struct bpf_if *bpf)
{
struct bpf_if_ext *ext;
ext = (struct bpf_if_ext *)bpf;
- if (!CK_LIST_EMPTY(&ext->bif_dlist))
- return (1);
- return (0);
+ return (!CK_LIST_EMPTY(&ext->bif_dlist));
}
#define BPF_TAP(_ifp,_pkt,_pktlen) do { \
From nobody Mon Jun 17 04:28: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 4W2cLq1dszz5NGNd;
Mon, 17 Jun 2024 04:28: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 4W2cLp6r21z4twR;
Mon, 17 Jun 2024 04:28:02 +0000 (UTC)
(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
t=1718598483;
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=BfSswwa1rz2haaSlVTqQ+kpsHR/USrKt6SdrbLfn/ZM=;
b=Syi7XEfs8dEqJ0VBYIh7T5FnGAoPuCU3iW2770rHMBrkcoRqyaB2w8g0Rv6FmsLO9Oetjm
qv5VGMG7Q6Gyo93kpp31b1cqqmefK3v4377HbAmATlioAk1Q/fEsFsPZYf6S15tpQs3FWo
M6ErILaPL3ZOduOY7cGcX8tIYCNqNon3al6OTu7APjKFx4Qy0ccdB/v3pZC8AvoXOzu/y8
rkIjdIHBSNgLsUlFo2yhENNCTXrifp1VDZOxRP/bH1zfYgtatv8D/qvGfiEvLorRtR/2JF
JQA8Xfu4dFmdL/FiClsLkHh77W2SxotBcUZAlgvIZzh5T6KKLkXdNm8sp8VFYQ==
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1718598483; a=rsa-sha256; cv=none;
b=BJySJcuN/T//rN8KH9++77XFSQoR29LLGjZJ1oK3j5zh6+4axNdfVhzBslUfxnEVRZXaMw
zWW1KeqaytvMNbxk6Mu64hGw/DWw2d75pyzLa5UbRSsDVfmb/PcREL/DnA7l0MFrMQW5SW
EWvr4gyHB0h2ZCPoVsxU/i7gbErxMj2BbROKPi//oSrzNmrzz6d5YOwwL0aiUBuTcfC6o9
AJZDKv87euau0PE1uQts9rJegYK6gbXeHxVwjS4R1/OpzCpgymio5A4XMLrNUueb7X0q8A
hBfam+N8mV0GH143K/RAx2HYGbCZIEOoBMwjQHmspfJl8AOQ9W4Uf9ahdeXx7g==
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=1718598483;
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=BfSswwa1rz2haaSlVTqQ+kpsHR/USrKt6SdrbLfn/ZM=;
b=PiIA1TmqWcWeloJCt9k9VzQq2b/AFbEn9uWv+Q4XneHxZOXXjhu8Fngjx01ksFb/f3aaaX
SLn1Q7BX2Zm7yy4Le/I3PnCXv+7pxOQEvOFwkRH4Iw/qZ1SuQKdqk5XNpA5BmcAUj/MZbq
oL6PtXGtDaxsEVLUod7xnGVQ2ENn21OVQTFk6I33DNgm8kfIMCvJ1YbijHMbYtgkpFpAye
ms+CmdK5KAXf9G18A0qnCtRGTdsMOGYWQcJOD2eaRO51I/t/NyUA9aFgDtOykgzokGMr2i
NHuj+pQOtOR1YT/2v7wBiOLXMj4w4WDV5NekLM3uKc4SOZ+DLBUXbKxF59BWLA==
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 4W2cLp6M8kz1GM1;
Mon, 17 Jun 2024 04:28: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 45H4S2Re074037;
Mon, 17 Jun 2024 04:28:02 GMT
(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 45H4S2sx074034;
Mon, 17 Jun 2024 04:28:02 GMT
(envelope-from git)
Date: Mon, 17 Jun 2024 04:28:02 GMT
Message-Id: <202406170428.45H4S2sx074034@gitrepo.freebsd.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
dev-commits-src-branches@FreeBSD.org
From: Zhenlei Huang <zlei@FreeBSD.org>
Subject: git: cbea6b60da00 - stable/13 - pflog: Correctly check if
bpf peers are present
List-Id: Commits to the stable branches of the FreeBSD src repository <dev-commits-src-branches.freebsd.org>
List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches
List-Help: <mailto:dev-commits-src-branches+help@freebsd.org>
List-Post: <mailto:dev-commits-src-branches@freebsd.org>
List-Subscribe: <mailto:dev-commits-src-branches+subscribe@freebsd.org>
List-Unsubscribe: <mailto:dev-commits-src-branches+unsubscribe@freebsd.org>
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: cbea6b60da007bff698e508a10dd632c80c22b22
Auto-Submitted: auto-generated
The branch stable/13 has been updated by zlei:
URL: https://cgit.FreeBSD.org/src/commit/?id=cbea6b60da007bff698e508a10dd632c80c22b22
commit cbea6b60da007bff698e508a10dd632c80c22b22
Author: Zhenlei Huang <zlei@FreeBSD.org>
AuthorDate: 2024-06-09 01:05:22 +0000
Commit: Zhenlei Huang <zlei@FreeBSD.org>
CommitDate: 2024-06-17 04:10:35 +0000
pflog: Correctly check if bpf peers are present
On creating the pflog(4) interface, pflog_clone_create() does an
unconditional bpfattach(). Use bpf_peers_present() which was introduced
in commit 16d878cc99ef [1] to check the presence of bpf peers.
This will save a little CPU cycles when no bpf peers present. There
should be no functional change.
1. 16d878cc99ef Fix the following bpf(4) race condition which can result in a panic
Reviewed by: kp
MFC after: 1 week
Differential Revision: https://reviews.freebsd.org/D45532
(cherry picked from commit ebc2bab04823c24c524f913457d6b88dc7ea9fac)
(cherry picked from commit 954e548b7e88b7490aa5b23d16df7972c407bef1)
---
sys/netpfil/pf/if_pflog.c | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/sys/netpfil/pf/if_pflog.c b/sys/netpfil/pf/if_pflog.c
index 0f9c18654077..541625709494 100644
--- a/sys/netpfil/pf/if_pflog.c
+++ b/sys/netpfil/pf/if_pflog.c
@@ -207,9 +207,10 @@ pflog_packet(struct pfi_kkif *kif, struct mbuf *m, sa_family_t af, u_int8_t dir,
struct pfloghdr hdr;
if (kif == NULL || m == NULL || rm == NULL || pd == NULL)
- return ( 1);
+ return (1);
- if ((ifn = V_pflogifs[rm->logif]) == NULL || !ifn->if_bpf)
+ ifn = V_pflogifs[rm->logif];
+ if (ifn == NULL || !bpf_peers_present(ifn->if_bpf))
return (0);
bzero(&hdr, sizeof(hdr));
@@ -258,7 +259,7 @@ pflog_packet(struct pfi_kkif *kif, struct mbuf *m, sa_family_t af, u_int8_t dir,
if_inc_counter(ifn, IFCOUNTER_OPACKETS, 1);
if_inc_counter(ifn, IFCOUNTER_OBYTES, m->m_pkthdr.len);
- BPF_MTAP2(ifn, &hdr, PFLOG_HDRLEN, m);
+ bpf_mtap2(ifn->if_bpf, &hdr, PFLOG_HDRLEN, m);
return (0);
}
From nobody Mon Jun 17 04:28: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 4W2cLr2RFVz5NGR0;
Mon, 17 Jun 2024 04:28: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 4W2cLr0gQ9z4thv;
Mon, 17 Jun 2024 04:28:04 +0000 (UTC)
(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
t=1718598484;
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=eMUNenBFHdd9+69/jQKYj7+67Xlz7AQZcF2be7+OMRU=;
b=hBsFZJicOufgu1j6cdcRz02b0TT74tlTsC7YGOQ1yItwlqOPUEjD5StSdBFFQsUB4sZd21
Mv1IIRzljRir5+UgXpYQs0q+kcPwKHNLsIza//JAQofxifZqsuJHtvb9rg8JOc9+oa3vzR
ZZv8V1zPdydn6fY/6SvKb4nOJ2NnmjXnQGDPhufbtAiDIHQ/+wXAtBqrPxpoyPQhY2mBTt
VjSAwXA1qJNyZgcKqsx48OLjW3aO0xg7yxWyu9MOFqLiry3KvGmqyy90KNBvsoCUm2/4hJ
Y6kRdqbE8sYSoK7wxH/z74/j47mvsidQVHc1/quAW5LMtgg/UKtz7qWOT/Dreg==
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1718598484; a=rsa-sha256; cv=none;
b=ILKVhtyBQeU8ZtxeCIYRvY7sjlSa/6u2eLyPabBa4aopGfncmOuk8psxQ2ccsPHm9FqqLD
1TeU+CBeEL0iDEbMhtAfLAzef2YzWt3LAlUFg5A15RVIwvijjGIXK6/F9y6Tn0psVaYhbS
RKsLywurJicn5Ve8mAytEqaaejrfKgQW2qUcvtM5h14YoOcyQ6kDvJm6ZRcRjLlnWYaldx
wiZZuvgiB6t0hGyOL6SK6eM+Oq3xaTlt1rkvwODtCJzT0DDKA4lYME7azT129EuM7dU0a4
eVT1VdidNzDihzeu+w36pYRuLnYBJne2KakFUU7s5I0nJGI6Kst6ipVBbtgmdw==
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=1718598484;
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=eMUNenBFHdd9+69/jQKYj7+67Xlz7AQZcF2be7+OMRU=;
b=XlS50APFrRIeWNX7qt1mwGopew0dIXkem4naiQNE0v/IGM1bSgY3QKgNw3VJ0lDnnE7tVr
8m/1yA92mUYk3VNqNwHQ0PjUyuwLw0nYk99EPp+XkitY1WiklLtaVgtKnNOFKVwJCT3zR3
w3xhIP/Lj5ElZzqK2ZhdEFDCJlDcv23dUEdFtgChzf1EYPJ9cGnvD59hXgqe1EorUrtJqy
QdXcTNS1fpbxdWKImAZvSghOSkKl0opMjmieN1geJUe/FLfeFpBsW2mmOfPy38ibUQvqoW
d4kW7/718aKFsdlUtPj2e/e94Y40kIcBItDzAKV2Bfjah/5uuUBPEH4Zmjxdug==
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 4W2cLr0F00z1GJd;
Mon, 17 Jun 2024 04:28: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 45H4S3Yn074088;
Mon, 17 Jun 2024 04:28:03 GMT
(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 45H4S3lI074085;
Mon, 17 Jun 2024 04:28:03 GMT
(envelope-from git)
Date: Mon, 17 Jun 2024 04:28:03 GMT
Message-Id: <202406170428.45H4S3lI074085@gitrepo.freebsd.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
dev-commits-src-branches@FreeBSD.org
From: Zhenlei Huang <zlei@FreeBSD.org>
Subject: git: 0dddcc657676 - stable/13 - pfsync: Correctly check
if bpf peers are present
List-Id: Commits to the stable branches of the FreeBSD src repository <dev-commits-src-branches.freebsd.org>
List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches
List-Help: <mailto:dev-commits-src-branches+help@freebsd.org>
List-Post: <mailto:dev-commits-src-branches@freebsd.org>
List-Subscribe: <mailto:dev-commits-src-branches+subscribe@freebsd.org>
List-Unsubscribe: <mailto:dev-commits-src-branches+unsubscribe@freebsd.org>
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: 0dddcc6576768806aab1967289a349a65fe7cd3d
Auto-Submitted: auto-generated
The branch stable/13 has been updated by zlei:
URL: https://cgit.FreeBSD.org/src/commit/?id=0dddcc6576768806aab1967289a349a65fe7cd3d
commit 0dddcc6576768806aab1967289a349a65fe7cd3d
Author: Zhenlei Huang <zlei@FreeBSD.org>
AuthorDate: 2024-06-09 01:05:22 +0000
Commit: Zhenlei Huang <zlei@FreeBSD.org>
CommitDate: 2024-06-17 04:16:38 +0000
pfsync: Correctly check if bpf peers are present
On creating the pfsync(4) interface, pfsync_clone_create() does an
unconditional bpfattach(). Use bpf_peers_present() which was introduced
in commit 16d878cc99ef [1] to check the presence of bpf peers.
This will save a little CPU cycles and memory usage when the
synchronisation interface is not configured and there is no bpf peers
present. There should be no functional change.
1. 16d878cc99ef Fix the following bpf(4) race condition which can result in a panic
Reviewed by: kp
MFC after: 1 week
Differential Revision: https://reviews.freebsd.org/D45533
(cherry picked from commit 2671bde99295d9e01d10316d0f3fb8b6d21f0f4d)
(cherry picked from commit f14b540dc4c17f6b60e23274153985fb7a2f0cb7)
---
sys/netpfil/pf/if_pfsync.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/sys/netpfil/pf/if_pfsync.c b/sys/netpfil/pf/if_pfsync.c
index d4d3c521a568..1dde4e52e3f8 100644
--- a/sys/netpfil/pf/if_pfsync.c
+++ b/sys/netpfil/pf/if_pfsync.c
@@ -1587,7 +1587,7 @@ pfsync_sendout(int schedswi, int c)
("%s: sc_len %zu", __func__, b->b_len));
PFSYNC_BUCKET_LOCK_ASSERT(b);
- if (ifp->if_bpf == NULL && sc->sc_sync_if == NULL) {
+ if (!bpf_peers_present(ifp->if_bpf) && sc->sc_sync_if == NULL) {
pfsync_drop(sc);
return;
}
@@ -1689,10 +1689,10 @@ pfsync_sendout(int schedswi, int c)
V_pfsyncstats.pfsyncs_oacts[PFSYNC_ACT_EOF]++;
/* we're done, let's put it on the wire */
- if (ifp->if_bpf) {
+ if (bpf_peers_present(ifp->if_bpf)) {
m->m_data += sizeof(*ip);
m->m_len = m->m_pkthdr.len = b->b_len - sizeof(*ip);
- BPF_MTAP(ifp, m);
+ bpf_mtap(ifp->if_bpf, m);
m->m_data -= sizeof(*ip);
m->m_len = m->m_pkthdr.len = b->b_len;
}
From nobody Mon Jun 17 04:59: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 4W2d2m3pFXz5NJmb;
Mon, 17 Jun 2024 04:59: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 4W2d2m38ZWz3yJJ;
Mon, 17 Jun 2024 04:59:12 +0000 (UTC)
(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
t=1718600352;
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=36rIPS5YHYu+4HTKZ0FXkTIZMNh7ilIg3kY+uLw/8Eg=;
b=IPkSR7qUoNfmSTCx1eIuyocNNGbDhUHgflTY756UhgNRIJNYq3c94OhiR+6TILeyDsjf/4
WNBMfXrnjyR4eu7a2CxSMZn7a5XaFNnZuPPLw5SxXYsw+y+/2Q6hFOCQ6F10cRVTvqtJzk
VDnyYCMdKVDK81Z3CsukNq69VEuLAD3CpMe6Flohp3ktKfYdwWJucM0IxhOPTX+FVryH9y
DxTCkkl7mV5BkSPTqb/thmg8YcwATRHqD/tU1dU1/3edaSEBlziMRYgGbwSrGQ605GEqgH
HrlLeghw3hNJTrY6IS8/iKUsZrwcuVoTQCJfJtDwY0DTG4iQHo6CfGnn1e5i0w==
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1718600352; a=rsa-sha256; cv=none;
b=kcM2ZP2iWmRMKCSRrJCxnAVaPsxL0dMOeJjKHbRw6s4Mo3G6UMk78zyg33MsZLDJoKexxx
4zkN/Vn3EYhFocMiLHVqjPTA14JgAlxwU3LkY1HvUKd3oKf++KF2COHLqoJl3yieNj+aRT
/PCvLDmPnEaXxNtxJt+Oc4mJ4nwaawDymIzx/1Y8KUrjGJd8Ytay+Y/M3rwiwd6LQ2KZTe
00DQmNZlzwKrrlc/Yjs1rOz3vMpD70RYZDNOpDkNgkUaZFw3c6nP7BgFzK9bXdhRLYUXue
Rx2EGUj0HpAST0eTVTj3WWuX/Yr4w/xxFIZXtE560Rrz8bb2VbwhbOJb8yyeXA==
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=1718600352;
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=36rIPS5YHYu+4HTKZ0FXkTIZMNh7ilIg3kY+uLw/8Eg=;
b=VNBZ5OXeI5VqJUku5T5ecqhng2Nvps39ath0Y0ZWIWmhzR9AFZMzOOCXFcO2KCh31RlVu3
6v25Gdh83ua1A+MgeFXoD/vAJBmdv4breUVilbqZobZYIfV5qQCQQFLlDBzkA6tu0/tj5K
Yob3kZJWiOOSMgt3s7m/8GXB6+xsNqWNdp9eFo39M0BSXONiFH4zv001GK3JqFrhv9LnuF
RzPFrRjajCrizLeEYKcNQVHJYCC6momy9CQCPpQt/GA1XcD7esqU+dnppRkUlopXAkaH5H
nzco51y16+0PpwSnDdr1a2JdC+btMutv/E5G+NghakFlnWNCgyRdgJHxT/AHLw==
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 4W2d2m2dn3z1Ghv;
Mon, 17 Jun 2024 04:59: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 45H4xCKl024707;
Mon, 17 Jun 2024 04:59:12 GMT
(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 45H4xCU1024704;
Mon, 17 Jun 2024 04:59:12 GMT
(envelope-from git)
Date: Mon, 17 Jun 2024 04:59:12 GMT
Message-Id: <202406170459.45H4xCU1024704@gitrepo.freebsd.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
dev-commits-src-branches@FreeBSD.org
From: Eugene Grosbein <eugen@FreeBSD.org>
Subject: git: efb1717d21c2 - stable/14 - rc.subr(8): MFC: introduce
${name}_offcmd
List-Id: Commits to the stable branches of the FreeBSD src repository <dev-commits-src-branches.freebsd.org>
List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches
List-Help: <mailto:dev-commits-src-branches+help@freebsd.org>
List-Post: <mailto:dev-commits-src-branches@freebsd.org>
List-Subscribe: <mailto:dev-commits-src-branches+subscribe@freebsd.org>
List-Unsubscribe: <mailto:dev-commits-src-branches+unsubscribe@freebsd.org>
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: eugen
X-Git-Repository: src
X-Git-Refname: refs/heads/stable/14
X-Git-Reftype: branch
X-Git-Commit: efb1717d21c2cc488955914cb4fe9f3683b9cbe5
Auto-Submitted: auto-generated
The branch stable/14 has been updated by eugen:
URL: https://cgit.FreeBSD.org/src/commit/?id=efb1717d21c2cc488955914cb4fe9f3683b9cbe5
commit efb1717d21c2cc488955914cb4fe9f3683b9cbe5
Author: Eugene Grosbein <eugen@FreeBSD.org>
AuthorDate: 2024-06-02 19:13:42 +0000
Commit: Eugene Grosbein <eugen@FreeBSD.org>
CommitDate: 2024-06-17 04:57:53 +0000
rc.subr(8): MFC: introduce ${name}_offcmd
New variable ${name}_offcmd may be used to supply commands
executed if named service is not enabled. Previously start_precmd
could be used for such a task but now rc.subr(8) does not call it
if a service is not enabled.
Fix devd startup script to use it instead of start_precmd.
PR: 279198
Reported by: Dmitry S. Lukhtionov
Tested by: Dmitry S. Lukhtionov
(cherry picked from commit 32a579e4fc69a65e8901111ad5f65ec56a97dfab)
(cherry picked from commit c2db3a0c7d31116028b38b426a9b139d26cbc7e5)
---
libexec/rc/rc.d/devd | 7 +++----
libexec/rc/rc.subr | 25 +++++++++++++++++++++----
share/man/man8/rc.subr.8 | 4 +++-
3 files changed, 27 insertions(+), 9 deletions(-)
diff --git a/libexec/rc/rc.d/devd b/libexec/rc/rc.d/devd
index 43fb9d5928dd..fe19abd817b4 100755
--- a/libexec/rc/rc.d/devd
+++ b/libexec/rc/rc.d/devd
@@ -14,7 +14,8 @@ desc="Device state change daemon"
rcvar="devd_enable"
command="/sbin/${name}"
-start_precmd=${name}_prestart
+devd_offcmd=devd_off
+start_precmd=find_pidfile
stop_precmd=find_pidfile
find_pidfile()
@@ -26,10 +27,8 @@ find_pidfile()
fi
}
-devd_prestart()
+devd_off()
{
- find_pidfile
-
# If devd is disabled, turn it off in the kernel to avoid unnecessary
# memory usage.
if ! checkyesno ${rcvar}; then
diff --git a/libexec/rc/rc.subr b/libexec/rc/rc.subr
index 332718dc6f2c..a662b878860b 100644
--- a/libexec/rc/rc.subr
+++ b/libexec/rc/rc.subr
@@ -816,6 +816,8 @@ startmsg()
#
# ${name}_limits n limits(1) to apply to ${command}.
#
+# ${name}_offcmd n If set, run if a service is not enabled.
+#
# ${rc_arg}_cmd n If set, use this as the method when invoked;
# Otherwise, use default command (see below)
#
@@ -1051,13 +1053,13 @@ run_rc_command()
-a "$rc_arg" != "describe" -a "$rc_arg" != "status" ] ||
[ -n "${rcvar}" -a "$rc_arg" = "stop" -a -z "${rc_pid}" ]; then
if ! checkyesno ${rcvar}; then
- if [ -n "${rc_quiet}" ]; then
- return 0
- fi
+ [ "$rc_arg" = "start" ] && _run_rc_offcmd
+ if [ -z "${rc_quiet}" ]; then
echo -n "Cannot '${rc_arg}' $name. Set ${rcvar} to "
echo -n "YES in /etc/rc.conf or use 'one${rc_arg}' "
echo "instead of '${rc_arg}'."
- return 0
+ fi
+ return 0
fi
fi
@@ -1347,10 +1349,25 @@ $_cpusetcmd $command $rc_flags $command_args"
#
# name R/W
# ------------------
+# _offcmd R
# _precmd R
# _postcmd R
# _return W
#
+_run_rc_offcmd()
+{
+ eval _offcmd=\$${name}_offcmd
+ if [ -n "$_offcmd" ]; then
+ if [ -n "$_env" ]; then
+ eval "export -- $_env"
+ fi
+ debug "run_rc_command: ${name}_offcmd: $_offcmd $rc_extra_args"
+ eval "$_offcmd $rc_extra_args"
+ _return=$?
+ fi
+ return 0
+}
+
_run_rc_precmd()
{
check_required_before "$rc_arg" || return 1
diff --git a/share/man/man8/rc.subr.8 b/share/man/man8/rc.subr.8
index 3e3ff8c8d1e1..3037840007a4 100644
--- a/share/man/man8/rc.subr.8
+++ b/share/man/man8/rc.subr.8
@@ -27,7 +27,7 @@
.\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
.\" POSSIBILITY OF SUCH DAMAGE.
.\"
-.Dd August 16, 2022
+.Dd June 2, 2024
.Dt RC.SUBR 8
.Os
.Sh NAME
@@ -631,6 +631,8 @@ Login class to use with
.Va ${name}_limits .
Defaults to
.Dq Li daemon .
+.It Va ${name}_offcmd
+Shell commands to run if a service is not enabled.
.It Va ${name}_oomprotect
.Xr protect 1
.Va command
From nobody Mon Jun 17 05:07:47 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 4W2dDg2521z5NKB7;
Mon, 17 Jun 2024 05:07:47 +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 4W2dDg1VSKz40rX;
Mon, 17 Jun 2024 05:07:47 +0000 (UTC)
(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
t=1718600867;
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=k7yjoaHGmdBHLrl3+Bb/YkZv60mVt2daQR+9zy1ySEA=;
b=xvdl2t+xYpQlNIYSgEoqEFN0VypRLQ+B5l8Ua1woYC24SapNlCqPldpivfoD49g8zB8LFv
IJ+05FR4R125N0kOM6F+5grn6CSNg0x256Y8u80xeOjEOourjZIxU0pLw7Y68NVj/GSfu/
uqTbwwd0EpW10PwlRwP08n6LiiGkFztRMzLNqCEOfdr6cGOb7xanRhCOTBkFQdS9LUqacI
jHgJDp4oZLCmnhcR+K7ef0ABx3Vv114OgC4ml4SUrdLLfHh0/1qK0IAZXbyYgR2vBaw90I
UrjPpxvNOXlXJVPQmIg19H171EbVZzj+jILLrqMuy8fx9yjoY8zfWhws96f6kw==
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1718600867; a=rsa-sha256; cv=none;
b=IH3dL7DybJQd3gPNUduv11imnEr3AH9Ftt7/3JxleTZ8iwwa1GFSn5wYyE6GCzQBnrYJfX
6Hd8oSWpd+9XHsWs6rXIggAdcmIBcCtmXD3YoOtQ+bRTsfK8I1iYgIDNzbsTD9StDdtqTx
VYCQbX/NbENJylS4wAjZmecDWkr0XE60FtC7o9cJwaIj0n+xmpYEMkC8GdyAFylYhXrwHn
A+AVAfn9v7U7123Gl0Rbk43YV/YIQHFBohdJP+5Jl4Fvmfv1kosrb1gVX6m8YWYBr1dMr/
wd6GLTrEmVtk7yk/QIVzpQeQP5LthjwvxwR4H6TmDOH/4FoKFDveHEeC2z/5jg==
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=1718600867;
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=k7yjoaHGmdBHLrl3+Bb/YkZv60mVt2daQR+9zy1ySEA=;
b=k35oQ26zm2L0d6tFsHQX5tDRm2s+Ckwk1dY+K01+P5/lpgX3t4eR46Fh1shEjm/wbWszC1
Ijgj9IePlUcrKmsF3rgrcC6lfqFAyu7I2bzkVhKpCrhQaMVC1OkCOFB9w+/5C5v33oxYEa
kg4ESQsw5KmszA/uUDyE5fxRYwhroU2Ajm5EUw3O9qzdmCMxmgwQzfSGG8nwMNR22sIzQg
hV8QYWGUZ2uosyVROE6CLHyBoHkelRzoJRbyu9YwrNUcEyOaXLAf7IsvaCvYBeYKAjvbvy
mcij40WEkk4DVQqoRXyTyira/33A5G1RQ9wioipFiTP3pvms5h79qZUSrxjDzQ==
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 4W2dDg0zXGz1Gcw;
Mon, 17 Jun 2024 05:07:47 +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 45H57ltK042283;
Mon, 17 Jun 2024 05:07:47 GMT
(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 45H57lVY042280;
Mon, 17 Jun 2024 05:07:47 GMT
(envelope-from git)
Date: Mon, 17 Jun 2024 05:07:47 GMT
Message-Id: <202406170507.45H57lVY042280@gitrepo.freebsd.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
dev-commits-src-branches@FreeBSD.org
From: Eugene Grosbein <eugen@FreeBSD.org>
Subject: git: 61d43332e688 - stable/13 - rc.subr(8): MFC: introduce
${name}_offcmd
List-Id: Commits to the stable branches of the FreeBSD src repository <dev-commits-src-branches.freebsd.org>
List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches
List-Help: <mailto:dev-commits-src-branches+help@freebsd.org>
List-Post: <mailto:dev-commits-src-branches@freebsd.org>
List-Subscribe: <mailto:dev-commits-src-branches+subscribe@freebsd.org>
List-Unsubscribe: <mailto:dev-commits-src-branches+unsubscribe@freebsd.org>
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: eugen
X-Git-Repository: src
X-Git-Refname: refs/heads/stable/13
X-Git-Reftype: branch
X-Git-Commit: 61d43332e6882c6c3c3be1473d38db3a9803b32d
Auto-Submitted: auto-generated
The branch stable/13 has been updated by eugen:
URL: https://cgit.FreeBSD.org/src/commit/?id=61d43332e6882c6c3c3be1473d38db3a9803b32d
commit 61d43332e6882c6c3c3be1473d38db3a9803b32d
Author: Eugene Grosbein <eugen@FreeBSD.org>
AuthorDate: 2024-06-02 19:13:42 +0000
Commit: Eugene Grosbein <eugen@FreeBSD.org>
CommitDate: 2024-06-17 05:06:59 +0000
rc.subr(8): MFC: introduce ${name}_offcmd
New variable ${name}_offcmd may be used to supply commands
executed if named service is not enabled. Previously start_precmd
could be used for such a task but now rc.subr(8) does not call it
if a service is not enabled.
Fix devd startup script to use it instead of start_precmd.
PR: 279198
Reported by: Dmitry S. Lukhtionov
Tested by: Dmitry S. Lukhtionov
(cherry picked from commit 32a579e4fc69a65e8901111ad5f65ec56a97dfab)
(cherry picked from commit c2db3a0c7d31116028b38b426a9b139d26cbc7e5)
---
libexec/rc/rc.d/devd | 7 +++----
libexec/rc/rc.subr | 25 +++++++++++++++++++++----
share/man/man8/rc.subr.8 | 4 +++-
3 files changed, 27 insertions(+), 9 deletions(-)
diff --git a/libexec/rc/rc.d/devd b/libexec/rc/rc.d/devd
index 43fb9d5928dd..fe19abd817b4 100755
--- a/libexec/rc/rc.d/devd
+++ b/libexec/rc/rc.d/devd
@@ -14,7 +14,8 @@ desc="Device state change daemon"
rcvar="devd_enable"
command="/sbin/${name}"
-start_precmd=${name}_prestart
+devd_offcmd=devd_off
+start_precmd=find_pidfile
stop_precmd=find_pidfile
find_pidfile()
@@ -26,10 +27,8 @@ find_pidfile()
fi
}
-devd_prestart()
+devd_off()
{
- find_pidfile
-
# If devd is disabled, turn it off in the kernel to avoid unnecessary
# memory usage.
if ! checkyesno ${rcvar}; then
diff --git a/libexec/rc/rc.subr b/libexec/rc/rc.subr
index 04b30cac40a7..8ae0744939d0 100644
--- a/libexec/rc/rc.subr
+++ b/libexec/rc/rc.subr
@@ -811,6 +811,8 @@ startmsg()
#
# ${name}_limits n limits(1) to apply to ${command}.
#
+# ${name}_offcmd n If set, run if a service is not enabled.
+#
# ${rc_arg}_cmd n If set, use this as the method when invoked;
# Otherwise, use default command (see below)
#
@@ -1024,13 +1026,13 @@ run_rc_command()
-a "$rc_arg" != "describe" -a "$rc_arg" != "status" ] ||
[ -n "${rcvar}" -a "$rc_arg" = "stop" -a -z "${rc_pid}" ]; then
if ! checkyesno ${rcvar}; then
- if [ -n "${rc_quiet}" ]; then
- return 0
- fi
+ [ "$rc_arg" = "start" ] && _run_rc_offcmd
+ if [ -z "${rc_quiet}" ]; then
echo -n "Cannot '${rc_arg}' $name. Set ${rcvar} to "
echo -n "YES in /etc/rc.conf or use 'one${rc_arg}' "
echo "instead of '${rc_arg}'."
- return 0
+ fi
+ return 0
fi
fi
@@ -1319,10 +1321,25 @@ $command $rc_flags $command_args"
#
# name R/W
# ------------------
+# _offcmd R
# _precmd R
# _postcmd R
# _return W
#
+_run_rc_offcmd()
+{
+ eval _offcmd=\$${name}_offcmd
+ if [ -n "$_offcmd" ]; then
+ if [ -n "$_env" ]; then
+ eval "export -- $_env"
+ fi
+ debug "run_rc_command: ${name}_offcmd: $_offcmd $rc_extra_args"
+ eval "$_offcmd $rc_extra_args"
+ _return=$?
+ fi
+ return 0
+}
+
_run_rc_precmd()
{
check_required_before "$rc_arg" || return 1
diff --git a/share/man/man8/rc.subr.8 b/share/man/man8/rc.subr.8
index 3fef4a60f8b4..b9713eb65a3c 100644
--- a/share/man/man8/rc.subr.8
+++ b/share/man/man8/rc.subr.8
@@ -27,7 +27,7 @@
.\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
.\" POSSIBILITY OF SUCH DAMAGE.
.\"
-.Dd March 18, 2022
+.Dd June 2, 2024
.Dt RC.SUBR 8
.Os
.Sh NAME
@@ -631,6 +631,8 @@ Login class to use with
.Va ${name}_limits .
Defaults to
.Dq Li daemon .
+.It Va ${name}_offcmd
+Shell commands to run if a service is not enabled.
.It Va ${name}_oomprotect
.Xr protect 1
.Va command
From nobody Mon Jun 17 14:35: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 4W2sqb6LWCz5P0ZR;
Mon, 17 Jun 2024 14:35: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 4W2sqb5kbyz4w5k;
Mon, 17 Jun 2024 14:35:23 +0000 (UTC)
(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
t=1718634923;
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=YywvXzNtO4LenKEtBl9hdRqIWKl4/5+l9gDV5OXaLR0=;
b=Vgln/n2eh+dM/Nlh5RSxCGdJRD4mJsiAHRTjKh4Dg76F3R5RQ74gGR38pHTYpYiTuahKkc
vw6tJABAFVqAHlbx3ziSf71GyT+sWHBxA3SzfRIlKkghopxIrQvcCqK43xAloELT3b9VkF
a2wGdqD+zudn/5VgUEizpZRnejRfjCerzpIWQ8hg8CAevlIBNncdFgCgveurEBnxEyKRa9
B7nSd9x43vbYwq541oC3fdEZWicF9yGusOA3OTV1TUi5XNzfp9SDkvpkgHyh2mYYfJ6Oga
e5hmSA5/08+bFLIpbkDI1T7Rge8JDsjeYW/u8AvaqlAvOgziRLiugd683scHZQ==
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1718634923; a=rsa-sha256; cv=none;
b=Cnc3U0/wheWUUs/rc6Pj7PDYncqn2+RNFIkZput9G4aWxFscbW8xaTLb/i+qgrTuK6Y5Pt
bTm6mVgLj09MoPZE9XX2Yeq2dtCapPMv0SWAAU5dtgo3b8ZDDElYu0WeidkZ2OKmg3pPJk
jCrdRrd4D5ggK6RN8MzLCxqWoYBZswnY63VN3TiwakEnDUsFnEG8WynkR5RJThyFEd/06U
Uw46hFnAKlGR5AtQxg438GwLKyNIf2yikPA2O9jgqdSwQBYCEIeQv2PjO1CpF6MSBixTZC
9bO+frxfQYvGZAYah3PP7C0jV6pUv9kvtynGzE7KyorGXr92m6FQcBljRBWqqQ==
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=1718634923;
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=YywvXzNtO4LenKEtBl9hdRqIWKl4/5+l9gDV5OXaLR0=;
b=SNczyWvZxPtSkPlt9T0Tn/XrRf5+Yhfqb7/gHMa9RT7WtJV5cuYLVKHcuiy+kRlyUfVmUu
nrxsIijCVMmXAOSrqffY1ODWqFVrbNlEhOmsCHGhKk288VcO4yT6CBM22XAuRrIORFo/gI
mZgtTJSvwap1xMibk8agXlAnz+FKnyhkWDm+aoVg5vhqTeUfbQprKfq8Y94er93ExmH2bq
kZjPsO4gbjv94cAxrQjif193+XZ8Lenk1y0chHm1GLsmCZHDDToPx+Qu+38TppF4nT8A+q
e1vkySP/hfcYCJ7JtYh1nBh7n13jrQ49xpoUn2vVtx0QAK0QBQCyFNoO1+Emrg==
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 4W2sqb4q8GzKVX;
Mon, 17 Jun 2024 14:35: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 45HEZN3p004347;
Mon, 17 Jun 2024 14:35:23 GMT
(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 45HEZNH9004344;
Mon, 17 Jun 2024 14:35:23 GMT
(envelope-from git)
Date: Mon, 17 Jun 2024 14:35:23 GMT
Message-Id: <202406171435.45HEZNH9004344@gitrepo.freebsd.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
dev-commits-src-branches@FreeBSD.org
From: Mark Johnston <markj@FreeBSD.org>
Subject: git: 6d451a20ef70 - stable/14 - libdtrace: Work around a
warning from flex
List-Id: Commits to the stable branches of the FreeBSD src repository <dev-commits-src-branches.freebsd.org>
List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches
List-Help: <mailto:dev-commits-src-branches+help@freebsd.org>
List-Post: <mailto:dev-commits-src-branches@freebsd.org>
List-Subscribe: <mailto:dev-commits-src-branches+subscribe@freebsd.org>
List-Unsubscribe: <mailto:dev-commits-src-branches+unsubscribe@freebsd.org>
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: 6d451a20ef70b9a0005442924dfd4ceaddd4c2b4
Auto-Submitted: auto-generated
The branch stable/14 has been updated by markj:
URL: https://cgit.FreeBSD.org/src/commit/?id=6d451a20ef70b9a0005442924dfd4ceaddd4c2b4
commit 6d451a20ef70b9a0005442924dfd4ceaddd4c2b4
Author: Mark Johnston <markj@FreeBSD.org>
AuthorDate: 2024-06-01 15:16:26 +0000
Commit: Mark Johnston <markj@FreeBSD.org>
CommitDate: 2024-06-17 13:27:24 +0000
libdtrace: Work around a warning from flex
When compiling dt_lex.l, flex produces warnings of the form:
dt_lex.l:413: warning, trailing context made variable due to preceding '|' action
dt_lex.l:412: warning, dangerous trailing context
dt_lex.l:412: warning, dangerous trailing context
Here, trailing context refers to the use of "$", which expands to "/\n".
The meaning behind these warnings is described in the first two
paragraphs of the flex manual's DEFICIENCIES/BUGS section:
Some trailing context patterns cannot be properly matched and generate
warning messages ("dangerous trailing context"). These are patterns
where the ending of the first part of the rule matches the beginning of
the second part, such as "zx*/xy*", where the 'x*' matches the 'x' at
the beginning of the trailing context. (Note that the POSIX draft
states that the text matched by such patterns is undefined.)
For some trailing context rules, parts which are actually fixed-length
are not recognized as such, leading to the above mentioned performance
loss. In particular, parts using '|' or {n} (such as "foo{3}") are
always considered variable-length.
Here, the warnings appear to be bogus in this case. The lexer has no
problem matching either of the referenced patterns, e.g.,
printf("foobar
or
# 1 "asdfasdf
Introduce a small amount of code duplication to silence the warning.
MFC after: 2 weeks
(cherry picked from commit 4bddff0833d3efee77a099b3ef447fbae1e63d21)
---
cddl/contrib/opensolaris/lib/libdtrace/common/dt_lex.l | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/cddl/contrib/opensolaris/lib/libdtrace/common/dt_lex.l b/cddl/contrib/opensolaris/lib/libdtrace/common/dt_lex.l
index d50369bb57c9..756a48b9c45f 100644
--- a/cddl/contrib/opensolaris/lib/libdtrace/common/dt_lex.l
+++ b/cddl/contrib/opensolaris/lib/libdtrace/common/dt_lex.l
@@ -407,7 +407,7 @@ if (yypcb->pcb_token != 0) {
<S0>{RGX_FP} yyerror("floating-point constants are not permitted\n");
-<S0>\"{RGX_STR}$ |
+<S0>\"{RGX_STR}$ xyerror(D_STR_NL, "newline encountered in string literal");
<S3>\"{RGX_STR}$ xyerror(D_STR_NL, "newline encountered in string literal");
<S0>\"{RGX_STR}\" |
From nobody Mon Jun 17 14:35: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 4W2sqc6bktz5P0T5;
Mon, 17 Jun 2024 14:35: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 4W2sqc63Nqz4vjl;
Mon, 17 Jun 2024 14:35:24 +0000 (UTC)
(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
t=1718634924;
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=YRuc2yoz7GtCIIF8jQboRKye7IZ89ZUGIAv4tjrbplE=;
b=OOP6rZJBzW/ovgiNzOcVHSSrr+WKx24Tza6HM/zpOSD7sB+7z0fOQhNXG4FpKyIooqwy8B
M3mus0PA12PeRJ9Mbyf8i5k8PwIimwAv8dsE9LWo9O0i0yaq5BwagfJyjg48O0/R364XT5
KmLJxL/HI6U7cn1FhAHXk44ZKxHW9yIQwnUVw34NvB5zMlzmYAn0Fxnr+xZllpkgncN1js
Gh4cP2C3XbQtE/nXEx3tLAqeiCxEJemjLhql8QZp927p+7C2Q5McXDY6i0aUl5T2Z6ZTsF
/ZJTmvGvNH5V/e1xAwtZLcvO5cdhCwXge6dPtpd1PNf6JdDd5ZcTnEhUfuAiPA==
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1718634924; a=rsa-sha256; cv=none;
b=ZSXBitS+qNxxyQXlQJl5CFSnTRrOgZ5Ex9wvJfksBU1kke/4cdcFt28GK/46TTKOTHwnoF
O2QFfE4UhS5Pzi6rWkZqdVaSnlKwnEzKCN5dEkSkvYI63aULzevcT3WSLIEealPI9NDkOn
BBetxi0SvTuo/+RJrxzEqzlg1rJ6Kg4nuWtet64aPZxEarhJJUs4GIUG8iVUpS/radbMTi
QLTNOa49hVcGK+r9AxrgrXlWweEJElCXfZoA6gugXOOAGF+HYnAWOUin8D8Eept9KiTxW8
mTRpGxa0gjcCtfOzjH3J2RtJ4FgLwYn+zOyeD7m2HZkDgp4cGxrnzHgwya3mow==
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=1718634924;
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=YRuc2yoz7GtCIIF8jQboRKye7IZ89ZUGIAv4tjrbplE=;
b=xu0vcwTdWRFTbcUAvS/Fi5JkGmE5BuTJS//uXebQMSHJTlbyx6gcMG/G3XJLIoA1Py6A9M
bJUheJIdGQS5F/peFWAiCBS5WDe54JxG0NxqpZZFBvi+349c10KBG/bu2hXwiZD3H0fxnL
Rfl5VPmkjpp71PpD6OT3c4dhbyRo1Wr0qDguYcLrb9mEBywgO0D/1MNxni/WOLqV1ZPR9p
Wj/yxzwp90mjASCCNEC+rqn+dFGi30/3dFq8Wzut4b/0GBBzz97GqjvqRQD97IXqbViT9N
qv33VlcPwa2SBoN8IdmK4JQS1HrKZ+t84KAOBmwRAy9MfCK6PhvIBOzH5PsRiQ==
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 4W2sqc5fZ9zKVY;
Mon, 17 Jun 2024 14:35: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 45HEZO5w004403;
Mon, 17 Jun 2024 14:35:24 GMT
(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 45HEZOZj004400;
Mon, 17 Jun 2024 14:35:24 GMT
(envelope-from git)
Date: Mon, 17 Jun 2024 14:35:24 GMT
Message-Id: <202406171435.45HEZOZj004400@gitrepo.freebsd.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
dev-commits-src-branches@FreeBSD.org
From: Mark Johnston <markj@FreeBSD.org>
Subject: git: 1c27279ed22d - stable/14 - Destroy ARC buffer in case
of fill error
List-Id: Commits to the stable branches of the FreeBSD src repository <dev-commits-src-branches.freebsd.org>
List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches
List-Help: <mailto:dev-commits-src-branches+help@freebsd.org>
List-Post: <mailto:dev-commits-src-branches@freebsd.org>
List-Subscribe: <mailto:dev-commits-src-branches+subscribe@freebsd.org>
List-Unsubscribe: <mailto:dev-commits-src-branches+unsubscribe@freebsd.org>
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: 1c27279ed22d2b5226f31836da041bae45a9c77b
Auto-Submitted: auto-generated
The branch stable/14 has been updated by markj:
URL: https://cgit.FreeBSD.org/src/commit/?id=1c27279ed22d2b5226f31836da041bae45a9c77b
commit 1c27279ed22d2b5226f31836da041bae45a9c77b
Author: Alexander Motin <mav@FreeBSD.org>
AuthorDate: 2024-05-25 02:11:18 +0000
Commit: Mark Johnston <markj@FreeBSD.org>
CommitDate: 2024-06-17 14:25:59 +0000
Destroy ARC buffer in case of fill error
In case of error dmu_buf_fill_done() returns the buffer back into
DB_UNCACHED state. Since during transition from DB_UNCACHED into
DB_FILL state dbuf_noread() allocates an ARC buffer, we must free
it here, otherwise it will be leaked.
Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
Reviewed-by: Jorgen Lundman <lundman@lundman.net>
Signed-off-by: Alexander Motin <mav@FreeBSD.org>
Sponsored by: iXsystems, Inc.
Closes #15665
Closes #15802
Closes #16216
PR: 276341
(cherry picked from commit 02c5aa9b092818785ed8db4e2246a828278138e3)
---
sys/contrib/openzfs/module/zfs/dbuf.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/sys/contrib/openzfs/module/zfs/dbuf.c b/sys/contrib/openzfs/module/zfs/dbuf.c
index bb921af6d78a..0576da6475b1 100644
--- a/sys/contrib/openzfs/module/zfs/dbuf.c
+++ b/sys/contrib/openzfs/module/zfs/dbuf.c
@@ -2840,6 +2840,7 @@ dmu_buf_fill_done(dmu_buf_t *dbuf, dmu_tx_t *tx, boolean_t failed)
failed = B_FALSE;
} else if (failed) {
VERIFY(!dbuf_undirty(db, tx));
+ arc_buf_destroy(db->db_buf, db);
db->db_buf = NULL;
dbuf_clear_data(db);
DTRACE_SET_STATE(db, "fill failed");
From nobody Tue Jun 18 14:20: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 4W3TST5MJVz5Nt2M;
Tue, 18 Jun 2024 14:20: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 4W3TST4sXpz4RrB;
Tue, 18 Jun 2024 14:20:57 +0000 (UTC)
(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
t=1718720457;
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=N9JO1LM9PvzEtb8/WXvlOJaI8jqd6lbhgkH11xX5+MY=;
b=LWG9OuqeZvAjafLoPs9OpNfmdz+IYM8tr17jt97C1fhUSOVvHmF5hzorE9msTsxeJQrAAe
VUhg+iMWqLsLxchCihNVELFDZP/KrwTVXkGwhuS8YL3x4rakRHcV3bnd52mzo1xBO00OJf
8R4YBuRy9jXDu9MVetvcw6LSO/RddOuMfH6PAyZRbDIoIGIPjCVBlaAD26/D/S2VBAm+I9
xNvQu0JxL6bc4N4Rklf0u5x+xmZRhfM1ERxeUyeVdcYwTV+GeglMB/GQy6QpBe07rsOBTL
Sb77X5xJhAhlqi4fP4GGImBE3X5ec5klWhTO0S3rxP8b+GGN0rseOB63PYqVNg==
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1718720457; a=rsa-sha256; cv=none;
b=SQiK6NGisIyBmgzpVeUf1DLo9OcUaiySiDWYA0zAYlR44v9g3d0mYoRE706i7KiemT+BFI
nu0VOtmTRZ6l9OdIWeWRKuZwfBGRJkbjcA3ZrQW9c0ql1EOgOafJxti/3k6UsqcmcljCDc
lEcqYEpk7hxzmjli5HzCyMAmp4WsVUOR8KQ9OjAuST1olIkWmezNRCkw6wLiTYORlKCKto
w65ZC9ZLecv7lnO06i2O8zO6onvlMR3+9R9WHmZscxtIeJYKyKZ2wZNadEUqTbnybHwnOE
pGtJ6KvIwcVLITgZFmYe4dJW29P0WC2BPpa/0aBRJrzlKMw0QNwvCFUbZL4rkQ==
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=1718720457;
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=N9JO1LM9PvzEtb8/WXvlOJaI8jqd6lbhgkH11xX5+MY=;
b=OGYmkv5j9speJ3CnL0gz8tw2mYamiXU11wWSs11VR4CosF12dA1EpTdRn+Y2TrfawlS/SI
PqzR6wM0Y67Qw8IPG2kRL0kxkBr7YrHi8GHcaKS37vO3m3M/T9PrOTXfyLdO759F5OyOKa
vkA8z8x1KoyinNviIJEZbchYiwWnVLu6BAKJczMr8c5c+rIQWAMd+Xhv+tk6UVp1TVaUuN
4L/UjEhgz/gIdNVzt+CDCxV2P5pJ/1AjtjFrig1VYlCbKZn23/UWAK/3usSEiMXuz2aM4Y
MqybzpfYuRAV4CMHQpsNVqTr4PjkKOtWy7QhYmkfFQoDfGsmyg0KRjQLmcJ4ug==
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 4W3TST4SyPz1222;
Tue, 18 Jun 2024 14:20:57 +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 45IEKvSn027164;
Tue, 18 Jun 2024 14:20:57 GMT
(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 45IEKvlx027161;
Tue, 18 Jun 2024 14:20:57 GMT
(envelope-from git)
Date: Tue, 18 Jun 2024 14:20:57 GMT
Message-Id: <202406181420.45IEKvlx027161@gitrepo.freebsd.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
dev-commits-src-branches@FreeBSD.org
From: Ed Maste <emaste@FreeBSD.org>
Subject: git: 6e1a7ade2169 - stable/13 - mergemaster: postpone
removal to FreeBSD 15
List-Id: Commits to the stable branches of the FreeBSD src repository <dev-commits-src-branches.freebsd.org>
List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches
List-Help: <mailto:dev-commits-src-branches+help@freebsd.org>
List-Post: <mailto:dev-commits-src-branches@freebsd.org>
List-Subscribe: <mailto:dev-commits-src-branches+subscribe@freebsd.org>
List-Unsubscribe: <mailto:dev-commits-src-branches+unsubscribe@freebsd.org>
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: emaste
X-Git-Repository: src
X-Git-Refname: refs/heads/stable/13
X-Git-Reftype: branch
X-Git-Commit: 6e1a7ade216905cb8befde9eeb6af8e0527156ab
Auto-Submitted: auto-generated
The branch stable/13 has been updated by emaste:
URL: https://cgit.FreeBSD.org/src/commit/?id=6e1a7ade216905cb8befde9eeb6af8e0527156ab
commit 6e1a7ade216905cb8befde9eeb6af8e0527156ab
Author: Ed Maste <emaste@FreeBSD.org>
AuthorDate: 2024-04-16 14:19:14 +0000
Commit: Ed Maste <emaste@FreeBSD.org>
CommitDate: 2024-06-18 14:20:41 +0000
mergemaster: postpone removal to FreeBSD 15
Mergemaster has been deprecated for quite some time, but was not
removed prior to FreeBSD 14.0. Update the deprecation notice in the man
page to reflect this.
PR: 274967
Reported by: naddy
Sponsored by: The FreeBSD Foundation
(cherry picked from commit 73cce7d8886bc59284c757decb49deba046e73fc)
(cherry picked from commit c0e5d8f9bda7907c83901d25d1d123a5b180443f)
---
usr.sbin/mergemaster/mergemaster.8 | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/usr.sbin/mergemaster/mergemaster.8 b/usr.sbin/mergemaster/mergemaster.8
index 695f1bba3474..20d746de347c 100644
--- a/usr.sbin/mergemaster/mergemaster.8
+++ b/usr.sbin/mergemaster/mergemaster.8
@@ -22,7 +22,7 @@
.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
.\" SUCH DAMAGE.
.\"
-.Dd March 2, 2023
+.Dd April 16, 2024
.Dt MERGEMASTER 8
.Os
.Sh NAME
@@ -45,7 +45,7 @@
The
.Nm
utility is deprecated and may not be available in
-.Fx 14.0
+.Fx 15.0
or later.
Users are advised to use
.Xr etcupdate 8
From nobody Tue Jun 18 14:47: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 4W3V2y5JRbz5NwRh;
Tue, 18 Jun 2024 14:47: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 4W3V2y4qQSz4bHx;
Tue, 18 Jun 2024 14:47:22 +0000 (UTC)
(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
t=1718722042;
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=7VuSJd5yyb9lKsQOmqv25dM4GWgOizYLKWktr2ikzk8=;
b=PodQTrnRImgQZs0rRA2j0nnHH7owuYJuAthqlMOIl338sd09sYeCS6Hvy3ttDtBAN2Bv6q
ZidirN+aZBC/ETHjji7NKF/x/C4Ired+bI739ZvYBRNsIZav4hMgJUNX9pczPDpGIPDYAE
xhUJvmdoLETrTo/Mj+q3Rf2PLAaNXtL/0rgg/zhKdZeYp7P8/XLSefn9rQxIN3d7RMePiP
hY7gLEywiiiwjUfADjOLubXA5HLDDIA4eC1m8/j6UzBT/giuyldMB8fxrnpmXFaHy08zng
r35Xcz74EfVf+4qzLQnmJjydUXVPe/kpEBxGWihk3zQz+E1jBX9Vat6M7bjGGg==
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1718722042; a=rsa-sha256; cv=none;
b=tyVIK7kZAFzvOV9N/EHXo9pTG90VwLoAoZwfXKre7xyAM1Lqyb6zV5k8/nji7/34lAeJNO
pDD7DNI7pwB71h/R57ask6SMQArEHyhK81mhSzrDfe3m2s+djN6lIXF9FH/Wk5LLFZfaje
RRL4O0hft7cHITyIKpBaZ0jyr44b/yg5DQrx+2Is7XKm18yWrWQlQzrONUBhFPVFvxPih7
dvjLksLcNZqCZ++j3/EXEcZP8E7vstusV7f08dzhZtQ7ScjEzOx2A6OCpkBngo9nVGGQ+z
cVTNjgaK0JrlB2x3TKNJVvli/8CrphEyLFRBEWjWNWK95VP1aXF6MnTWk3PwXQ==
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=1718722042;
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=7VuSJd5yyb9lKsQOmqv25dM4GWgOizYLKWktr2ikzk8=;
b=vme/8MQaI72EqGx/4mqGKbxHCCpDheDqpusFdFk0VzvFaVk+JEBE1uLu3FgDm1gzoFz3xt
Jxya/+8ju5rMca4KT5/oLpmF3OL1kvfIGte3DR361WTlCUCSb9Amx/MlBXg0n3FgmkMpt0
Np6uVFcfcXwAL7zdbkImbe3n+jPEFzZDHzN5n2tZUnSTi4s3zTG+gVv30ey0+bu/0T7ayo
Qc0+kDid6Fu5otU5uScL23q4kTTD3rc+NL2/dXj3XAFPxzoK1hPvlgbqa0grTK4MEBw72X
ukGfKYp335FaLUlLCc2lUrz8JsiG7xVZEcd8HMV8hITm6Qz8L+RVY2cxSP1iBA==
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 4W3V2y4QDSz136Z;
Tue, 18 Jun 2024 14:47: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 45IElMrW070643;
Tue, 18 Jun 2024 14:47:22 GMT
(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 45IElM0x070640;
Tue, 18 Jun 2024 14:47:22 GMT
(envelope-from git)
Date: Tue, 18 Jun 2024 14:47:22 GMT
Message-Id: <202406181447.45IElM0x070640@gitrepo.freebsd.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
dev-commits-src-branches@FreeBSD.org
From: Kristof Provost <kp@FreeBSD.org>
Subject: git: c71487dfba1f - stable/14 - pfctl: fix recursive
printing of nat anchors
List-Id: Commits to the stable branches of the FreeBSD src repository <dev-commits-src-branches.freebsd.org>
List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches
List-Help: <mailto:dev-commits-src-branches+help@freebsd.org>
List-Post: <mailto:dev-commits-src-branches@freebsd.org>
List-Subscribe: <mailto:dev-commits-src-branches+subscribe@freebsd.org>
List-Unsubscribe: <mailto:dev-commits-src-branches+unsubscribe@freebsd.org>
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: kp
X-Git-Repository: src
X-Git-Refname: refs/heads/stable/14
X-Git-Reftype: branch
X-Git-Commit: c71487dfba1f34bf06e3ae35890849bf0b454afc
Auto-Submitted: auto-generated
The branch stable/14 has been updated by kp:
URL: https://cgit.FreeBSD.org/src/commit/?id=c71487dfba1f34bf06e3ae35890849bf0b454afc
commit c71487dfba1f34bf06e3ae35890849bf0b454afc
Author: Kristof Provost <kp@FreeBSD.org>
AuthorDate: 2024-05-28 14:26:28 +0000
Commit: Kristof Provost <kp@FreeBSD.org>
CommitDate: 2024-06-18 07:57:42 +0000
pfctl: fix recursive printing of nat anchors
Similar to the preceding fix for rules, ensure that we
recursively list wildcard anchors for nat rules.
MFC after: 3 weeks
Sponsored by: Rubicon Communications, LLC ("Netgate")
(cherry picked from commit 8ddd0359bca5c5fc38189000a80a3180854a8a2e)
---
sbin/pfctl/pfctl.c | 103 +++++++++++++++++++++++++++++++++++++----------------
1 file changed, 72 insertions(+), 31 deletions(-)
diff --git a/sbin/pfctl/pfctl.c b/sbin/pfctl/pfctl.c
index d5541571a135..621d97d6c555 100644
--- a/sbin/pfctl/pfctl.c
+++ b/sbin/pfctl/pfctl.c
@@ -98,7 +98,7 @@ void pfctl_print_eth_rule_counters(struct pfctl_eth_rule *, int);
void pfctl_print_rule_counters(struct pfctl_rule *, int);
int pfctl_show_eth_rules(int, char *, int, enum pfctl_show, char *, int, int);
int pfctl_show_rules(int, char *, int, enum pfctl_show, char *, int, int);
-int pfctl_show_nat(int, char *, int, char *, int);
+int pfctl_show_nat(int, char *, int, char *, int, int);
int pfctl_show_src_nodes(int, int);
int pfctl_show_states(int, const char *, int);
int pfctl_show_status(int, int);
@@ -1398,7 +1398,8 @@ pfctl_show_rules(int dev, char *path, int opts, enum pfctl_show format,
}
int
-pfctl_show_nat(int dev, char *path, int opts, char *anchorname, int depth)
+pfctl_show_nat(int dev, char *path, int opts, char *anchorname, int depth,
+ int wildcard)
{
struct pfctl_rules_info ri;
struct pfctl_rule rule;
@@ -1406,14 +1407,65 @@ pfctl_show_nat(int dev, char *path, int opts, char *anchorname, int depth)
u_int32_t nr;
static int nattype[3] = { PF_NAT, PF_RDR, PF_BINAT };
int i, dotitle = opts & PF_OPT_SHOWALL;
- int brace, ret;
+ int ret;
int len = strlen(path);
- char *p;
+ char *npath, *p;
- if (path[0])
- snprintf(&path[len], MAXPATHLEN - len, "/%s", anchorname);
- else
- snprintf(&path[len], MAXPATHLEN - len, "%s", anchorname);
+ /*
+ * Truncate a trailing / and * on an anchorname before searching for
+ * the ruleset, this is syntactic sugar that doesn't actually make it
+ * to the kernel.
+ */
+ if ((p = strrchr(anchorname, '/')) != NULL &&
+ p[1] == '*' && p[2] == '\0') {
+ p[0] = '\0';
+ }
+
+ if (anchorname[0] == '/') {
+ if ((npath = calloc(1, MAXPATHLEN)) == NULL)
+ errx(1, "pfctl_rules: calloc");
+ snprintf(npath, MAXPATHLEN, "%s", anchorname);
+ } else {
+ if (path[0])
+ snprintf(&path[len], MAXPATHLEN - len, "/%s", anchorname);
+ else
+ snprintf(&path[len], MAXPATHLEN - len, "%s", anchorname);
+ npath = path;
+ }
+
+ /*
+ * If this anchor was called with a wildcard path, go through
+ * the rulesets in the anchor rather than the rules.
+ */
+ if (wildcard && (opts & PF_OPT_RECURSE)) {
+ struct pfioc_ruleset prs;
+ u_int32_t mnr, nr;
+ memset(&prs, 0, sizeof(prs));
+ memcpy(prs.path, npath, sizeof(prs.path));
+ if (ioctl(dev, DIOCGETRULESETS, &prs)) {
+ if (errno == EINVAL)
+ fprintf(stderr, "NAT anchor '%s' "
+ "not found.\n", anchorname);
+ else
+ err(1, "DIOCGETRULESETS");
+ }
+ mnr = prs.nr;
+
+ pfctl_print_rule_counters(&rule, opts);
+ for (nr = 0; nr < mnr; ++nr) {
+ prs.nr = nr;
+ if (ioctl(dev, DIOCGETRULESET, &prs))
+ err(1, "DIOCGETRULESET");
+ INDENT(depth, !(opts & PF_OPT_VERBOSE));
+ printf("nat-anchor \"%s\" all {\n", prs.name);
+ pfctl_show_nat(dev, npath, opts,
+ prs.name, depth + 1, 0);
+ INDENT(depth, !(opts & PF_OPT_VERBOSE));
+ printf("}\n");
+ }
+ path[len] = '\0';
+ return (0);
+ }
for (i = 0; i < 3; i++) {
ret = pfctl_get_rules_info(dev, &ri, nattype[i], path);
@@ -1422,7 +1474,6 @@ pfctl_show_nat(int dev, char *path, int opts, char *anchorname, int depth)
return (-1);
}
for (nr = 0; nr < ri.nr; ++nr) {
- brace = 0;
INDENT(depth, !(opts & PF_OPT_VERBOSE));
if (pfctl_get_rule(dev, nr, ri.ticket, path,
@@ -1434,35 +1485,25 @@ pfctl_show_nat(int dev, char *path, int opts, char *anchorname, int depth)
ri.ticket, nattype[i], path) != 0)
return (-1);
- if (anchor_call[0] &&
- ((((p = strrchr(anchor_call, '_')) != NULL) &&
- (p == anchor_call ||
- *(--p) == '/')) || (opts & PF_OPT_RECURSE))) {
- brace++;
- if ((p = strrchr(anchor_call, '/')) !=
- NULL)
- p++;
- else
- p = &anchor_call[0];
- } else
- p = &anchor_call[0];
-
if (dotitle) {
pfctl_print_title("TRANSLATION RULES:");
dotitle = 0;
}
print_rule(&rule, anchor_call,
opts & PF_OPT_VERBOSE2, opts & PF_OPT_NUMERIC);
- if (brace)
+ if (anchor_call[0] &&
+ (((p = strrchr(anchor_call, '/')) ?
+ p[1] == '_' : anchor_call[0] == '_') ||
+ opts & PF_OPT_RECURSE)) {
printf(" {\n");
- else
- printf("\n");
- pfctl_print_rule_counters(&rule, opts);
- pfctl_clear_pool(&rule.rpool);
- if (brace) {
- pfctl_show_nat(dev, path, opts, p, depth + 1);
+ pfctl_print_rule_counters(&rule, opts);
+ pfctl_show_nat(dev, npath, opts, anchor_call,
+ depth + 1, rule.anchor_wildcard);
INDENT(depth, !(opts & PF_OPT_VERBOSE));
printf("}\n");
+ } else {
+ printf("\n");
+ pfctl_print_rule_counters(&rule, opts);
}
}
}
@@ -3058,7 +3099,7 @@ main(int argc, char *argv[])
break;
case 'n':
pfctl_load_fingerprints(dev, opts);
- pfctl_show_nat(dev, path, opts, anchorname, 0);
+ pfctl_show_nat(dev, path, opts, anchorname, 0, 0);
break;
case 'q':
pfctl_show_altq(dev, ifaceopt, opts,
@@ -3093,7 +3134,7 @@ main(int argc, char *argv[])
pfctl_show_eth_rules(dev, path, opts, 0, anchorname, 0,
0);
- pfctl_show_nat(dev, path, opts, anchorname, 0);
+ pfctl_show_nat(dev, path, opts, anchorname, 0, 0);
pfctl_show_rules(dev, path, opts, 0, anchorname, 0, 0);
pfctl_show_altq(dev, ifaceopt, opts, 0);
pfctl_show_states(dev, ifaceopt, opts);
From nobody Tue Jun 18 14:47: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 4W3V2z74tnz5NwK0;
Tue, 18 Jun 2024 14:47: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 4W3V2z5fKBz4bTW;
Tue, 18 Jun 2024 14:47:23 +0000 (UTC)
(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
t=1718722043;
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=FtIoXhPYaeNEKQKD0+YQy2oq+qa+Ebc80oUOnvpDTzs=;
b=l+c/6gFIaU/Zts+m0AYS2zuLY7IOQ0TVw46gQh2kp6bpWt/CEqqalHRi86sXlVZghNpHEQ
6fq/xUMmtR8SrDbzxHRU2QYqJm0tXRo72p4ShhyciJTLXGJUa2iO3vGSTwq5AiMsb5rF2z
0YuVr2B0tmB+E9P2LuiAlsfKgxSBsjvVIefpMtxYAU+byeDs+G+trOiqaZ4U9HnAUEjLxf
uayOVvgA+lbvmRbbj+iRw98Uy+L9Yx+f7LpUBBl4MylaWh8pSehVLFAB/KTBPs7KNzb6/l
j4IS+T/MHrGJPlOLPgNrWzO4EAWOjh+xMz1pZFBaLxoVJKtWcGKjIZ107CfoGQ==
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1718722043; a=rsa-sha256; cv=none;
b=lxQCahvKNgs9p+u1nd6BxZUFCTKXuv/uZbM3tlT1R1UZ1CLKNwMSplUAWbnEg93m7/C6Mj
FX+TsQ5uyd8Ga3Q3sH2jtWEqr+qo/zLVxaUNIc8TdzDuShiNMGnOvCytLOsVVFnZDnyXFe
uK/s8AW9nVSPc7x01yyS67eE2eAJtN1ba4kpC0MJ/71Rh+ryGe+tg64ucsBY7YHi3NKBEO
GAtYxjjklhF/+yTP2aDpdxvhcJM5lcHcDntu9GvNhTojrXI9+p4bY5RTZ3l0YsHcrQ+m96
r7JueJc36BeOndu3LzQPWvgpIN6CgpFXsSRf3AdtmbdKR7TYFulgCbvJxK4XgA==
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=1718722043;
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=FtIoXhPYaeNEKQKD0+YQy2oq+qa+Ebc80oUOnvpDTzs=;
b=ZRVx21ghQDvgvutGrH7wLixWIVuc4gQ6+uiiEW0VWUjuyEj7Odh+dzmnp5FYuutnlFg0UV
oWW8CPTOhBC7hrx6n/bY+XjsrNYmq8Y991NCq8xy3y79Te1qOCgt2A/bkCt+BQxHUSCP2V
TJPTnOL3AH8pj7i2//Qw6zXScBMNmUoWiaza1yNHR9kAANRze31tzLLPoT2bL1w8ctpSij
Ikg5fU44B5h85qErSgwDO94XzygR+i7fDDhnI/jf69TDpM/TSgl9uTBXW85ypN/3mk/hcA
gHSODBb8w2VHnb53V7zFYNpXGgSscfs4SX3tPVt9uf07ilePWDs3zS4KKuCUAw==
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 4W3V2z5GNLz136b;
Tue, 18 Jun 2024 14:47: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 45IElNxH070801;
Tue, 18 Jun 2024 14:47:23 GMT
(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 45IElN5Y070798;
Tue, 18 Jun 2024 14:47:23 GMT
(envelope-from git)
Date: Tue, 18 Jun 2024 14:47:23 GMT
Message-Id: <202406181447.45IElN5Y070798@gitrepo.freebsd.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
dev-commits-src-branches@FreeBSD.org
From: Kristof Provost <kp@FreeBSD.org>
Subject: git: f93083028442 - stable/14 - pf tests: test longer
anchor names
List-Id: Commits to the stable branches of the FreeBSD src repository <dev-commits-src-branches.freebsd.org>
List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches
List-Help: <mailto:dev-commits-src-branches+help@freebsd.org>
List-Post: <mailto:dev-commits-src-branches@freebsd.org>
List-Subscribe: <mailto:dev-commits-src-branches+subscribe@freebsd.org>
List-Unsubscribe: <mailto:dev-commits-src-branches+unsubscribe@freebsd.org>
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: kp
X-Git-Repository: src
X-Git-Refname: refs/heads/stable/14
X-Git-Reftype: branch
X-Git-Commit: f9308302844272aa1c470cbe73feb1d2a68785ac
Auto-Submitted: auto-generated
The branch stable/14 has been updated by kp:
URL: https://cgit.FreeBSD.org/src/commit/?id=f9308302844272aa1c470cbe73feb1d2a68785ac
commit f9308302844272aa1c470cbe73feb1d2a68785ac
Author: Kristof Provost <kp@FreeBSD.org>
AuthorDate: 2024-05-24 12:50:53 +0000
Commit: Kristof Provost <kp@FreeBSD.org>
CommitDate: 2024-06-18 07:59:02 +0000
pf tests: test longer anchor names
PR: 279225
MFC after: 3 weeks
Sponsored by: Rubicon Communications, LLC ("Netgate")
(cherry picked from commit 8b28ec3861d5b3e9fd8a60dbfda13059a5301281)
---
tests/sys/netpfil/pf/anchor.sh | 32 ++++++++++++++++++++++++++++++++
1 file changed, 32 insertions(+)
diff --git a/tests/sys/netpfil/pf/anchor.sh b/tests/sys/netpfil/pf/anchor.sh
index cf6da8740003..eba1ee935930 100644
--- a/tests/sys/netpfil/pf/anchor.sh
+++ b/tests/sys/netpfil/pf/anchor.sh
@@ -58,6 +58,37 @@ pr183198_cleanup()
pft_cleanup
}
+atf_test_case "pr279225" "cleanup"
+pr279225_head()
+{
+ atf_set descr "Test that we can retrieve longer anchor names, PR 279225"
+ atf_set require.user root
+}
+
+pr279225_body()
+{
+ pft_init
+
+ vnet_mkjail alcatraz
+
+ pft_set_rules alcatraz \
+ "nat-anchor \"appjail-nat/jail/*\" all" \
+ "rdr-anchor \"appjail-rdr/*\" all" \
+ "anchor \"appjail/jail/*\" all"
+
+ atf_check -s exit:0 -o match:"nat-anchor \"appjail-nat/jail/\*\" all \{" \
+ jexec alcatraz pfctl -sn -a "*"
+ atf_check -s exit:0 -o match:"rdr-anchor \"appjail-rdr/\*\" all \{" \
+ jexec alcatraz pfctl -sn -a "*"
+ atf_check -s exit:0 -o match:"anchor \"appjail/jail/\*\" all \{" \
+ jexec alcatraz pfctl -sr -a "*"
+}
+
+pr279225_cleanup()
+{
+ pft_cleanup
+}
+
atf_test_case "nested_anchor" "cleanup"
nested_anchor_head()
{
@@ -133,6 +164,7 @@ wildcard_cleanup()
atf_init_test_cases()
{
atf_add_test_case "pr183198"
+ atf_add_test_case "pr279225"
atf_add_test_case "nested_anchor"
atf_add_test_case "wildcard"
}
From nobody Tue Jun 18 14:47: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 4W3V2z74Tbz5NwDr;
Tue, 18 Jun 2024 14:47: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 4W3V2z4qg2z4bFN;
Tue, 18 Jun 2024 14:47:23 +0000 (UTC)
(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
t=1718722043;
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=GZWkmXGcZA8LgWh6v3xQ/mePmD88169PVWV0i/Hink8=;
b=ZD6+PQqtw6B+eNZgCgH6SuzlxiZ8IJtEUTCl8L+BXzlUlDPA5stQ1MfX80PdMh5eIy5iT8
ALGXqCpcnBHZhj9NM1o1NjNFtOlhCwcox/my0bUDaBNKANqWeIrCv5MSG3x3RyolSC7kGl
meKn4OQs/jlytyf7CZIdMbLKxW0cNcDHouIF5NxpP3mTFpl2FXM49FWryYHBjyjoNRl5Mq
VGNjX6FUmOtDcYxlhJg9iPJAu2kZkJ2Tygl/chjuzGpWRcVqJS9NWj9OsxtIJqPTAFT6Ag
qIF5vzl04DZgOSnRjO9FvulXHhgok0lrRKufg4A3f+I0X4DhspsHUa4rS1+iQA==
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1718722043; a=rsa-sha256; cv=none;
b=CM4lDa+qgRrLpW/sbkV5D13upTNYdljQBkeAq6a1cJWuaSR/DDAsHHv2S3lmTcFtPDrbC8
gsEXhVoWUtUBHE5u8xvIyN2SejMlqXlviVr6RH3v8GnT1UvWETu6QnhBg5S1JLc3wB/wsV
xIh7YraYCbr5sQCO0oT1/v6+vghTkIqMjaDzO/leBqEI5ijATcZ2hu5oQwjSrXA7Ga08GU
zhr6Uuyk1IwCq6742fHAf65JqruWtQl3riRL4KOg2osma22FWivAMkK2H1Th56fSYT6r1Y
MSkbgxAWd+M06nH4dvOYJaYY2t5VtlvytJPDFe80JYzQx3Fn3E4wA3ylq8s+qw==
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=1718722043;
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=GZWkmXGcZA8LgWh6v3xQ/mePmD88169PVWV0i/Hink8=;
b=SiniFg6yml/1RH/wF2nbaqPliQfgI7gteWg82o8rINs/VRFfNFkLYK8i38xtVVL8JxcLSj
THYDWxQpp3ikxA+nN843kFGxbN9CgrOsxXgA8uPHUI7a5uelkVvyXMkFlhBFUwAcgVH17j
4U2Re9laR0DYT5hu5TDwfujGogn++SlPqJPm4PC/ovEKIcjNXBieQxJrMBNuuxkXSkAW2R
TMgRCVvyR1lo1wSUwFas0OlKZJdJgsA6CfEm3ZOrw3GTW+7JpCtBOfDbBf1BwwJfdvd/oD
C1xJHW8X/YRZSQPh01OqE/wopUyV8/PwGHc/xpDDqDomZS1kJcVJIcqKHCe0tw==
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 4W3V2z3GpSz137q;
Tue, 18 Jun 2024 14:47: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 45IElNPV070756;
Tue, 18 Jun 2024 14:47:23 GMT
(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 45IElNib070753;
Tue, 18 Jun 2024 14:47:23 GMT
(envelope-from git)
Date: Tue, 18 Jun 2024 14:47:23 GMT
Message-Id: <202406181447.45IElNib070753@gitrepo.freebsd.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
dev-commits-src-branches@FreeBSD.org
From: Kristof Provost <kp@FreeBSD.org>
Subject: git: 70cd0b4b03b0 - stable/13 - pfctl: fix recursive
printing of nat anchors
List-Id: Commits to the stable branches of the FreeBSD src repository <dev-commits-src-branches.freebsd.org>
List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches
List-Help: <mailto:dev-commits-src-branches+help@freebsd.org>
List-Post: <mailto:dev-commits-src-branches@freebsd.org>
List-Subscribe: <mailto:dev-commits-src-branches+subscribe@freebsd.org>
List-Unsubscribe: <mailto:dev-commits-src-branches+unsubscribe@freebsd.org>
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: kp
X-Git-Repository: src
X-Git-Refname: refs/heads/stable/13
X-Git-Reftype: branch
X-Git-Commit: 70cd0b4b03b0eee2668b1a88b2f1076407753dbf
Auto-Submitted: auto-generated
The branch stable/13 has been updated by kp:
URL: https://cgit.FreeBSD.org/src/commit/?id=70cd0b4b03b0eee2668b1a88b2f1076407753dbf
commit 70cd0b4b03b0eee2668b1a88b2f1076407753dbf
Author: Kristof Provost <kp@FreeBSD.org>
AuthorDate: 2024-05-28 14:26:28 +0000
Commit: Kristof Provost <kp@FreeBSD.org>
CommitDate: 2024-06-18 14:43:43 +0000
pfctl: fix recursive printing of nat anchors
Similar to the preceding fix for rules, ensure that we
recursively list wildcard anchors for nat rules.
MFC after: 3 weeks
Sponsored by: Rubicon Communications, LLC ("Netgate")
(cherry picked from commit 8ddd0359bca5c5fc38189000a80a3180854a8a2e)
---
sbin/pfctl/pfctl.c | 103 +++++++++++++++++++++++++++++++++++++----------------
1 file changed, 72 insertions(+), 31 deletions(-)
diff --git a/sbin/pfctl/pfctl.c b/sbin/pfctl/pfctl.c
index 985cbe0771c0..1cdcd1d0b912 100644
--- a/sbin/pfctl/pfctl.c
+++ b/sbin/pfctl/pfctl.c
@@ -96,7 +96,7 @@ int pfctl_get_pool(int, struct pfctl_pool *, u_int32_t, u_int32_t, int,
char *);
void pfctl_print_rule_counters(struct pfctl_rule *, int);
int pfctl_show_rules(int, char *, int, enum pfctl_show, char *, int, int);
-int pfctl_show_nat(int, char *, int, char *, int);
+int pfctl_show_nat(int, char *, int, char *, int, int);
int pfctl_show_src_nodes(int, int);
int pfctl_show_states(int, const char *, int);
int pfctl_show_status(int, int);
@@ -1220,7 +1220,8 @@ pfctl_show_rules(int dev, char *path, int opts, enum pfctl_show format,
}
int
-pfctl_show_nat(int dev, char *path, int opts, char *anchorname, int depth)
+pfctl_show_nat(int dev, char *path, int opts, char *anchorname, int depth,
+ int wildcard)
{
struct pfctl_rules_info ri;
struct pfctl_rule rule;
@@ -1228,14 +1229,65 @@ pfctl_show_nat(int dev, char *path, int opts, char *anchorname, int depth)
u_int32_t nr;
static int nattype[3] = { PF_NAT, PF_RDR, PF_BINAT };
int i, dotitle = opts & PF_OPT_SHOWALL;
- int brace, ret;
+ int ret;
int len = strlen(path);
- char *p;
+ char *npath, *p;
- if (path[0])
- snprintf(&path[len], MAXPATHLEN - len, "/%s", anchorname);
- else
- snprintf(&path[len], MAXPATHLEN - len, "%s", anchorname);
+ /*
+ * Truncate a trailing / and * on an anchorname before searching for
+ * the ruleset, this is syntactic sugar that doesn't actually make it
+ * to the kernel.
+ */
+ if ((p = strrchr(anchorname, '/')) != NULL &&
+ p[1] == '*' && p[2] == '\0') {
+ p[0] = '\0';
+ }
+
+ if (anchorname[0] == '/') {
+ if ((npath = calloc(1, MAXPATHLEN)) == NULL)
+ errx(1, "pfctl_rules: calloc");
+ snprintf(npath, MAXPATHLEN, "%s", anchorname);
+ } else {
+ if (path[0])
+ snprintf(&path[len], MAXPATHLEN - len, "/%s", anchorname);
+ else
+ snprintf(&path[len], MAXPATHLEN - len, "%s", anchorname);
+ npath = path;
+ }
+
+ /*
+ * If this anchor was called with a wildcard path, go through
+ * the rulesets in the anchor rather than the rules.
+ */
+ if (wildcard && (opts & PF_OPT_RECURSE)) {
+ struct pfioc_ruleset prs;
+ u_int32_t mnr, nr;
+ memset(&prs, 0, sizeof(prs));
+ memcpy(prs.path, npath, sizeof(prs.path));
+ if (ioctl(dev, DIOCGETRULESETS, &prs)) {
+ if (errno == EINVAL)
+ fprintf(stderr, "NAT anchor '%s' "
+ "not found.\n", anchorname);
+ else
+ err(1, "DIOCGETRULESETS");
+ }
+ mnr = prs.nr;
+
+ pfctl_print_rule_counters(&rule, opts);
+ for (nr = 0; nr < mnr; ++nr) {
+ prs.nr = nr;
+ if (ioctl(dev, DIOCGETRULESET, &prs))
+ err(1, "DIOCGETRULESET");
+ INDENT(depth, !(opts & PF_OPT_VERBOSE));
+ printf("nat-anchor \"%s\" all {\n", prs.name);
+ pfctl_show_nat(dev, npath, opts,
+ prs.name, depth + 1, 0);
+ INDENT(depth, !(opts & PF_OPT_VERBOSE));
+ printf("}\n");
+ }
+ path[len] = '\0';
+ return (0);
+ }
for (i = 0; i < 3; i++) {
ret = pfctl_get_rules_info(dev, &ri, nattype[i], path);
@@ -1244,7 +1296,6 @@ pfctl_show_nat(int dev, char *path, int opts, char *anchorname, int depth)
return (-1);
}
for (nr = 0; nr < ri.nr; ++nr) {
- brace = 0;
INDENT(depth, !(opts & PF_OPT_VERBOSE));
if (pfctl_get_rule(dev, nr, ri.ticket, path,
@@ -1256,35 +1307,25 @@ pfctl_show_nat(int dev, char *path, int opts, char *anchorname, int depth)
ri.ticket, nattype[i], path) != 0)
return (-1);
- if (anchor_call[0] &&
- ((((p = strrchr(anchor_call, '_')) != NULL) &&
- (p == anchor_call ||
- *(--p) == '/')) || (opts & PF_OPT_RECURSE))) {
- brace++;
- if ((p = strrchr(anchor_call, '/')) !=
- NULL)
- p++;
- else
- p = &anchor_call[0];
- } else
- p = &anchor_call[0];
-
if (dotitle) {
pfctl_print_title("TRANSLATION RULES:");
dotitle = 0;
}
print_rule(&rule, anchor_call,
opts & PF_OPT_VERBOSE2, opts & PF_OPT_NUMERIC);
- if (brace)
+ if (anchor_call[0] &&
+ (((p = strrchr(anchor_call, '/')) ?
+ p[1] == '_' : anchor_call[0] == '_') ||
+ opts & PF_OPT_RECURSE)) {
printf(" {\n");
- else
- printf("\n");
- pfctl_print_rule_counters(&rule, opts);
- pfctl_clear_pool(&rule.rpool);
- if (brace) {
- pfctl_show_nat(dev, path, opts, p, depth + 1);
+ pfctl_print_rule_counters(&rule, opts);
+ pfctl_show_nat(dev, npath, opts, anchor_call,
+ depth + 1, rule.anchor_wildcard);
INDENT(depth, !(opts & PF_OPT_VERBOSE));
printf("}\n");
+ } else {
+ printf("\n");
+ pfctl_print_rule_counters(&rule, opts);
}
}
}
@@ -2601,7 +2642,7 @@ main(int argc, char *argv[])
break;
case 'n':
pfctl_load_fingerprints(dev, opts);
- pfctl_show_nat(dev, path, opts, anchorname, 0);
+ pfctl_show_nat(dev, path, opts, anchorname, 0, 0);
break;
case 'q':
pfctl_show_altq(dev, ifaceopt, opts,
@@ -2629,7 +2670,7 @@ main(int argc, char *argv[])
opts |= PF_OPT_SHOWALL;
pfctl_load_fingerprints(dev, opts);
- pfctl_show_nat(dev, path, opts, anchorname, 0);
+ pfctl_show_nat(dev, path, opts, anchorname, 0, 0);
pfctl_show_rules(dev, path, opts, 0, anchorname, 0, 0);
pfctl_show_altq(dev, ifaceopt, opts, 0);
pfctl_show_states(dev, ifaceopt, opts);
From nobody Tue Jun 18 14:47: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 4W3V306YpPz5NwG1;
Tue, 18 Jun 2024 14:47: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 4W3V304pJkz4bJ5;
Tue, 18 Jun 2024 14:47:24 +0000 (UTC)
(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
t=1718722044;
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=jnylVSfD+YKTtAoG0TS6/T9nbJUzXoEegD/DVRz7dxo=;
b=wKX680r/lQWZ9Ki9ZXxI82wT0Pd5hizOnmTnychOfr9LrXmoFfP7mVYwinu1Oe/jahjxyS
AIJ2rDWQwntnmEd2bAxqbPwGS6ziEB5HFvo3lT4VYDfPYlvFXd2HDG/9o98igSSgg5NH+e
BDKCbW43LQHviBQaO87KSJjU5VkcJPEo1ztu0cVQ+fGRi9HpguZf6dMf4gCN0SlP83E8PX
tu5PtV8Q2fdiFDAyMGYGgkK36ibgSuT8neAKeitseA14WZHSbxPUBUQIXRtBjpo/q5Y13h
AvVFq8bq14a3MZVpXJb9pU1+PUQAURfJENzhi0yaltmdCwcKMq21PPwXcWjVIA==
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1718722044; a=rsa-sha256; cv=none;
b=fGHPFV8L0BJzuLcVHQjA8JvhPSrlRweU2s2WclG+PC/DMSCi3JA/hcILvX258pbK7RgOAi
nhrBlTA0h8bnUyRswzQLnbAA3ZfbFe6LM5ofTD8r7+eYed66pGOWtd9rwMEOXArkB3ppl2
iavOuAIvBF9HJsD2XK9tsJ2GUVoFuFmYmjLhv+zdq2Xh5nQkwOhVzWxKBuPb8+ENkKWlBv
SMCDd1PxdnfDhg2fjid7xUkhBGVwhRkOHZNBKK9iwk0z2siwD6mi5XjfmacOLyicvp+3iB
ART6nf2t2nmKvZ9B29lWvc72o9mLUNLOfryNZuAqvdLlGRg43HKyw60k9I0SKw==
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=1718722044;
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=jnylVSfD+YKTtAoG0TS6/T9nbJUzXoEegD/DVRz7dxo=;
b=sRvVhCJvNJmwKBudX02P1juduqk1X0zlrgrS9oJFecjdF1KHaH7idlogRoUsfJb033llm2
ntNkGQz7JnjEXN+RDXNy7N+3OBgsv5wave9JlXZf4Em2h9cPtLuprEWQQcJudRpXhl+Gxs
C5keavqGSqztmOy2CDFTnJanZdVtPiKvAAr1mmVcqh+Tmp+zhxFQq0j6zqtdxa/tF3afnM
fT2FHMYDclTaVFueCFjtgUUtstEC+vEjHoAcykS4an7/t57qUqQzeHmfS4WQP/v8HPstxL
WvAXoULpcOXXdtCrNBST9lUPhIjvCKa0W2zAcECz7zzE2gka+gnvaxEQIeRbGw==
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 4W3V304DtXz136c;
Tue, 18 Jun 2024 14:47: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 45IElOtQ070846;
Tue, 18 Jun 2024 14:47:24 GMT
(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 45IElOoU070843;
Tue, 18 Jun 2024 14:47:24 GMT
(envelope-from git)
Date: Tue, 18 Jun 2024 14:47:24 GMT
Message-Id: <202406181447.45IElOoU070843@gitrepo.freebsd.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
dev-commits-src-branches@FreeBSD.org
From: Kristof Provost <kp@FreeBSD.org>
Subject: git: 9748482d343d - stable/13 - pf tests: test longer
anchor names
List-Id: Commits to the stable branches of the FreeBSD src repository <dev-commits-src-branches.freebsd.org>
List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches
List-Help: <mailto:dev-commits-src-branches+help@freebsd.org>
List-Post: <mailto:dev-commits-src-branches@freebsd.org>
List-Subscribe: <mailto:dev-commits-src-branches+subscribe@freebsd.org>
List-Unsubscribe: <mailto:dev-commits-src-branches+unsubscribe@freebsd.org>
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: kp
X-Git-Repository: src
X-Git-Refname: refs/heads/stable/13
X-Git-Reftype: branch
X-Git-Commit: 9748482d343dfaca9cb92359d0af7b4d38aea3bd
Auto-Submitted: auto-generated
The branch stable/13 has been updated by kp:
URL: https://cgit.FreeBSD.org/src/commit/?id=9748482d343dfaca9cb92359d0af7b4d38aea3bd
commit 9748482d343dfaca9cb92359d0af7b4d38aea3bd
Author: Kristof Provost <kp@FreeBSD.org>
AuthorDate: 2024-05-24 12:50:53 +0000
Commit: Kristof Provost <kp@FreeBSD.org>
CommitDate: 2024-06-18 14:43:43 +0000
pf tests: test longer anchor names
PR: 279225
MFC after: 3 weeks
Sponsored by: Rubicon Communications, LLC ("Netgate")
(cherry picked from commit 8b28ec3861d5b3e9fd8a60dbfda13059a5301281)
---
tests/sys/netpfil/pf/anchor.sh | 32 ++++++++++++++++++++++++++++++++
1 file changed, 32 insertions(+)
diff --git a/tests/sys/netpfil/pf/anchor.sh b/tests/sys/netpfil/pf/anchor.sh
index cf6da8740003..eba1ee935930 100644
--- a/tests/sys/netpfil/pf/anchor.sh
+++ b/tests/sys/netpfil/pf/anchor.sh
@@ -58,6 +58,37 @@ pr183198_cleanup()
pft_cleanup
}
+atf_test_case "pr279225" "cleanup"
+pr279225_head()
+{
+ atf_set descr "Test that we can retrieve longer anchor names, PR 279225"
+ atf_set require.user root
+}
+
+pr279225_body()
+{
+ pft_init
+
+ vnet_mkjail alcatraz
+
+ pft_set_rules alcatraz \
+ "nat-anchor \"appjail-nat/jail/*\" all" \
+ "rdr-anchor \"appjail-rdr/*\" all" \
+ "anchor \"appjail/jail/*\" all"
+
+ atf_check -s exit:0 -o match:"nat-anchor \"appjail-nat/jail/\*\" all \{" \
+ jexec alcatraz pfctl -sn -a "*"
+ atf_check -s exit:0 -o match:"rdr-anchor \"appjail-rdr/\*\" all \{" \
+ jexec alcatraz pfctl -sn -a "*"
+ atf_check -s exit:0 -o match:"anchor \"appjail/jail/\*\" all \{" \
+ jexec alcatraz pfctl -sr -a "*"
+}
+
+pr279225_cleanup()
+{
+ pft_cleanup
+}
+
atf_test_case "nested_anchor" "cleanup"
nested_anchor_head()
{
@@ -133,6 +164,7 @@ wildcard_cleanup()
atf_init_test_cases()
{
atf_add_test_case "pr183198"
+ atf_add_test_case "pr279225"
atf_add_test_case "nested_anchor"
atf_add_test_case "wildcard"
}
From nobody Wed Jun 19 04:18: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 4W3r2L6nQTz5NrWZ;
Wed, 19 Jun 2024 04:18: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 4W3r2L6GbRz4xPl;
Wed, 19 Jun 2024 04:18:02 +0000 (UTC)
(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
t=1718770682;
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=em2kgvXF1uRFYxpQ2IDMArwP+RlpKdirDjNuUpXZtKQ=;
b=OlLqQ9FnWbHpJwNvgZVg2GkFXIBTFH48r66NkPbBkc8OiNUfbZmsV5QDnG9P1AZEQksoK7
O5xOHiHFQMoeRK7yc7WOHPjUB3an5P1lP+p2HZHPYaJvNGA8ayxmpkXu4jzitjUpAHcSjJ
tnl7GvklTgR+46YNPQ7Q4LL2VuyiJQwqGyALs7FsCOhyBCs2iGVDxG+DWyvGQG9nJudyeh
jnUq5rZPPJ1zkbapHncrzYpwNdrQiwMHwcdpYf0pBAcwAVTBsY+PhLeQl5dUVZH5YrtC/N
yoPmBfPQo/UXg+bCykcdwrtE5uuLxD4GU+q5M3Q/yLAdX6c9Hxq976RO71Gdtg==
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1718770682; a=rsa-sha256; cv=none;
b=Od4nCcqf28FVx3I17gaR5D2TTYZ9sSLI+0jV/odCwNAuUXawONc6xajXk6gO65j9dJt8Za
Fbx9licpeICmGd4DFS6T1fc4sAd+5k+u3qqgkiuIIySf6jvcZObpQqnM2yEHoSA88r13iI
nsnxxHaVlBdyKg5zCCGRHsRqn77OgWWxkb/93K3G+VvpnR84Pgwi/uhH9XS/d7MVxjh/d6
Jj0cqnoZcw0rPEPalY8ClKeFCKkXspMtWMYIr49cS7CCAMQZUHHYBE0B0lVlm2qUlY0DM1
1f9lKzq9peEeY1bVY7tuVglNaqGieZybaAT4XtOAZCwwcPk7/L8Uj27uHosbLw==
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=1718770682;
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=em2kgvXF1uRFYxpQ2IDMArwP+RlpKdirDjNuUpXZtKQ=;
b=QZUCxtgeQV2ztMdjPHZt10lEEuAOSoGnRVpTItKNJqTtlr1R4qOuLfns7eU6yIvUtPNUn/
dKHiTm8ot2vIrI/sAHuqGrfUR9VIOw3zky0DXG5SgxehgU5TgEckF9aa6toVtlgsRmmnHy
1eEXtFnylsi01596gBWy0xIy7l5ba6eKWMNxTSRVR2rtFadzRuQ1dn2n+LnEWPDrkJ4RFH
hyvddyNRhxzmtnGWFtOTqxhdMDzWZzcys4MSHAx+UMa5OTR7a1Y4uFCtKMLvTPs1TdoZkf
fV/qQ0Y5m8I16eV0fAS17AYCWN3mva9UHRtpZAJ0Au5rGf0KFIiakgFQXnP4bQ==
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 4W3r2L5sjCzRmm;
Wed, 19 Jun 2024 04:18: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 45J4I2IJ039918;
Wed, 19 Jun 2024 04:18:02 GMT
(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 45J4I2Qm039915;
Wed, 19 Jun 2024 04:18:02 GMT
(envelope-from git)
Date: Wed, 19 Jun 2024 04:18:02 GMT
Message-Id: <202406190418.45J4I2Qm039915@gitrepo.freebsd.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
dev-commits-src-branches@FreeBSD.org
From: Gordon Bergling <gbe@FreeBSD.org>
Subject: git: 9d7622367a46 - stable/14 - camcontrol.8: Fix a typo
in the manual page
List-Id: Commits to the stable branches of the FreeBSD src repository <dev-commits-src-branches.freebsd.org>
List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches
List-Help: <mailto:dev-commits-src-branches+help@freebsd.org>
List-Post: <mailto:dev-commits-src-branches@freebsd.org>
List-Subscribe: <mailto:dev-commits-src-branches+subscribe@freebsd.org>
List-Unsubscribe: <mailto:dev-commits-src-branches+unsubscribe@freebsd.org>
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: 9d7622367a4651a2207be1ead7606d7c8f7b87c6
Auto-Submitted: auto-generated
The branch stable/14 has been updated by gbe:
URL: https://cgit.FreeBSD.org/src/commit/?id=9d7622367a4651a2207be1ead7606d7c8f7b87c6
commit 9d7622367a4651a2207be1ead7606d7c8f7b87c6
Author: Gordon Bergling <gbe@FreeBSD.org>
AuthorDate: 2024-06-16 16:01:12 +0000
Commit: Gordon Bergling <gbe@FreeBSD.org>
CommitDate: 2024-06-19 04:17:51 +0000
camcontrol.8: Fix a typo in the manual page
- s/emtpy/empty/
(cherry picked from commit d1e652bf04bd94ed3469a5a2fcb6938b3f4dcbc0)
---
sbin/camcontrol/camcontrol.8 | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sbin/camcontrol/camcontrol.8 b/sbin/camcontrol/camcontrol.8
index 065dfbe8a1b4..9d2eec87e0e0 100644
--- a/sbin/camcontrol/camcontrol.8
+++ b/sbin/camcontrol/camcontrol.8
@@ -2330,7 +2330,7 @@ For the Report Zones command, specify a subset of zones to report.
.It all
Report all zones.
This is the default.
-.It emtpy
+.It empty
Report only empty zones.
.It imp_open
Report zones that are implicitly open.
From nobody Wed Jun 19 04:18: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 4W3r2g3CTcz5Nrtj;
Wed, 19 Jun 2024 04:18: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 4W3r2g2jcKz4xYl;
Wed, 19 Jun 2024 04:18:19 +0000 (UTC)
(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
t=1718770699;
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=0SAWtRpWoyORDg/oVOTlFXqnQV6GJiJpsoSgRuZAbOc=;
b=J0jBaEG4ph/fsrWNA+hLR1xCVIQo1bBpDI1Uq4t21w1iq67Rl8IeZyJm8Q0BRZg/lYPSAO
YMn35T+D4Wftxf3rXeqtZeVc6g4w1VtHJTsQ6Yyih71sYLvJSR8/phsmSZVnduD5fnkpkx
czsn50wdpFi+fnUIpOKP3tkaTwdpsNG0ZPfdwf7Kiyj5Jz30Ojk1MP2ntqLLUh2un3XQqZ
QmW3o/LvKE9y45IFPF4ZATsWsK1Bkl7LkoANld5YZNX2Q5v0YhIvL+nGU6CaNNoYLPnCX+
Sfou1as1Q8jEVCJ5Sk432DJydziQWHKslHYlx+lLmaZeTikX9ewcurq/i2bwAg==
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1718770699; a=rsa-sha256; cv=none;
b=CZqdntFOfphjRvuHo2uwIHR7/OVK0iYZXFkDJhMQYWOxSvnV8IkS4CeBm5XkPULfweWLzq
qio0sYKPPmQXG7XEYF+hKk/8IUA8RRAAfhxsPYAkt+I6YBQCJHX3HabuCrI0XBeeIdg4tL
uIubfL6S+5RGdlI5MrufDW8CxERmRuFMMYUxu+wBsZB/CMFAyVoXzpk6f+AQzdb4y7Iei0
9b+Zn5wHyQh+K8L7xzkUoGPpSQtGPQl+PRmvxn0Ob3jP2PQX4gCSz6ZxQYKXjr/BboL8rb
7wVVa444lATjCEkyiRz+qC0sAS4hholxOHHw1NhuTMuVTTcldaU/6TI5hZpZ+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=1718770699;
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=0SAWtRpWoyORDg/oVOTlFXqnQV6GJiJpsoSgRuZAbOc=;
b=ZsBnQTKDOj3ek3/hiBZGn4SeDhgDxUCeq3o0ZR6OelS8xQARle86bF80FqhEY0+lmCYZUk
kdoNYCT20ZPC3RvkRwPFmBhJEX/1yOFwINviNU0x0upQ7ix2sXDkrrbTIeu4m37bEtLz6y
SCfrUDWGUy0Aqnmtb9365fJ464RyvmuTv8DZkDHCDYBKUB6C1KyMayvyW2DkQq9Wjn7Gv3
xMXS3yiSnzLaNUGzfWvtRNA2vQcqRMpEcMHuvb2zeCe9tlxJj5LrvX8Atd+7imDa1cCyJA
C/vKYQe8PREZB/Rr+PSeAI+R1UX4f24WzN/kIfbqOEomm5ZurqIJeHJMKq9PvA==
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 4W3r2g2KcGzRp8;
Wed, 19 Jun 2024 04:18: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 45J4IJsB040079;
Wed, 19 Jun 2024 04:18:19 GMT
(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 45J4IJf7040076;
Wed, 19 Jun 2024 04:18:19 GMT
(envelope-from git)
Date: Wed, 19 Jun 2024 04:18:19 GMT
Message-Id: <202406190418.45J4IJf7040076@gitrepo.freebsd.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
dev-commits-src-branches@FreeBSD.org
From: Gordon Bergling <gbe@FreeBSD.org>
Subject: git: 0c1370e0625d - stable/13 - camcontrol.8: Fix a typo
in the manual page
List-Id: Commits to the stable branches of the FreeBSD src repository <dev-commits-src-branches.freebsd.org>
List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches
List-Help: <mailto:dev-commits-src-branches+help@freebsd.org>
List-Post: <mailto:dev-commits-src-branches@freebsd.org>
List-Subscribe: <mailto:dev-commits-src-branches+subscribe@freebsd.org>
List-Unsubscribe: <mailto:dev-commits-src-branches+unsubscribe@freebsd.org>
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: 0c1370e0625d286a38479affcc50f023a117b8dd
Auto-Submitted: auto-generated
The branch stable/13 has been updated by gbe:
URL: https://cgit.FreeBSD.org/src/commit/?id=0c1370e0625d286a38479affcc50f023a117b8dd
commit 0c1370e0625d286a38479affcc50f023a117b8dd
Author: Gordon Bergling <gbe@FreeBSD.org>
AuthorDate: 2024-06-16 16:01:12 +0000
Commit: Gordon Bergling <gbe@FreeBSD.org>
CommitDate: 2024-06-19 04:18:10 +0000
camcontrol.8: Fix a typo in the manual page
- s/emtpy/empty/
(cherry picked from commit d1e652bf04bd94ed3469a5a2fcb6938b3f4dcbc0)
---
sbin/camcontrol/camcontrol.8 | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sbin/camcontrol/camcontrol.8 b/sbin/camcontrol/camcontrol.8
index e19a222a1cf7..80f41bc6a11f 100644
--- a/sbin/camcontrol/camcontrol.8
+++ b/sbin/camcontrol/camcontrol.8
@@ -2323,7 +2323,7 @@ For the Report Zones command, specify a subset of zones to report.
.It all
Report all zones.
This is the default.
-.It emtpy
+.It empty
Report only empty zones.
.It imp_open
Report zones that are implicitly open.
From nobody Wed Jun 19 04: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 4W3r3045kbz5Nrtp;
Wed, 19 Jun 2024 04: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 "R3" (verified OK))
by mx1.freebsd.org (Postfix) with ESMTPS id 4W3r303Fr1z4xrM;
Wed, 19 Jun 2024 04: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=1718770716;
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=7teHA9cwhpgAkrccplutQzs75ESb3J8XJZTkMU6gRiY=;
b=pWWb8/bK7gK4boZUSLGL52jWSs6h3TJfTgYIRp+wNn0CQBZ9nPEode06ym+c4hLG29lCSz
tKSxe1w+J+RMVgfyfcDL1TS+4Jgs58TozLMuWIE2/iBgKBSrcGMU1Rk9wOvW6wJxvDEbeP
/KK5L1bOfrdRBLuS6SDblPNHP3DG+gvz953xK5b++6U/N6FqgLhz44ygGSOMZ3hNiTXnB0
WQNxxtxx7Doq8uxU3xKuyFtD/GW6RVrhPBBFz+N+vzcGN1G2vwke9BbzD6KkkzsbBTSRGP
ip/c1ujEOpy6b6Aww37ZKIfk3cENm3vuRT/tzuL16GBkmlN+Y1+QbvvPpdH9ew==
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1718770716; a=rsa-sha256; cv=none;
b=ArpDDg7ydspYIMtwW0/3iT18UKj+a+7a6GCutUvuLPtgiTmHyJUhp9ZY6Wj5ZbJtV0qpoN
lhLSUaHfULY1Vm+u6EXvw40PqZEcbKDagJmAmioe1pDdQMtPq5ULhnLLOxJNGW5L596GRE
MrLhviXKuOTefjEuw/zP0bT2qXFITiaPB00FvoS/xNA9Sy09kh1leiRhZIJk9FnJE7WxFI
vtrD+GTRuQOXbVoywdPTeqdwzZoVnjfutBgy8b6bN2RU44SWWW7JrgF+kbS224TqzAHzW3
87sRk/XNpX+GywKGBre2pSw1Z7ZuGe1kxrOIWfjCw44tneqIpr1we3ZDsGdemA==
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=1718770716;
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=7teHA9cwhpgAkrccplutQzs75ESb3J8XJZTkMU6gRiY=;
b=vHQUGlm5W3dAI9PpVZUKkKNUAT17FIvqGN0kzO5uXONS6FblwKZSz2p6ZtC4DSPnMoICi6
OUwRAXQ3hWKmYL9oR4554tn4UuXFSagRkwmXHnIboR1uYxdB29po7yMbSUcRvrmMCsry3g
djk7xCX6bCWukusvVJvftKJIf/TWbNbOjn1f9LUjSO6qDJZoJhyvoM/617kf/c6RO7gRKo
69f+PRVJfRi+Lryi6eKVIbExIIUgiRV2mNpqUUHZrmOUjEMOKdzEiQDFyq4k+fU9/3bYKk
04PdC2ZRoazNrW/j79AAyRVl2ea+rSg6CKfVtabNJ35pkaEAsShjLY2tG7cPCQ==
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 4W3r302sM7zR6Q;
Wed, 19 Jun 2024 04: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 45J4IaGo040244;
Wed, 19 Jun 2024 04: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 45J4Iaeq040241;
Wed, 19 Jun 2024 04:18:36 GMT
(envelope-from git)
Date: Wed, 19 Jun 2024 04:18:36 GMT
Message-Id: <202406190418.45J4Iaeq040241@gitrepo.freebsd.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
dev-commits-src-branches@FreeBSD.org
From: Gordon Bergling <gbe@FreeBSD.org>
Subject: git: 0a2739feae90 - stable/12 - camcontrol.8: Fix a typo
in the manual page
List-Id: Commits to the stable branches of the FreeBSD src repository <dev-commits-src-branches.freebsd.org>
List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches
List-Help: <mailto:dev-commits-src-branches+help@freebsd.org>
List-Post: <mailto:dev-commits-src-branches@freebsd.org>
List-Subscribe: <mailto:dev-commits-src-branches+subscribe@freebsd.org>
List-Unsubscribe: <mailto:dev-commits-src-branches+unsubscribe@freebsd.org>
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/12
X-Git-Reftype: branch
X-Git-Commit: 0a2739feae90822f6f33e8e5aa00dbac73e8b7cb
Auto-Submitted: auto-generated
The branch stable/12 has been updated by gbe:
URL: https://cgit.FreeBSD.org/src/commit/?id=0a2739feae90822f6f33e8e5aa00dbac73e8b7cb
commit 0a2739feae90822f6f33e8e5aa00dbac73e8b7cb
Author: Gordon Bergling <gbe@FreeBSD.org>
AuthorDate: 2024-06-16 16:01:12 +0000
Commit: Gordon Bergling <gbe@FreeBSD.org>
CommitDate: 2024-06-19 04:18:25 +0000
camcontrol.8: Fix a typo in the manual page
- s/emtpy/empty/
(cherry picked from commit d1e652bf04bd94ed3469a5a2fcb6938b3f4dcbc0)
---
sbin/camcontrol/camcontrol.8 | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sbin/camcontrol/camcontrol.8 b/sbin/camcontrol/camcontrol.8
index cf7aec25022d..20ee6f945a52 100644
--- a/sbin/camcontrol/camcontrol.8
+++ b/sbin/camcontrol/camcontrol.8
@@ -2317,7 +2317,7 @@ For the Report Zones command, specify a subset of zones to report.
.It all
Report all zones.
This is the default.
-.It emtpy
+.It empty
Report only empty zones.
.It imp_open
Report zones that are implicitly open.
From nobody Wed Jun 19 10:01: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 4W3zg41qVPz5PKG5;
Wed, 19 Jun 2024 10:01: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 4W3zg35TNZz4JqV;
Wed, 19 Jun 2024 10:01:51 +0000 (UTC)
(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
t=1718791311;
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=6s9PeV+ipdqEQImCDlvMOHjDqlFgxnHdVyZUzj+abWU=;
b=SsO7qNarl3nNPhOR+gcPowYSyrzgc2CQoeMKP23UYEce8XKPGo+81L9Vhc5Up/PufN2Sa+
y3ZYhD9GAvXIlXs6tHYrwdR4GYgzVRjQnMASwDaWhckT2YMxO078F+N50RVFsd0FXL7n/j
cLnbAzteW/tAsZkp6piTx8kiWBxOeE/rHTalSKTJraBuoU0Fjarc/tyWSUt2M+BN8lQvzg
BAD8qXpJS8x7xeQBz6jOy2Fs7ElhVAmwvw4XUSCp+Je49pG6OobbUIv+BBsZzE9Witindq
Zb7KrN8uUTcdwWRIgStK4ENNS9ypkI8vID6n4c7KoUsMx3RTc7Fa0L4RoEuDjQ==
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1718791311; a=rsa-sha256; cv=none;
b=Q3qzn0ijG1jqMCNtba20R+QLqwOSgmGKqVhxmGoD/hwG+NWbiEjOGfXnH4uU9hjjcDyxIh
ucU4KUggi4r9WQji5JqARAoWhGwr3ss+JM//dvcWI2DZjiz+aiHFfSUOPsi/UyEB3srggE
eBr5pkG0Ej38JPGqv9fYQPOgUbju228/fO53nkxI4KcKF7csJLnSl0khc+JYVE6O3jtBJi
g5OfxVkim/yUrZ3M5tDx8WMWIMMiUxYlCdXXrWYB71nmHylBxBW181V10mB0gMZf8hotBj
7zgt3rRwL95vcT/Ie4TphyA81lJkDmHoMVlg7XDD3sxHuF6U2qgKe0oK6djS0g==
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=1718791311;
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=6s9PeV+ipdqEQImCDlvMOHjDqlFgxnHdVyZUzj+abWU=;
b=CsHrEQ5KAS6CJ5SiFggwbofpUSZ2JY6PJBqza0aB2Lk6rGQQZS1BIxmNkSeWYDZoEkr1n2
lck0f7bySrKcu26fWD4T74mtfD0vdNFjHitxFQDaK3S3VWj3N/nfvGDHZVlVNaMjg0YbVP
JARwbE4gcRQ1DmFn5iz8WdhqU+N4v0UxDjdoqj+/zDuvo0SRZxxN/9Fm25dQoxvxUmDcaO
uRUILGdl2ZwWPRV8p+ADwQksxYlf3EBVEkAkNgB5v2jOs05J2Tnq+D1Lu4xGKpsXMWFISx
UooYK3wCzh79eg1kDUrgxaIfgNl436FZHw7NMqi1fl2ht19sgSQTCmg2I6YYqw==
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 4W3zg354m0zdSB;
Wed, 19 Jun 2024 10:01:51 +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 45JA1pjA031517;
Wed, 19 Jun 2024 10:01:51 GMT
(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 45JA1pfE031514;
Wed, 19 Jun 2024 10:01:51 GMT
(envelope-from git)
Date: Wed, 19 Jun 2024 10:01:51 GMT
Message-Id: <202406191001.45JA1pfE031514@gitrepo.freebsd.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
dev-commits-src-branches@FreeBSD.org
From: Christos Margiolis <christos@FreeBSD.org>
Subject: git: f1ee9f5425bd - stable/14 - sound: Support oss_audioinfo->cmd
List-Id: Commits to the stable branches of the FreeBSD src repository <dev-commits-src-branches.freebsd.org>
List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches
List-Help: <mailto:dev-commits-src-branches+help@freebsd.org>
List-Post: <mailto:dev-commits-src-branches@freebsd.org>
List-Subscribe: <mailto:dev-commits-src-branches+subscribe@freebsd.org>
List-Unsubscribe: <mailto:dev-commits-src-branches+unsubscribe@freebsd.org>
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: christos
X-Git-Repository: src
X-Git-Refname: refs/heads/stable/14
X-Git-Reftype: branch
X-Git-Commit: f1ee9f5425bd1d5798ad7e88c5b803308bd518c5
Auto-Submitted: auto-generated
The branch stable/14 has been updated by christos:
URL: https://cgit.FreeBSD.org/src/commit/?id=f1ee9f5425bd1d5798ad7e88c5b803308bd518c5
commit f1ee9f5425bd1d5798ad7e88c5b803308bd518c5
Author: Christos Margiolis <christos@FreeBSD.org>
AuthorDate: 2024-06-18 13:18:58 +0000
Commit: Christos Margiolis <christos@FreeBSD.org>
CommitDate: 2024-06-19 10:01:33 +0000
sound: Support oss_audioinfo->cmd
Sponsored by: The FreeBSD Foundation
MFC after: 1 day
Reviewed by: dev_submerge.ch, markj
Differential Revision: https://reviews.freebsd.org/D45603
(cherry picked from commit 8e36d212594b542cb0c57d549e0b57fd0f7e307c)
---
sys/dev/sound/pcm/dsp.c | 10 +++-------
1 file changed, 3 insertions(+), 7 deletions(-)
diff --git a/sys/dev/sound/pcm/dsp.c b/sys/dev/sound/pcm/dsp.c
index c737df33b97d..0f6d7e6b7f49 100644
--- a/sys/dev/sound/pcm/dsp.c
+++ b/sys/dev/sound/pcm/dsp.c
@@ -2047,6 +2047,7 @@ dsp_oss_audioinfo_unavail(oss_audioinfo *ai, int unit)
ai->dev = unit;
snprintf(ai->name, sizeof(ai->name), "pcm%d (unavailable)", unit);
ai->pid = -1;
+ strlcpy(ai->cmd, CHN_COMM_UNUSED, sizeof(ai->cmd));
ai->card_number = unit;
ai->port_number = unit;
ai->mixer_dev = -1;
@@ -2132,6 +2133,7 @@ dsp_oss_audioinfo(struct cdev *i_dev, oss_audioinfo *ai, bool ex)
ai->dev = unit;
strlcpy(ai->name, device_get_desc(d->dev), sizeof(ai->name));
ai->pid = -1;
+ strlcpy(ai->cmd, CHN_COMM_UNKNOWN, sizeof(ai->cmd));
ai->card_number = -1;
ai->port_number = -1;
ai->mixer_dev = (d->mixer_dev != NULL) ? unit : -1;
@@ -2317,14 +2319,8 @@ dsp_oss_engineinfo(struct cdev *i_dev, oss_audioinfo *ai)
else
ai->busy = (ch->direction == PCMDIR_PLAY) ? OPEN_WRITE : OPEN_READ;
- /**
- * @note
- * @c cmd - OSSv4 docs: "Only supported under Linux at
- * this moment." Cop-out, I know, but I'll save
- * running around in the process table for later.
- * Is there a risk of leaking information?
- */
ai->pid = ch->pid;
+ strlcpy(ai->cmd, ch->comm, sizeof(ai->cmd));
/*
* These flags stolen from SNDCTL_DSP_GETCAPS handler.
From nobody Wed Jun 19 10:01: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 4W3zg50R2wz5PKG6;
Wed, 19 Jun 2024 10:01: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 "R3" (verified OK))
by mx1.freebsd.org (Postfix) with ESMTPS id 4W3zg46SnYz4JsV;
Wed, 19 Jun 2024 10:01:52 +0000 (UTC)
(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
t=1718791312;
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=0ie/JrYBnQZ7V8y2lzBWlBpK0dF6PlPWs05xAkr5wJk=;
b=w20uDQtGRMQZRSWnAHsOJQ0wycCjIrZzh1WMzO6jc6wvqmYYoQOoERTLkOjPb2iCT1Ewid
J6/8SgIoYbCoaCCpND/eV/MxFHyT3YmoSDYv7jxlfl/IwugXW/4yPVrY9tsO+qaVEfNmDB
eUn8Njvs1s5wupqVKBUvt326zP7lV32baVHKeFKCxoAYOPyjKWl+6wfihSTlrIQdDw/VYE
JmhWHb2GsT+dlGZBc/RMDHvjNDK04Whu/+NkClyk8trrvHFYsQg1OaIGd88VkpcCFK1LCd
QxN+J3zSwLc3rBKIaEn+uuKxMvtrew/nqepg2VC2O8kPQUOPJ1nzg4ozvEVspw==
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1718791312; a=rsa-sha256; cv=none;
b=ZTeF0pBzIahaHHTANFTdKs0KcOjnxWXIwvyqSszRSJaAxriiSCvhNfvvZ35cW4zuCsm5cs
f61yWE/Wiq0lw57VneW4FB+7v5Wu8SJzACf9azC+iz86cSN1XtQkR0/Q6ej7uxxcoutSm3
i9mmtxQNpLEz2mlcXoJdzUv+rYOR89Gn0IXXu5Pn9pY6p4YZtdm99euKYw8cXdfN4ACLBT
5nxHeKbApmGFnnqWAPrFNpmt8jRwwdU0Lq1Fq0rRl9BzObGW1HieAeU4uwaKpvC09NSuHl
ogmIld5wROzxGOTco5cHmZZxWOW27hC2jksHY9ikFt3/3W/l3ymqNB4IFxdqnA==
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=1718791312;
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=0ie/JrYBnQZ7V8y2lzBWlBpK0dF6PlPWs05xAkr5wJk=;
b=DCfTl2t3V0gufQCk5OGo9ygpzM92b5UEt+PdPk1CSkw9rSUoLge7ggDiE04sIRGVXN9F1N
HpsHhUgyol5pgQk+qH9WhtWjbGKcfQAIckPf0wWzn2j9CrkHUJiNPSU81JLfNNvJ9N9fPx
R0jxo6hj4D1tfeNFii0VXfkQhi8XZP1UdekMc9dsvNiAwYrg5H+A3TNFJl8LPP5rGf9GEg
r4g/HF6/ZaIIAvVbjJQWG2Icy2rvR6jPBLr4it9r0y8ReIznucc9NjealR21D1jlMme3H7
kXh+jIgvlJVaucnRvzrO6ok5x1qpSY673WjNhO3eiYCov4hGXH/5l8ULEfu64g==
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 4W3zg464vzzd8D;
Wed, 19 Jun 2024 10:01: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 45JA1qoh031569;
Wed, 19 Jun 2024 10:01:52 GMT
(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 45JA1qgQ031566;
Wed, 19 Jun 2024 10:01:52 GMT
(envelope-from git)
Date: Wed, 19 Jun 2024 10:01:52 GMT
Message-Id: <202406191001.45JA1qgQ031566@gitrepo.freebsd.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
dev-commits-src-branches@FreeBSD.org
From: Christos Margiolis <christos@FreeBSD.org>
Subject: git: 6f090333db2a - stable/14 - sound: Fix oss_audioinfo's
card_number, port_number and legacy_device
List-Id: Commits to the stable branches of the FreeBSD src repository <dev-commits-src-branches.freebsd.org>
List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches
List-Help: <mailto:dev-commits-src-branches+help@freebsd.org>
List-Post: <mailto:dev-commits-src-branches@freebsd.org>
List-Subscribe: <mailto:dev-commits-src-branches+subscribe@freebsd.org>
List-Unsubscribe: <mailto:dev-commits-src-branches+unsubscribe@freebsd.org>
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: christos
X-Git-Repository: src
X-Git-Refname: refs/heads/stable/14
X-Git-Reftype: branch
X-Git-Commit: 6f090333db2a9fe6d7f446145054eddd50ddc3fb
Auto-Submitted: auto-generated
The branch stable/14 has been updated by christos:
URL: https://cgit.FreeBSD.org/src/commit/?id=6f090333db2a9fe6d7f446145054eddd50ddc3fb
commit 6f090333db2a9fe6d7f446145054eddd50ddc3fb
Author: Christos Margiolis <christos@FreeBSD.org>
AuthorDate: 2024-06-18 13:19:07 +0000
Commit: Christos Margiolis <christos@FreeBSD.org>
CommitDate: 2024-06-19 10:01:33 +0000
sound: Fix oss_audioinfo's card_number, port_number and legacy_device
Although the docs advise against using them, it doesn't hurt to fill
them out correctly.
Sponsored by: The FreeBSD Foundation
MFC after: 1 day
Reviewed by: dev_submerge.ch, markj
Differential Revision: https://reviews.freebsd.org/D45604
(cherry picked from commit 0f878cdfc5a46cc0dc198e12758f12558dfb1bf6)
---
sys/dev/sound/pcm/dsp.c | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/sys/dev/sound/pcm/dsp.c b/sys/dev/sound/pcm/dsp.c
index 0f6d7e6b7f49..f94e5c05a743 100644
--- a/sys/dev/sound/pcm/dsp.c
+++ b/sys/dev/sound/pcm/dsp.c
@@ -2134,8 +2134,8 @@ dsp_oss_audioinfo(struct cdev *i_dev, oss_audioinfo *ai, bool ex)
strlcpy(ai->name, device_get_desc(d->dev), sizeof(ai->name));
ai->pid = -1;
strlcpy(ai->cmd, CHN_COMM_UNKNOWN, sizeof(ai->cmd));
- ai->card_number = -1;
- ai->port_number = -1;
+ ai->card_number = unit;
+ ai->port_number = unit;
ai->mixer_dev = (d->mixer_dev != NULL) ? unit : -1;
ai->legacy_device = unit;
snprintf(ai->devnode, sizeof(ai->devnode), "/dev/dsp%d", unit);
@@ -2371,20 +2371,20 @@ dsp_oss_engineinfo(struct cdev *i_dev, oss_audioinfo *ai)
* should normally not use this field for any
* purpose."
*/
- ai->card_number = -1;
+ ai->card_number = unit;
/**
* @todo @c song_name - depends first on
* SNDCTL_[GS]ETSONG @todo @c label - depends
* on SNDCTL_[GS]ETLABEL
* @todo @c port_number - routing information?
*/
- ai->port_number = -1;
+ ai->port_number = unit;
ai->mixer_dev = (d->mixer_dev != NULL) ? unit : -1;
/**
* @note
* @c legacy_device - OSSv4 docs: "Obsolete."
*/
- ai->legacy_device = -1;
+ ai->legacy_device = unit;
snprintf(ai->devnode, sizeof(ai->devnode), "/dev/dsp%d", unit);
ai->enabled = device_is_attached(d->dev) ? 1 : 0;
/**
From nobody Wed Jun 19 10:01:53 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 4W3zg61j5Kz5PKJd;
Wed, 19 Jun 2024 10:01: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 4W3zg60Npbz4Jsd;
Wed, 19 Jun 2024 10:01:54 +0000 (UTC)
(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
t=1718791314;
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=AZnffPG6YrYajKESXQD0e6fuLsWw/I7vhcq8yAa60To=;
b=bO7Mxpy96tibreNx1cdubxQLKL4de+eFFx1mvX1dUPF7vfzCgDyP93+xFwF69DGPOnB22a
GDjdxWR3k4VatKXe11t0M8e3QJsOHmwN/DADhzIwZrzrMmaGBxEdgvp4Q8NYY2m8Mlc2Es
mTyHsOZ5eutNZlkAh7zUSEgRJUdGn3d3IYJ/HSRbgsYvCxqbT6USTabIRQ2/QQBh5XuVmp
KZvcZqgWJWC1gk482f/ev3YJk1qrm7t9v8xAkoQWnnOmdp+aw441UmiisDmC3bxybwg6nv
szzYIweHe9tgNBXq1z2vqlCwejkVDVabuiUWk3ZayZCQdEvptDDUtBlWvDU2dA==
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1718791314; a=rsa-sha256; cv=none;
b=p7v+pcr1eesvkVbKiyF0R2OBdlGb2vU2SVeGDeRyKRIEx+JSPqHE0nEAUbBj8vb+15aivm
wYCGUBV5p7Lel80FRJr0NRzBuR3VsROR9aPNzTih5z9flwFomdNEF2TMjmDVDhHY2ZCFrY
2siYSzypTf6XW+tf+tuBSgEVvETa992uXH29/WUDACjH5creX9ADJ9+f6j6O8ZLTK/dSSt
84iAFqq/prW8dvjkjgdqL9bsLP3HrO88qwX1Wei4Z1+22FripbDIksXNBp+klxHhErIAMj
NNUz9oNu/hsopm8QI+eT+NEYIFGBratPHHO3V6DVPPv7SPBvXlYKDvgVIsJWSg==
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=1718791314;
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=AZnffPG6YrYajKESXQD0e6fuLsWw/I7vhcq8yAa60To=;
b=Vsam6v1eXlkELu82oeQA0+ol9XdE4tcGKwPSicrkg7ImcL0Jl++0msse9d7EzN8WK0c+gw
rxfmR1jLkdW60GmfdHashrmd3B67ypWj1tuCRzXRvL0rKGa9iUw+yiA6IWjCEQ4oMbH4xJ
3hR1kywqnl6ZtAU/vBWvwzOgQCaBkLmPlNUev9PO4RbjngLn4/HkLvtt0moF197ljcpXbI
9hnOCyIqFnFcdJWosOqA7YGwTQ5+YptPsajLEOjzlICJgpf/3IXAv/p784gYp8PaP75qc0
5hftay0CFE9V1lItfjnAswKYn8CE0JTdttkxTuYJA9EDeG7TCnRp093hkMj71A==
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 4W3zg574YLzdDk;
Wed, 19 Jun 2024 10:01:53 +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 45JA1rAY031617;
Wed, 19 Jun 2024 10:01:53 GMT
(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 45JA1r5d031614;
Wed, 19 Jun 2024 10:01:53 GMT
(envelope-from git)
Date: Wed, 19 Jun 2024 10:01:53 GMT
Message-Id: <202406191001.45JA1r5d031614@gitrepo.freebsd.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
dev-commits-src-branches@FreeBSD.org
From: Christos Margiolis <christos@FreeBSD.org>
Subject: git: 935c5a5554e9 - stable/14 - sound: Remove outdated
comment in dsp_oss_engineinfo()
List-Id: Commits to the stable branches of the FreeBSD src repository <dev-commits-src-branches.freebsd.org>
List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches
List-Help: <mailto:dev-commits-src-branches+help@freebsd.org>
List-Post: <mailto:dev-commits-src-branches@freebsd.org>
List-Subscribe: <mailto:dev-commits-src-branches+subscribe@freebsd.org>
List-Unsubscribe: <mailto:dev-commits-src-branches+unsubscribe@freebsd.org>
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: christos
X-Git-Repository: src
X-Git-Refname: refs/heads/stable/14
X-Git-Reftype: branch
X-Git-Commit: 935c5a5554e9726643f51d40d53de604fd30ab57
Auto-Submitted: auto-generated
The branch stable/14 has been updated by christos:
URL: https://cgit.FreeBSD.org/src/commit/?id=935c5a5554e9726643f51d40d53de604fd30ab57
commit 935c5a5554e9726643f51d40d53de604fd30ab57
Author: Christos Margiolis <christos@FreeBSD.org>
AuthorDate: 2024-06-18 13:19:16 +0000
Commit: Christos Margiolis <christos@FreeBSD.org>
CommitDate: 2024-06-19 10:01:34 +0000
sound: Remove outdated comment in dsp_oss_engineinfo()
Since we e07f9178502b ("sound: Separate implementations for
SNDCTL_AUDIOINFO[_EX] and SNDCTL_ENGINEINFO") support more than
mono/stereo.
Sponsored by: The FreeBSD Foundation
MFC after: 1 day
Reviewed by: dev_submerge.ch, markj, emaste
Differential Revision: https://reviews.freebsd.org/D45605
(cherry picked from commit 914c2b3314e8f6e31833e33cfdcc4843f88fe31b)
---
sys/dev/sound/pcm/dsp.c | 8 +-------
1 file changed, 1 insertion(+), 7 deletions(-)
diff --git a/sys/dev/sound/pcm/dsp.c b/sys/dev/sound/pcm/dsp.c
index f94e5c05a743..0eb41faaae45 100644
--- a/sys/dev/sound/pcm/dsp.c
+++ b/sys/dev/sound/pcm/dsp.c
@@ -2337,13 +2337,7 @@ dsp_oss_engineinfo(struct cdev *i_dev, oss_audioinfo *ai)
/*
* Collect formats supported @b natively by the
- * device. Also determine min/max channels. (I.e.,
- * mono, stereo, or both?)
- *
- * If any channel is stereo, maxch = 2;
- * if all channels are stereo, minch = 2, too;
- * if any channel is mono, minch = 1;
- * and if all channels are mono, maxch = 1.
+ * device. Also determine min/max channels.
*/
minch = INT_MAX;
maxch = 0;
From nobody Wed Jun 19 20:36:48 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 4W4Flj1FK8z5NnC8;
Wed, 19 Jun 2024 20:36:49 +0000 (UTC)
(envelope-from git@FreeBSD.org)
Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3])
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256
client-signature RSA-PSS (4096 bits) client-digest SHA256)
(Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK))
by mx1.freebsd.org (Postfix) with ESMTPS id 4W4Flj0l0Pz4NdL;
Wed, 19 Jun 2024 20:36:49 +0000 (UTC)
(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
t=1718829409;
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=gKqW6NEP5FII4wKcXobJnk1E/KZo5P8SL2vX56CfOEo=;
b=xiHIDGBK6yP/MviJ/kJn1xyKE1edoJddAfVH0nguqhIKr+g6EoC5L342MW1e8o0QCG2tqa
jiz9BukO+bAYQEKU1oD86iwogsQCg/1a8vIzJDQux0B7r8vGMmebyJawhYzfArvktzTahC
sSuRC3zQcn43AZwLTqAWJ4XrYfaGy7H1J4IompBIKduq/ZpBKOPvEZd9Rk05mPPOpxmlWa
01fdmrtjC7QY5Hq+62Dfky0Zf9Rsi7Yg+nkmC/0dr6v1+PtODrFFArMRBoDGfvym4Jwk2A
90UyxRZ+lYgRn7yJ9xFeQwZHsd/7ZVt+Ny9YK9Krri/9gPaAUhp0Fg6OmLbmWQ==
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1718829409; a=rsa-sha256; cv=none;
b=InHG2UQ4MzWB5FZxY0SwM8ikGjnJUIc/+kIHUjniRlCBIXDqJowPOxKMlzd0uKXqAJP+46
hmtxkBfDvPRW7+OvSXHSO1BtxEoi6W8aKq7A4eDIKYZQ5W37otkO+CAhJSp269sDHBk0eb
dPP0C/AAljLUNhu1CUcjVPDwuZRJ28cOeVzxTtgph+Z8WSUZMPuh9iTVl31NXYN27drPmK
RCqmDJAELYyU5mqJaGZSHRraIcvX3NfGHMK4KtxuXOhkdIL32MhcZxmOcB9Fz2/eW7rSTt
XOwEbw8xMVRD8bZG8SpXyLLr2pHa7eh/2am1n8nRdR4je8UxvhkAU+y4VJGbVA==
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=1718829409;
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=gKqW6NEP5FII4wKcXobJnk1E/KZo5P8SL2vX56CfOEo=;
b=LM9vBQMQ83ENLIFpobX084k8OGUe0G3fbRZwikFzqv+e0Xfc0+TZjSRE5IGHM26U+XCEpN
Dorcdpv8jG+EXvJtVK/BNCRaEn7nQKjYZ6YNod2WJK5VFIbS+wGl3zZcmLBjzkvW0WmsUy
Fby5ZkrCpX2C/j/9aVi0PKZyhWLM7mTZ9T387hTHwcaxliFi/Mt7agVmuwsKj2VEE99XoH
/OGOOdo8qipkuhp5tZoC5zvZMZ/KQr8VYP2T31sbSk2r7E+Yt1CGMbisuF4LesgTHhaD8O
ROgm5XHpr4s3uqBIi2MnrhpMwpEE/83DihYxSX8Lbwg48HiiDlpIIZIkkEUxVw==
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 4W4Flj0DTzzx5w;
Wed, 19 Jun 2024 20:36: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 45JKamBd001815;
Wed, 19 Jun 2024 20:36:48 GMT
(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 45JKamEi001812;
Wed, 19 Jun 2024 20:36:48 GMT
(envelope-from git)
Date: Wed, 19 Jun 2024 20:36:48 GMT
Message-Id: <202406192036.45JKamEi001812@gitrepo.freebsd.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
dev-commits-src-branches@FreeBSD.org
From: Gordon Tetlow <gordon@FreeBSD.org>
Subject: git: f566b7eb8d94 - releng/14.1 - Destroy ARC buffer in
case of fill error
List-Id: Commits to the stable branches of the FreeBSD src repository <dev-commits-src-branches.freebsd.org>
List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches
List-Help: <mailto:dev-commits-src-branches+help@freebsd.org>
List-Post: <mailto:dev-commits-src-branches@freebsd.org>
List-Subscribe: <mailto:dev-commits-src-branches+subscribe@freebsd.org>
List-Unsubscribe: <mailto:dev-commits-src-branches+unsubscribe@freebsd.org>
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: gordon
X-Git-Repository: src
X-Git-Refname: refs/heads/releng/14.1
X-Git-Reftype: branch
X-Git-Commit: f566b7eb8d94bdde7ad9ddf9bdc9cf336678c386
Auto-Submitted: auto-generated
The branch releng/14.1 has been updated by gordon:
URL: https://cgit.FreeBSD.org/src/commit/?id=f566b7eb8d94bdde7ad9ddf9bdc9cf336678c386
commit f566b7eb8d94bdde7ad9ddf9bdc9cf336678c386
Author: Alexander Motin <mav@FreeBSD.org>
AuthorDate: 2024-05-25 02:11:18 +0000
Commit: Gordon Tetlow <gordon@FreeBSD.org>
CommitDate: 2024-06-18 17:35:52 +0000
Destroy ARC buffer in case of fill error
In case of error dmu_buf_fill_done() returns the buffer back into
DB_UNCACHED state. Since during transition from DB_UNCACHED into
DB_FILL state dbuf_noread() allocates an ARC buffer, we must free
it here, otherwise it will be leaked.
Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
Reviewed-by: Jorgen Lundman <lundman@lundman.net>
Signed-off-by: Alexander Motin <mav@FreeBSD.org>
Sponsored by: iXsystems, Inc.
Closes #15665
Closes #15802
Closes #16216
PR: 276341
Approved by: so
Security: FreeBSD-EN-24:10.zfs
(cherry picked from commit 02c5aa9b092818785ed8db4e2246a828278138e3)
(cherry picked from commit 1c27279ed22d2b5226f31836da041bae45a9c77b)
---
sys/contrib/openzfs/module/zfs/dbuf.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/sys/contrib/openzfs/module/zfs/dbuf.c b/sys/contrib/openzfs/module/zfs/dbuf.c
index bb921af6d78a..0576da6475b1 100644
--- a/sys/contrib/openzfs/module/zfs/dbuf.c
+++ b/sys/contrib/openzfs/module/zfs/dbuf.c
@@ -2840,6 +2840,7 @@ dmu_buf_fill_done(dmu_buf_t *dbuf, dmu_tx_t *tx, boolean_t failed)
failed = B_FALSE;
} else if (failed) {
VERIFY(!dbuf_undirty(db, tx));
+ arc_buf_destroy(db->db_buf, db);
db->db_buf = NULL;
dbuf_clear_data(db);
DTRACE_SET_STATE(db, "fill failed");
From nobody Wed Jun 19 20:36:50 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 4W4Flk23s5z5NnbZ;
Wed, 19 Jun 2024 20:36: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 4W4Flk1Nq6z4NkM;
Wed, 19 Jun 2024 20:36:50 +0000 (UTC)
(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
t=1718829410;
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=FF4F4hFiY02f8iSo5MgNN7mvYv8nkVtvSMT//tDUdyw=;
b=KUTP0snls8l6fs4lalru68SS+xhadz3YzSQlXgmH0lde5Xoae6zaBBDsexUridV4JnDQBp
bFUYgOCNdzpjTLF+aNAnJwRq/bv4SaBRwkcxpXiQTQhwkl23EhOABJnZgTYmyko/3l/HKY
HyU3I3rxEFUhdpiHq9O9s3Jln8b7x3qqxwnf7/gbsWQ0Rgk7D/u4YOxSrnWL/pL9CWGL3T
xsoRPQ000KICyD232jmsdSIuqfXuPq1YwEPThPt4U/rDNmr8AxPx1tTCkc1LAwYcryOleP
YX+2DjwTQKwJ2PoVsHy57ckKYQrLOu2QSqpr4BxXTCJq0iHYyCkmi2g7gJYnEA==
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1718829410; a=rsa-sha256; cv=none;
b=ASRwzgT+f0coLPNTMnljKv4okYDavLnYGStAyGK9vuKNYv/iBDYayUsKyDSvg9iXXUXsYr
8AYv3hgC+SE8HO/2U1AcaFDmOV/wzKn4SDpD6zB1zgFT+618V3A/uypOWIh9SYz1P6npu6
Oc4wtR53iys54d4QMPkjGuu7evdRKgtr6pegxY0J6rDLnJGGwnjKnwHW6W1P+Ru+9DAbO9
fwZTVfeF11GubfszRfeBVFDGjGIlah6O+sVlZrRs4+DVSwoNzEmuJhaYn18gDyXB97HvJS
WHskZ3UJaV8Wj8YVArXhEsZ3aQbMtRug+455TI2zLaqkErSAXfCFZjCsF7aSWg==
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=1718829410;
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=FF4F4hFiY02f8iSo5MgNN7mvYv8nkVtvSMT//tDUdyw=;
b=kKtLS009Sorw2F2nZ4crFBNWLxDI8Uqe2VQZJLQwp7T+PXoyWx9V6WV0yghN4MMgeiRGIO
2mC2+XpmlHxoMZ1ozXWUGSdozm5yTCoaDdLaSW9klZF8OEl/bpkrkjZ24PJlMyLEh10kDX
uG60PtlYVHJlvLMl02Rd5OI9GlYf1Kh6oGrZlL+8hDpzsEpIt25G8uaOiZ6oZtQgw49z67
cLH4gCh95oeWM4oZSkOOJGdV++uFNh5q0nFpxZCu10Akg98KLa2vnqE6aSSIewh+asrkgm
PAy90qioDDfwB7vM0udUQKcaBR0TS1oOTBxmLSL6hsfZ6Z3l2sZr4+Oy9NV0Dw==
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 4W4Flk10YjzwNZ;
Wed, 19 Jun 2024 20:36:50 +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 45JKaoLf001888;
Wed, 19 Jun 2024 20:36:50 GMT
(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 45JKaoZP001880;
Wed, 19 Jun 2024 20:36:50 GMT
(envelope-from git)
Date: Wed, 19 Jun 2024 20:36:50 GMT
Message-Id: <202406192036.45JKaoZP001880@gitrepo.freebsd.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
dev-commits-src-branches@FreeBSD.org
From: Gordon Tetlow <gordon@FreeBSD.org>
Subject: git: 8e0e6b428cb8 - releng/14.1 - Merge commit 382f70a877f0
from llvm-project (by Louis Dionne):
List-Id: Commits to the stable branches of the FreeBSD src repository <dev-commits-src-branches.freebsd.org>
List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches
List-Help: <mailto:dev-commits-src-branches+help@freebsd.org>
List-Post: <mailto:dev-commits-src-branches@freebsd.org>
List-Subscribe: <mailto:dev-commits-src-branches+subscribe@freebsd.org>
List-Unsubscribe: <mailto:dev-commits-src-branches+unsubscribe@freebsd.org>
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: gordon
X-Git-Repository: src
X-Git-Refname: refs/heads/releng/14.1
X-Git-Reftype: branch
X-Git-Commit: 8e0e6b428cb8ba01941e53256880f7993671e786
Auto-Submitted: auto-generated
The branch releng/14.1 has been updated by gordon:
URL: https://cgit.FreeBSD.org/src/commit/?id=8e0e6b428cb8ba01941e53256880f7993671e786
commit 8e0e6b428cb8ba01941e53256880f7993671e786
Author: Dimitry Andric <dim@FreeBSD.org>
AuthorDate: 2024-06-07 18:42:53 +0000
Commit: Gordon Tetlow <gordon@FreeBSD.org>
CommitDate: 2024-06-18 17:36:40 +0000
Merge commit 382f70a877f0 from llvm-project (by Louis Dionne):
[libc++][NFC] Rewrite function call on two lines for clarity (#79141)
Previously, there was a ternary conditional with a less-than comparison
appearing inside a template argument, which was really confusing because
of the <...> of the function template. This patch rewrites the same
statement on two lines for clarity.
Merge commit d129ea8d2fa3 from llvm-project (by Vitaly Buka):
[libcxx] Align `__recommend() + 1` by __endian_factor (#90292)
This is detected by asan after #83774
Allocation size will be divided by `__endian_factor` before storing. If
it's not aligned,
we will not be able to recover allocation size to pass into
`__alloc_traits::deallocate`.
we have code like this
```
auto __allocation = std::__allocate_at_least(__alloc(), __recommend(__sz) + 1);
__p = __allocation.ptr;
__set_long_cap(__allocation.count);
void __set_long_cap(size_type __s) _NOEXCEPT {
__r_.first().__l.__cap_ = __s / __endian_factor;
__r_.first().__l.__is_long_ = true;
}
size_type __get_long_cap() const _NOEXCEPT {
return __r_.first().__l.__cap_ * __endian_factor;
}
inline ~basic_string() {
__annotate_delete();
if (__is_long())
__alloc_traits::deallocate(__alloc(), __get_long_pointer(), __get_long_cap());
}
```
1. __recommend() -> even size
2. `std::__allocate_at_least(__alloc(), __recommend(__sz) + 1)` - > not
even size
3. ` __set_long_cap() `- > lose one bit of size for __endian_factor == 2
(see `/ __endian_factor`)
4. `__alloc_traits::deallocate(__alloc(), __get_long_pointer(),
__get_long_cap())` -> uses even size (see `__get_long_cap`)
This should fix incorrect deallocation sizes for some instances of
std::string. Memory profiling or debugging tools like AddressSanitizer,
LeakSanitizer or TCMalloc could then complain about the the size passed
to a deallocation not matching the size originally passed to the
allocation.
Reported by: Aliaksei Kandratsenka <alkondratenko@gmail.com>
PR: 279560
Approved by: so
Security: FreeBSD-EN-24:13.libc++
(cherry picked from commit ead8e4c081e5c4de4d508fc353f381457b058ca6)
(cherry picked from commit 55c5dad2f305f74d1ff5ca85c453635511aab9b2)
---
contrib/llvm-project/libcxx/include/string | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/contrib/llvm-project/libcxx/include/string b/contrib/llvm-project/libcxx/include/string
index ba169c3dbfc9..56e2ef09947f 100644
--- a/contrib/llvm-project/libcxx/include/string
+++ b/contrib/llvm-project/libcxx/include/string
@@ -1943,10 +1943,10 @@ private:
if (__s < __min_cap) {
return static_cast<size_type>(__min_cap) - 1;
}
- size_type __guess =
- __align_it < sizeof(value_type) < __alignment ? __alignment / sizeof(value_type) : 1 > (__s + 1) - 1;
+ const size_type __boundary = sizeof(value_type) < __alignment ? __alignment / sizeof(value_type) : __endian_factor;
+ size_type __guess = __align_it<__boundary>(__s + 1) - 1;
if (__guess == __min_cap)
- ++__guess;
+ __guess += __endian_factor;
return __guess;
}
From nobody Wed Jun 19 20:36: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 4W4Fll5hFjz5NnFD;
Wed, 19 Jun 2024 20:36:51 +0000 (UTC)
(envelope-from git@FreeBSD.org)
Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3])
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256
client-signature RSA-PSS (4096 bits) client-digest SHA256)
(Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK))
by mx1.freebsd.org (Postfix) with ESMTPS id 4W4Fll2PN4z4NbN;
Wed, 19 Jun 2024 20:36:51 +0000 (UTC)
(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
t=1718829411;
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=DNqXX1eYejL/McekXv00ZrN6KxWLXr4UIOd4sFzy4ms=;
b=kHx5/hmhdkB6EA+xfcYz02DB8R0XcmjB3d5XyXC57KFCwhelooP6TRAIXtx34/yTGiLr7r
VXphJLpj4quT6rpPJbDNZZNSWiiQFUU1oH7x0OD2+5JRRDbQh93gHRpjmS6sperj0Ebbt8
TMKE/uV/FxzpahqVA0IzR4IFl4UcUYBObtcBYgy0kX21tzfHOMC0E3g69HG7ke6YML8QBc
7u+9o7B59vys5655V2KEvm9BNsUyfv2BM2G0xW3WtolP9O9oUSmvQht8+xo73kXrrHdfqL
/AXF2caOWQo8vUty7bS8yvSqPlK43kW4SJgQW92VvXwX+DuY6aXl13jlyGnazA==
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1718829411; a=rsa-sha256; cv=none;
b=PuxpNr/BXWKYenX/oGi2qurGPNv/r2vRGUYOs165oJY0y4rvGZOiZGDSS+ktB6/icXBnJT
0tTZERYahD2KpxZ1DFZ6zggxlq3VFipwe4DmpCTImyGTd8t1mlwfHsyoCzjyx5Gvh0fFPc
nJKZLGU0cTx1vEEYtq5zjk0P96Gia459E11JIcPWYisz2awTHeLiRF/wN//kzepdjY8MhW
TYngf4ntTE2jzkDn13N9ISg/pMjuC+2n2+NlvBiW8l2C76lSLlPRO0MHalcm7FRss60EDa
oJ7GNXd7uxdVrEsbr3UjIvbfLkSKQDieyPRk21txFda7cum5lhg+MctIDztpeA==
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=1718829411;
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=DNqXX1eYejL/McekXv00ZrN6KxWLXr4UIOd4sFzy4ms=;
b=yiL4vNZR/frcQIK+qSbyWYAbmY/MMEY7yqkABuDbeFWmtc353N59edAIBcQx2QY6AyIiGU
SmpFC5NBm4NLWQacsOXbDL/QIAJdetYaZ+tu7ZbP5FjMa4OYdAOnzCw7Z3OxlxPB8C22w+
kL0L4TGAyaymMAMCvwOAP4dCIQOslbGPZZ+i6RTedrE4dWuj4YsaowSShzptjG8CJxvyDw
mguXX0yGQqtw1p98HlBFp136S3fVIYwyJm030RSAJG5MCQPyi0E+ezokddE/yGSra7z93n
7r0ViT8dcxD1k52v+KRJHhEasgc+2aIJ4YGEoyB8KESNP9i2qhIcJhb6nkYkTA==
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 4W4Fll21Q5zwZs;
Wed, 19 Jun 2024 20:36:51 +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 45JKapkH001944;
Wed, 19 Jun 2024 20:36:51 GMT
(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 45JKapcV001941;
Wed, 19 Jun 2024 20:36:51 GMT
(envelope-from git)
Date: Wed, 19 Jun 2024 20:36:51 GMT
Message-Id: <202406192036.45JKapcV001941@gitrepo.freebsd.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
dev-commits-src-branches@FreeBSD.org
From: Gordon Tetlow <gordon@FreeBSD.org>
Subject: git: 0892dff10444 - releng/14.1 - Add UPDATING entries and
bump the branch version.
List-Id: Commits to the stable branches of the FreeBSD src repository <dev-commits-src-branches.freebsd.org>
List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches
List-Help: <mailto:dev-commits-src-branches+help@freebsd.org>
List-Post: <mailto:dev-commits-src-branches@freebsd.org>
List-Subscribe: <mailto:dev-commits-src-branches+subscribe@freebsd.org>
List-Unsubscribe: <mailto:dev-commits-src-branches+unsubscribe@freebsd.org>
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: gordon
X-Git-Repository: src
X-Git-Refname: refs/heads/releng/14.1
X-Git-Reftype: branch
X-Git-Commit: 0892dff104440867956a53e78c12d66090fec36b
Auto-Submitted: auto-generated
The branch releng/14.1 has been updated by gordon:
URL: https://cgit.FreeBSD.org/src/commit/?id=0892dff104440867956a53e78c12d66090fec36b
commit 0892dff104440867956a53e78c12d66090fec36b
Author: Gordon Tetlow <gordon@FreeBSD.org>
AuthorDate: 2024-06-18 17:48:38 +0000
Commit: Gordon Tetlow <gordon@FreeBSD.org>
CommitDate: 2024-06-19 20:22:12 +0000
Add UPDATING entries and bump the branch version.
Approved by: so
---
UPDATING | 8 ++++++++
sys/conf/newvers.sh | 2 +-
2 files changed, 9 insertions(+), 1 deletion(-)
diff --git a/UPDATING b/UPDATING
index 2d4a66d0d29c..d972b89c5f69 100644
--- a/UPDATING
+++ b/UPDATING
@@ -12,6 +12,14 @@ Items affecting the ports and packages system can be found in
/usr/ports/UPDATING. Please read that file before updating system packages
and/or ports.
+20240619:
+ 14.1-RELEASE-p1 EN-24:10.zfs
+ EN-24:13.libc++
+
+ Fix kernel memory leak in ZFS [EN-24:10.zfs]
+
+ Fix incorrect size passed to heap allocated std::string delete [EN-24:13.libc++]
+
20240604:
14.1-RELEASE.
diff --git a/sys/conf/newvers.sh b/sys/conf/newvers.sh
index 38d445be32a6..8b55836841d7 100644
--- a/sys/conf/newvers.sh
+++ b/sys/conf/newvers.sh
@@ -53,7 +53,7 @@
TYPE="FreeBSD"
REVISION="14.1"
-BRANCH="RELEASE"
+BRANCH="RELEASE-p1"
if [ -n "${BRANCH_OVERRIDE}" ]; then
BRANCH=${BRANCH_OVERRIDE}
fi
From nobody Wed Jun 19 20:36: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 4W4Flv4lZRz5NnSx;
Wed, 19 Jun 2024 20:36:59 +0000 (UTC)
(envelope-from git@FreeBSD.org)
Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3])
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256
client-signature RSA-PSS (4096 bits) client-digest SHA256)
(Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK))
by mx1.freebsd.org (Postfix) with ESMTPS id 4W4Flv2lsHz4Nwc;
Wed, 19 Jun 2024 20:36:59 +0000 (UTC)
(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
t=1718829419;
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=vxFwojKc5Uu6gCxqpLKMV6s5pj1KwOEiv7QWTHDHt6k=;
b=WqGti5IlTMou0MjLgkGb02bD5RGJfCbcIIKc52YLS5JeY7yL+PGcZcIolajtw+sdenARhf
7y/fIojqakZ3SEnZMH+OjKH7Hf7iehfdj3efU6onZQ3VSx3Dqzi3CO2HJptiMnpIqismAa
61AbniHyUXiXtEfz23lWEcHHUsqNYWvOYG/l+AcH77pguYYza7p2tHijkyQUrYDm/RHvNI
e+aNBoyGdv6nJObNnQ1J4mmzTfkJwswqJ5mLBhtsiHUfqu1YVHGcqLz+K8oU9z0zt4P4wr
rZC+HWQoDWo9UYel+FwG6rkrGcmW5iQiEhxZAFZa8cy1hubGdGO4MTvLqj3XCg==
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1718829419; a=rsa-sha256; cv=none;
b=sPnfyClVZVgflynXKQ5+4CX+huSCPYRFFVBCHZZsU7qDuV/eIBGrp3ABnlogZgI8tAH+Kl
nw7u5nhmEEmomDGzWuu1WTbib8TlOIILwQM6kRZ+WhOLqHbXyaXh5wOo9v6YGsy5Cdkdqq
PhIylpLoMKWFYJQx1xA9iS6fYhDot7dU0OI6UJlRfx+I9r23tBFwm2pUiiXlXAxIvq1KMp
W7mIp8OXjEErwXXLT6P9iijYJq5MRXje2MkNFD3I2HqVEJ49iZS97vwCDE17pPRjpqG2gd
JYgy2r5zLE0EoABMKBzQUWApi5E6jPaO7mLn8F/2Dwe4x4tzm0nD1Z0dClxuDg==
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=1718829419;
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=vxFwojKc5Uu6gCxqpLKMV6s5pj1KwOEiv7QWTHDHt6k=;
b=gv63EDxLVe5Rmx7EiZwuABpfKv6PJ45OgVMGxoixpBJMpW23lwJ+zf1R1hU2ZlPkw+etIk
CmPwV6isWadU31RpZ1MLxgAwRLHB1y4kyRl5M2hOJ1iUySu02PZFcde9W9isQxgYjv4eGL
32/BkMRUSeRrcvrAB5o8/tpZFds6tLceLIG9XdFWF8zQUKXNCgOVdj5YgdY8m/7iaMK9yk
xspZpHYTFj8p0mNlfs1+9pfI+o5IIaM0vWIx/P25YIA5yHc5W7FEd5kFvqkU3WftqalahR
RHOPdGG2I3vU1Tfo1PooEHJIHIeoXD8PhFBx98at2/CD0Vxf3yHg2JcbuSoaBw==
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 4W4Flv2MY3zx59;
Wed, 19 Jun 2024 20:36: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 45JKax9s002122;
Wed, 19 Jun 2024 20:36:59 GMT
(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 45JKaxMu002119;
Wed, 19 Jun 2024 20:36:59 GMT
(envelope-from git)
Date: Wed, 19 Jun 2024 20:36:59 GMT
Message-Id: <202406192036.45JKaxMu002119@gitrepo.freebsd.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
dev-commits-src-branches@FreeBSD.org
From: Gordon Tetlow <gordon@FreeBSD.org>
Subject: git: bdf75e830a77 - releng/14.0 - ldns: Ignore commented-out
lines in resolv.conf.
List-Id: Commits to the stable branches of the FreeBSD src repository <dev-commits-src-branches.freebsd.org>
List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches
List-Help: <mailto:dev-commits-src-branches+help@freebsd.org>
List-Post: <mailto:dev-commits-src-branches@freebsd.org>
List-Subscribe: <mailto:dev-commits-src-branches+subscribe@freebsd.org>
List-Unsubscribe: <mailto:dev-commits-src-branches+unsubscribe@freebsd.org>
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: gordon
X-Git-Repository: src
X-Git-Refname: refs/heads/releng/14.0
X-Git-Reftype: branch
X-Git-Commit: bdf75e830a77a16ec0baf1c9367f64c6b96c5e02
Auto-Submitted: auto-generated
The branch releng/14.0 has been updated by gordon:
URL: https://cgit.FreeBSD.org/src/commit/?id=bdf75e830a77a16ec0baf1c9367f64c6b96c5e02
commit bdf75e830a77a16ec0baf1c9367f64c6b96c5e02
Author: Dag-Erling Smørgrav <des@FreeBSD.org>
AuthorDate: 2024-05-15 10:16:24 +0000
Commit: Gordon Tetlow <gordon@FreeBSD.org>
CommitDate: 2024-06-18 17:32:56 +0000
ldns: Ignore commented-out lines in resolv.conf.
This merges upstream PR 238 + an additional bug fix.
PR: 278721
Approved by: so
Security: FreeBSD-EN-24:11.ldns
(cherry picked from commit 3b092e4936c433889cc668ea9563c8fd437d1a3e)
(cherry picked from commit 7daf36028411c3a9c73e0c75732f9cbcbf66362e)
---
contrib/ldns/ldns/parse.h | 2 ++
contrib/ldns/parse.c | 35 +++++++++++++++++++++++++++----
contrib/ldns/resolver.c | 53 ++++++++---------------------------------------
3 files changed, 42 insertions(+), 48 deletions(-)
diff --git a/contrib/ldns/ldns/parse.h b/contrib/ldns/ldns/parse.h
index ba7edf5679d8..6130dae32bd2 100644
--- a/contrib/ldns/ldns/parse.h
+++ b/contrib/ldns/ldns/parse.h
@@ -95,6 +95,8 @@ ssize_t ldns_fget_token_l(FILE *f, char *token, const char *delim, size_t limit,
*/
ldns_status ldns_fget_token_l_st(FILE *f, char **token, size_t *limit, bool fixed, const char *delim, int *line_nr);
+ssize_t ldns_fget_token_l_resolv_conf(FILE *f, char *token, const char *delim, size_t limit, int *line_nr);
+
/**
* returns a token/char from the buffer b.
* This function deals with ( and ) in the buffer,
diff --git a/contrib/ldns/parse.c b/contrib/ldns/parse.c
index 9698ba71e881..af8b2c1321b2 100644
--- a/contrib/ldns/parse.c
+++ b/contrib/ldns/parse.c
@@ -27,9 +27,14 @@ ldns_fget_token(FILE *f, char *token, const char *delim, size_t limit)
return ldns_fget_token_l(f, token, delim, limit, NULL);
}
-ldns_status
-ldns_fget_token_l_st(FILE *f, char **token, size_t *limit, bool fixed
- , const char *delim, int *line_nr)
+enum file_type2parse {
+ zone_file_type, resolv_conf_file_type
+};
+
+static ldns_status
+ldns_fget_token_l_st_file_type(FILE *f, char **token, size_t *limit,
+ bool fixed, const char *delim, int *line_nr,
+ enum file_type2parse file_type)
{
int c, prev_c;
int p; /* 0 -> no parentheses seen, >0 nr of ( seen */
@@ -98,7 +103,9 @@ ldns_fget_token_l_st(FILE *f, char **token, size_t *limit, bool fixed
}
/* do something with comments ; */
- if (c == ';' && quoted == 0) {
+ if ((c == ';'
+ || (c == '#' && file_type == resolv_conf_file_type))
+ && quoted == 0) {
if (prev_c != '\\') {
com = 1;
}
@@ -215,6 +222,26 @@ tokenread:
return i == 0 ? LDNS_STATUS_SYNTAX_EMPTY : LDNS_STATUS_OK;
}
+ldns_status
+ldns_fget_token_l_st(FILE *f, char **token, size_t *limit, bool fixed
+ , const char *delim, int *line_nr)
+{
+ return ldns_fget_token_l_st_file_type(
+ f, token, limit, fixed, delim, line_nr, zone_file_type);
+}
+
+ssize_t
+ldns_fget_token_l_resolv_conf(FILE *f, char *token, const char *delim,
+ size_t limit, int *line_nr)
+{
+ if (limit == 0)
+ limit = LDNS_MAX_LINELEN;
+ if (ldns_fget_token_l_st_file_type(f, &token, &limit, true, delim,
+ line_nr, resolv_conf_file_type))
+ return -1;
+ else
+ return (ssize_t)strlen(token);
+}
ssize_t
ldns_fget_token_l(FILE *f, char *token, const char *delim, size_t limit, int *line_nr)
diff --git a/contrib/ldns/resolver.c b/contrib/ldns/resolver.c
index f9ec65a55966..a426b82c034e 100644
--- a/contrib/ldns/resolver.c
+++ b/contrib/ldns/resolver.c
@@ -775,7 +775,7 @@ ldns_resolver_new_frm_fp_l(ldns_resolver **res, FILE *fp, int *line_nr)
#endif
ssize_t gtr, bgtr;
ldns_buffer *b;
- int lnr = 0, oldline;
+ int lnr = 0;
FILE* myfp = fp;
if(!line_nr) line_nr = &lnr;
@@ -809,36 +809,18 @@ ldns_resolver_new_frm_fp_l(ldns_resolver **res, FILE *fp, int *line_nr)
gtr = 1;
word[0] = 0;
- oldline = *line_nr;
expect = LDNS_RESOLV_KEYWORD;
while (gtr > 0) {
- /* check comments */
- if (word[0] == '#') {
- word[0]='x';
- if(oldline == *line_nr) {
- /* skip until end of line */
- int c;
- do {
- c = fgetc(myfp);
- } while(c != EOF && c != '\n');
- if(c=='\n') (*line_nr)++;
- }
- /* and read next to prepare for further parsing */
- oldline = *line_nr;
- continue;
- }
- oldline = *line_nr;
switch(expect) {
case LDNS_RESOLV_KEYWORD:
/* keyword */
- gtr = ldns_fget_token_l(myfp, word, LDNS_PARSE_NORMAL, 0, line_nr);
+ gtr = ldns_fget_token_l_resolv_conf(myfp, word, LDNS_PARSE_NORMAL, 0, line_nr);
if (gtr != 0) {
- if(word[0] == '#') continue;
for(i = 0; i < LDNS_RESOLV_KEYWORDS; i++) {
if (strcasecmp(keyword[i], word) == 0) {
/* chosen the keyword and
* expect values carefully
- */
+ */
expect = i;
break;
}
@@ -856,16 +838,12 @@ ldns_resolver_new_frm_fp_l(ldns_resolver **res, FILE *fp, int *line_nr)
break;
case LDNS_RESOLV_DEFDOMAIN:
/* default domain dname */
- gtr = ldns_fget_token_l(myfp, word, LDNS_PARSE_NORMAL, 0, line_nr);
+ gtr = ldns_fget_token_l_resolv_conf(myfp, word, LDNS_PARSE_NORMAL, 0, line_nr);
if (gtr == 0) {
if(!fp) fclose(myfp);
ldns_resolver_deep_free(r);
return LDNS_STATUS_SYNTAX_MISSING_VALUE_ERR;
}
- if(word[0] == '#') {
- expect = LDNS_RESOLV_KEYWORD;
- continue;
- }
tmp = ldns_rdf_new_frm_str(LDNS_RDF_TYPE_DNAME, word);
if (!tmp) {
if(!fp) fclose(myfp);
@@ -879,16 +857,12 @@ ldns_resolver_new_frm_fp_l(ldns_resolver **res, FILE *fp, int *line_nr)
break;
case LDNS_RESOLV_NAMESERVER:
/* NS aaaa or a record */
- gtr = ldns_fget_token_l(myfp, word, LDNS_PARSE_NORMAL, 0, line_nr);
+ gtr = ldns_fget_token_l_resolv_conf(myfp, word, LDNS_PARSE_NORMAL, 0, line_nr);
if (gtr == 0) {
if(!fp) fclose(myfp);
ldns_resolver_deep_free(r);
return LDNS_STATUS_SYNTAX_MISSING_VALUE_ERR;
}
- if(word[0] == '#') {
- expect = LDNS_RESOLV_KEYWORD;
- continue;
- }
if(strchr(word, '%')) {
/* snip off interface labels,
* fe80::222:19ff:fe31:4222%eth0 */
@@ -911,7 +885,7 @@ ldns_resolver_new_frm_fp_l(ldns_resolver **res, FILE *fp, int *line_nr)
break;
case LDNS_RESOLV_SEARCH:
/* search list domain dname */
- gtr = ldns_fget_token_l(myfp, word, LDNS_PARSE_SKIP_SPACE, 0, line_nr);
+ gtr = ldns_fget_token_l_resolv_conf(myfp, word, LDNS_PARSE_SKIP_SPACE, 0, line_nr);
b = LDNS_MALLOC(ldns_buffer);
if(!b) {
ldns_resolver_deep_free(r);
@@ -929,10 +903,6 @@ ldns_resolver_new_frm_fp_l(ldns_resolver **res, FILE *fp, int *line_nr)
bgtr = ldns_bget_token(b, word, LDNS_PARSE_NORMAL, (size_t) gtr + 1);
while (bgtr > 0) {
gtr -= bgtr;
- if(word[0] == '#') {
- expect = LDNS_RESOLV_KEYWORD;
- break;
- }
tmp = ldns_rdf_new_frm_str(LDNS_RDF_TYPE_DNAME, word);
if (!tmp) {
ldns_resolver_deep_free(r);
@@ -954,28 +924,23 @@ ldns_resolver_new_frm_fp_l(ldns_resolver **res, FILE *fp, int *line_nr)
}
break;
case LDNS_RESOLV_SORTLIST:
- gtr = ldns_fget_token_l(myfp, word, LDNS_PARSE_SKIP_SPACE, 0, line_nr);
+ gtr = ldns_fget_token_l_resolv_conf(myfp, word, LDNS_PARSE_SKIP_SPACE, 0, line_nr);
/* sortlist not implemented atm */
expect = LDNS_RESOLV_KEYWORD;
break;
case LDNS_RESOLV_OPTIONS:
- gtr = ldns_fget_token_l(myfp, word, LDNS_PARSE_SKIP_SPACE, 0, line_nr);
+ gtr = ldns_fget_token_l_resolv_conf(myfp, word, LDNS_PARSE_SKIP_SPACE, 0, line_nr);
/* options not implemented atm */
expect = LDNS_RESOLV_KEYWORD;
break;
case LDNS_RESOLV_ANCHOR:
/* a file containing a DNSSEC trust anchor */
- gtr = ldns_fget_token_l(myfp, word, LDNS_PARSE_NORMAL, 0, line_nr);
+ gtr = ldns_fget_token_l_resolv_conf(myfp, word, LDNS_PARSE_NORMAL, 0, line_nr);
if (gtr == 0) {
ldns_resolver_deep_free(r);
if(!fp) fclose(myfp);
return LDNS_STATUS_SYNTAX_MISSING_VALUE_ERR;
}
- if(word[0] == '#') {
- expect = LDNS_RESOLV_KEYWORD;
- continue;
- }
-
#ifdef HAVE_SSL
tmp_rr = ldns_read_anchor_file(word);
(void) ldns_resolver_push_dnssec_anchor(r, tmp_rr);
From nobody Wed Jun 19 20:37: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 4W4Flw4q8fz5Nnbh;
Wed, 19 Jun 2024 20:37: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 4W4Flw3pRLz4Njq;
Wed, 19 Jun 2024 20:37:00 +0000 (UTC)
(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
t=1718829420;
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=DS+L4Xs1+8cVL3zIznFkvhkxY1HUhHaEgwT7TIPUg9E=;
b=Q+eKshStorIp4ixLngr7IiQmNgUknUmCCX+s5pj4Xt5K+LI4LZBLK5nDjuiIM2h2Gkedb6
jA2RSkFD9CPCHkeut0pI1xUlEsFslKMjBqL6vSM0vP17gGIvbw5KeXHvX9p+rvijPxPVIQ
U/U5CPx6cbYeSqzlU1QBcOHtLOv1RimUB1/mVQhs2h82XU22FgiTOc17wCiviDwaeWrrPv
4CMMyupQAmrY5R2V9g6Oj/qIwivu+qAETAHmtaL1GxMDx3NRNI9eFiFRYpabgGELrnyogz
HGevAoA6/JmfYJC2dVpwGwcyzusoLyVrGAYCxxRgFs17++OjVgLCfxOnNRYvlA==
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1718829420; a=rsa-sha256; cv=none;
b=bYNVrTmPDbQ+BvaCsRejmGegwFwk9LfJim00w1Qij9G27R43jfPWPpzmyAMoOTVe4B9TYq
444NY1jkcC5GQUjU5q64nMsA+Y6RWvM5b2xsNU55pl0qZWEQ0pLCeHwGLffWHlpddVw0R7
9+lEgzuF0hSQxfsbWVinjXYk4ess190j3QIE7fK3whj5JW9+AvMv1CmVKLs3RSLETfUTMA
Zw7D3EdZgidoWQ+5P7uUOfC91SocXe1LnTJbxLg1OmtLDya1ujmtr088hPEcczAPyn+09l
LO6QNlWageHsVMaT78R+d4yjAVyogC5FXhD56VnE4KzzAnTErBxJxjvcSjHBMQ==
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=1718829420;
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=DS+L4Xs1+8cVL3zIznFkvhkxY1HUhHaEgwT7TIPUg9E=;
b=VfeNJXT1K1gujmRc7dqbVhQwIurfuanYU4eOK+pIAb7tHhb09SP3PrsbTHMm1u+Ub+PKfD
jEVt/zqQ/QexxbyIbsgftm42kx6u8e4SlP3fiz8WUHuOdNKY/4nO+9RaQmPWRRiSWvzsDi
HOSr008m6f6I+2asKr9pmOQ4WVxxNfTnb1NmknMcnf5vWsCkButgzYUYelRRBnU/Xv1mYW
vvTwhZ3tA4TV/6RXbOExkLr2B8DjEu6kQt+QKLRE7wdPO5aOWFYwvgUpOjGhUE4EmpoxRl
tWX1gbqASNN5Gya8SmFRjIz+ZUoWOTPvYCNFtB6BmqGsusnFLsUTzN4qByhhQw==
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 4W4Flw3QMZzwrZ;
Wed, 19 Jun 2024 20:37: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 45JKb0TE002179;
Wed, 19 Jun 2024 20:37:00 GMT
(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 45JKb0a1002176;
Wed, 19 Jun 2024 20:37:00 GMT
(envelope-from git)
Date: Wed, 19 Jun 2024 20:37:00 GMT
Message-Id: <202406192037.45JKb0a1002176@gitrepo.freebsd.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
dev-commits-src-branches@FreeBSD.org
From: Gordon Tetlow <gordon@FreeBSD.org>
Subject: git: bdba8eaa3db6 - releng/14.0 - Add UPDATING entries and
bump the branch version.
List-Id: Commits to the stable branches of the FreeBSD src repository <dev-commits-src-branches.freebsd.org>
List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches
List-Help: <mailto:dev-commits-src-branches+help@freebsd.org>
List-Post: <mailto:dev-commits-src-branches@freebsd.org>
List-Subscribe: <mailto:dev-commits-src-branches+subscribe@freebsd.org>
List-Unsubscribe: <mailto:dev-commits-src-branches+unsubscribe@freebsd.org>
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: gordon
X-Git-Repository: src
X-Git-Refname: refs/heads/releng/14.0
X-Git-Reftype: branch
X-Git-Commit: bdba8eaa3db6b667ac811c69d5aca46e8bf3cf8b
Auto-Submitted: auto-generated
The branch releng/14.0 has been updated by gordon:
URL: https://cgit.FreeBSD.org/src/commit/?id=bdba8eaa3db6b667ac811c69d5aca46e8bf3cf8b
commit bdba8eaa3db6b667ac811c69d5aca46e8bf3cf8b
Author: Gordon Tetlow <gordon@FreeBSD.org>
AuthorDate: 2024-06-18 17:34:24 +0000
Commit: Gordon Tetlow <gordon@FreeBSD.org>
CommitDate: 2024-06-19 20:21:41 +0000
Add UPDATING entries and bump the branch version.
Approved by: so
---
UPDATING | 5 +++++
sys/conf/newvers.sh | 2 +-
2 files changed, 6 insertions(+), 1 deletion(-)
diff --git a/UPDATING b/UPDATING
index 8a24e55cb4b9..0a9ee0ff58f1 100644
--- a/UPDATING
+++ b/UPDATING
@@ -12,6 +12,11 @@ Items affecting the ports and packages system can be found in
/usr/ports/UPDATING. Please read that file before updating system packages
and/or ports.
+20240619:
+ 14.0-RELEASE-p7 EN-24:11.ldns
+
+ Fix LDNS uses nameserver commented out in resolv.conf [EN-24:11.ldns]
+
20240327:
14.0-RELEASE-p6 SA-24:03.unbound
EN-24:05.tty
diff --git a/sys/conf/newvers.sh b/sys/conf/newvers.sh
index 02f705ccc64a..2d5f3bbca98c 100644
--- a/sys/conf/newvers.sh
+++ b/sys/conf/newvers.sh
@@ -53,7 +53,7 @@
TYPE="FreeBSD"
REVISION="14.0"
-BRANCH="RELEASE-p6"
+BRANCH="RELEASE-p7"
if [ -n "${BRANCH_OVERRIDE}" ]; then
BRANCH=${BRANCH_OVERRIDE}
fi
From nobody Wed Jun 19 20:37: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 4W4Fm50hcBz5Nnbv;
Wed, 19 Jun 2024 20:37: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 4W4Fm45sjFz4PKd;
Wed, 19 Jun 2024 20:37:08 +0000 (UTC)
(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
t=1718829428;
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=supHDyejD/zPFA3ZN6ch3+8qf6vwPqoZXcnf4ppeJwE=;
b=MPOQD3iCqZfHaqcv0PADdf21K30T4Kqwj1ThnQnMun8Kud4lF9MpS0Yysjq8BiB1gkjZPq
aTsHfGvtLhTKJDehZdFsnQysejARLjcADLIlQoAdZgTY5+0TQDx327BBgdDqeSivrNFpou
EUi0jr2P6ApiUt79ekPMa/Mp8ZV92liIFzY/XpBo0+6J02YF1nXxvZy+6NEXkUSTVAf9TC
uN0WCHjbAJIds3yIhbqpqeUU8Y/IOzFLYE0p8mArgGPWDdcOSSY83hHOP5JQaf9hkOvbY3
QiHlbjOuNOc6Ay/aI+rLj0RGw5tvVWeIahLu1+mpVAMF9qPOQhgSQ7kHC86xFw==
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1718829428; a=rsa-sha256; cv=none;
b=V4zgD1NSX2D4Jfsxo152rw6XLMzZCu25O9wG2GWsS7NJrAlVl+UJivRJn5PpNfZN7FD5rk
9+EGl49t3sUzCSl58YsKMOo7cHzhW9dDYUXvjKxzYjj5H4mdk4QedKEQyEujYsnEOXjwuQ
JGw3y20qh5qIS4gdR+NsR33ZDER8HoaQ+Yqf3kk6pWI2dpa2fv0NGLF32zSNqxQe38RFk/
Q0YABt/PCcH+zAHUOQrvnHxW5UIxVyqXFfa5Yn9U3y6skng5aPhpjti1zfAa30H93anAlH
u4fHf2w7s/5KVVfE2RqCtMDjEaYOWvozzyVsD0MRNw+ui/OY7HZe4VAIY6NO8w==
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=1718829428;
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=supHDyejD/zPFA3ZN6ch3+8qf6vwPqoZXcnf4ppeJwE=;
b=lyveF4E9SNeJoRDadDo2pm8fn1/F0H3H0u8VH1ox86v29uLTqM8Dfka2WU2LvagCVtJash
dDQp0x5zJGBmsLQMyUJ8it1kVO16KxTuRyj8FxQglpwMkjY86ZsjHMZDlt3WR632AOK31E
VX2mPKZjEOgB62ehrujXC9JJcx0H7bqdrn/f/AkUblSj6q40pwnN4Qbju5R9Z5zUcOrNAY
8WIGjsK9DDyUFaogP4EQV9QVUwo13DX5OjLeLYwvhJfo5ViN3GEYfeQoZ6/kWNumQTXkYa
2RXerrAI8dxl+6efwbdzx42m8gAz9yIQfA91BWAvcwGcwhggFT2OXVdORgRZSA==
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 4W4Fm45LTPzwly;
Wed, 19 Jun 2024 20:37: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 45JKb8f4002360;
Wed, 19 Jun 2024 20:37:08 GMT
(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 45JKb81x002357;
Wed, 19 Jun 2024 20:37:08 GMT
(envelope-from git)
Date: Wed, 19 Jun 2024 20:37:08 GMT
Message-Id: <202406192037.45JKb81x002357@gitrepo.freebsd.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
dev-commits-src-branches@FreeBSD.org
From: Gordon Tetlow <gordon@FreeBSD.org>
Subject: git: d45cf1d2f124 - releng/13.3 - ldns: Ignore commented-out
lines in resolv.conf.
List-Id: Commits to the stable branches of the FreeBSD src repository <dev-commits-src-branches.freebsd.org>
List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches
List-Help: <mailto:dev-commits-src-branches+help@freebsd.org>
List-Post: <mailto:dev-commits-src-branches@freebsd.org>
List-Subscribe: <mailto:dev-commits-src-branches+subscribe@freebsd.org>
List-Unsubscribe: <mailto:dev-commits-src-branches+unsubscribe@freebsd.org>
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: gordon
X-Git-Repository: src
X-Git-Refname: refs/heads/releng/13.3
X-Git-Reftype: branch
X-Git-Commit: d45cf1d2f1249d5b30c9fa0d35476dc9b9ee0321
Auto-Submitted: auto-generated
The branch releng/13.3 has been updated by gordon:
URL: https://cgit.FreeBSD.org/src/commit/?id=d45cf1d2f1249d5b30c9fa0d35476dc9b9ee0321
commit d45cf1d2f1249d5b30c9fa0d35476dc9b9ee0321
Author: Dag-Erling Smørgrav <des@FreeBSD.org>
AuthorDate: 2024-05-15 10:16:24 +0000
Commit: Gordon Tetlow <gordon@FreeBSD.org>
CommitDate: 2024-06-18 17:25:37 +0000
ldns: Ignore commented-out lines in resolv.conf.
This merges upstream PR 238 + an additional bug fix.
PR: 278721
Approved by: so
Security: FreeBSD-EN-24:11.ldns
(cherry picked from commit 3b092e4936c433889cc668ea9563c8fd437d1a3e)
(cherry picked from commit e95e16191f63240971687634a23c2defed64d713)
---
contrib/ldns/ldns/parse.h | 2 ++
contrib/ldns/parse.c | 35 +++++++++++++++++++++++++++----
contrib/ldns/resolver.c | 53 ++++++++---------------------------------------
3 files changed, 42 insertions(+), 48 deletions(-)
diff --git a/contrib/ldns/ldns/parse.h b/contrib/ldns/ldns/parse.h
index ba7edf5679d8..6130dae32bd2 100644
--- a/contrib/ldns/ldns/parse.h
+++ b/contrib/ldns/ldns/parse.h
@@ -95,6 +95,8 @@ ssize_t ldns_fget_token_l(FILE *f, char *token, const char *delim, size_t limit,
*/
ldns_status ldns_fget_token_l_st(FILE *f, char **token, size_t *limit, bool fixed, const char *delim, int *line_nr);
+ssize_t ldns_fget_token_l_resolv_conf(FILE *f, char *token, const char *delim, size_t limit, int *line_nr);
+
/**
* returns a token/char from the buffer b.
* This function deals with ( and ) in the buffer,
diff --git a/contrib/ldns/parse.c b/contrib/ldns/parse.c
index 9698ba71e881..af8b2c1321b2 100644
--- a/contrib/ldns/parse.c
+++ b/contrib/ldns/parse.c
@@ -27,9 +27,14 @@ ldns_fget_token(FILE *f, char *token, const char *delim, size_t limit)
return ldns_fget_token_l(f, token, delim, limit, NULL);
}
-ldns_status
-ldns_fget_token_l_st(FILE *f, char **token, size_t *limit, bool fixed
- , const char *delim, int *line_nr)
+enum file_type2parse {
+ zone_file_type, resolv_conf_file_type
+};
+
+static ldns_status
+ldns_fget_token_l_st_file_type(FILE *f, char **token, size_t *limit,
+ bool fixed, const char *delim, int *line_nr,
+ enum file_type2parse file_type)
{
int c, prev_c;
int p; /* 0 -> no parentheses seen, >0 nr of ( seen */
@@ -98,7 +103,9 @@ ldns_fget_token_l_st(FILE *f, char **token, size_t *limit, bool fixed
}
/* do something with comments ; */
- if (c == ';' && quoted == 0) {
+ if ((c == ';'
+ || (c == '#' && file_type == resolv_conf_file_type))
+ && quoted == 0) {
if (prev_c != '\\') {
com = 1;
}
@@ -215,6 +222,26 @@ tokenread:
return i == 0 ? LDNS_STATUS_SYNTAX_EMPTY : LDNS_STATUS_OK;
}
+ldns_status
+ldns_fget_token_l_st(FILE *f, char **token, size_t *limit, bool fixed
+ , const char *delim, int *line_nr)
+{
+ return ldns_fget_token_l_st_file_type(
+ f, token, limit, fixed, delim, line_nr, zone_file_type);
+}
+
+ssize_t
+ldns_fget_token_l_resolv_conf(FILE *f, char *token, const char *delim,
+ size_t limit, int *line_nr)
+{
+ if (limit == 0)
+ limit = LDNS_MAX_LINELEN;
+ if (ldns_fget_token_l_st_file_type(f, &token, &limit, true, delim,
+ line_nr, resolv_conf_file_type))
+ return -1;
+ else
+ return (ssize_t)strlen(token);
+}
ssize_t
ldns_fget_token_l(FILE *f, char *token, const char *delim, size_t limit, int *line_nr)
diff --git a/contrib/ldns/resolver.c b/contrib/ldns/resolver.c
index f9ec65a55966..a426b82c034e 100644
--- a/contrib/ldns/resolver.c
+++ b/contrib/ldns/resolver.c
@@ -775,7 +775,7 @@ ldns_resolver_new_frm_fp_l(ldns_resolver **res, FILE *fp, int *line_nr)
#endif
ssize_t gtr, bgtr;
ldns_buffer *b;
- int lnr = 0, oldline;
+ int lnr = 0;
FILE* myfp = fp;
if(!line_nr) line_nr = &lnr;
@@ -809,36 +809,18 @@ ldns_resolver_new_frm_fp_l(ldns_resolver **res, FILE *fp, int *line_nr)
gtr = 1;
word[0] = 0;
- oldline = *line_nr;
expect = LDNS_RESOLV_KEYWORD;
while (gtr > 0) {
- /* check comments */
- if (word[0] == '#') {
- word[0]='x';
- if(oldline == *line_nr) {
- /* skip until end of line */
- int c;
- do {
- c = fgetc(myfp);
- } while(c != EOF && c != '\n');
- if(c=='\n') (*line_nr)++;
- }
- /* and read next to prepare for further parsing */
- oldline = *line_nr;
- continue;
- }
- oldline = *line_nr;
switch(expect) {
case LDNS_RESOLV_KEYWORD:
/* keyword */
- gtr = ldns_fget_token_l(myfp, word, LDNS_PARSE_NORMAL, 0, line_nr);
+ gtr = ldns_fget_token_l_resolv_conf(myfp, word, LDNS_PARSE_NORMAL, 0, line_nr);
if (gtr != 0) {
- if(word[0] == '#') continue;
for(i = 0; i < LDNS_RESOLV_KEYWORDS; i++) {
if (strcasecmp(keyword[i], word) == 0) {
/* chosen the keyword and
* expect values carefully
- */
+ */
expect = i;
break;
}
@@ -856,16 +838,12 @@ ldns_resolver_new_frm_fp_l(ldns_resolver **res, FILE *fp, int *line_nr)
break;
case LDNS_RESOLV_DEFDOMAIN:
/* default domain dname */
- gtr = ldns_fget_token_l(myfp, word, LDNS_PARSE_NORMAL, 0, line_nr);
+ gtr = ldns_fget_token_l_resolv_conf(myfp, word, LDNS_PARSE_NORMAL, 0, line_nr);
if (gtr == 0) {
if(!fp) fclose(myfp);
ldns_resolver_deep_free(r);
return LDNS_STATUS_SYNTAX_MISSING_VALUE_ERR;
}
- if(word[0] == '#') {
- expect = LDNS_RESOLV_KEYWORD;
- continue;
- }
tmp = ldns_rdf_new_frm_str(LDNS_RDF_TYPE_DNAME, word);
if (!tmp) {
if(!fp) fclose(myfp);
@@ -879,16 +857,12 @@ ldns_resolver_new_frm_fp_l(ldns_resolver **res, FILE *fp, int *line_nr)
break;
case LDNS_RESOLV_NAMESERVER:
/* NS aaaa or a record */
- gtr = ldns_fget_token_l(myfp, word, LDNS_PARSE_NORMAL, 0, line_nr);
+ gtr = ldns_fget_token_l_resolv_conf(myfp, word, LDNS_PARSE_NORMAL, 0, line_nr);
if (gtr == 0) {
if(!fp) fclose(myfp);
ldns_resolver_deep_free(r);
return LDNS_STATUS_SYNTAX_MISSING_VALUE_ERR;
}
- if(word[0] == '#') {
- expect = LDNS_RESOLV_KEYWORD;
- continue;
- }
if(strchr(word, '%')) {
/* snip off interface labels,
* fe80::222:19ff:fe31:4222%eth0 */
@@ -911,7 +885,7 @@ ldns_resolver_new_frm_fp_l(ldns_resolver **res, FILE *fp, int *line_nr)
break;
case LDNS_RESOLV_SEARCH:
/* search list domain dname */
- gtr = ldns_fget_token_l(myfp, word, LDNS_PARSE_SKIP_SPACE, 0, line_nr);
+ gtr = ldns_fget_token_l_resolv_conf(myfp, word, LDNS_PARSE_SKIP_SPACE, 0, line_nr);
b = LDNS_MALLOC(ldns_buffer);
if(!b) {
ldns_resolver_deep_free(r);
@@ -929,10 +903,6 @@ ldns_resolver_new_frm_fp_l(ldns_resolver **res, FILE *fp, int *line_nr)
bgtr = ldns_bget_token(b, word, LDNS_PARSE_NORMAL, (size_t) gtr + 1);
while (bgtr > 0) {
gtr -= bgtr;
- if(word[0] == '#') {
- expect = LDNS_RESOLV_KEYWORD;
- break;
- }
tmp = ldns_rdf_new_frm_str(LDNS_RDF_TYPE_DNAME, word);
if (!tmp) {
ldns_resolver_deep_free(r);
@@ -954,28 +924,23 @@ ldns_resolver_new_frm_fp_l(ldns_resolver **res, FILE *fp, int *line_nr)
}
break;
case LDNS_RESOLV_SORTLIST:
- gtr = ldns_fget_token_l(myfp, word, LDNS_PARSE_SKIP_SPACE, 0, line_nr);
+ gtr = ldns_fget_token_l_resolv_conf(myfp, word, LDNS_PARSE_SKIP_SPACE, 0, line_nr);
/* sortlist not implemented atm */
expect = LDNS_RESOLV_KEYWORD;
break;
case LDNS_RESOLV_OPTIONS:
- gtr = ldns_fget_token_l(myfp, word, LDNS_PARSE_SKIP_SPACE, 0, line_nr);
+ gtr = ldns_fget_token_l_resolv_conf(myfp, word, LDNS_PARSE_SKIP_SPACE, 0, line_nr);
/* options not implemented atm */
expect = LDNS_RESOLV_KEYWORD;
break;
case LDNS_RESOLV_ANCHOR:
/* a file containing a DNSSEC trust anchor */
- gtr = ldns_fget_token_l(myfp, word, LDNS_PARSE_NORMAL, 0, line_nr);
+ gtr = ldns_fget_token_l_resolv_conf(myfp, word, LDNS_PARSE_NORMAL, 0, line_nr);
if (gtr == 0) {
ldns_resolver_deep_free(r);
if(!fp) fclose(myfp);
return LDNS_STATUS_SYNTAX_MISSING_VALUE_ERR;
}
- if(word[0] == '#') {
- expect = LDNS_RESOLV_KEYWORD;
- continue;
- }
-
#ifdef HAVE_SSL
tmp_rr = ldns_read_anchor_file(word);
(void) ldns_resolver_push_dnssec_anchor(r, tmp_rr);
From nobody Wed Jun 19 20:37: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 4W4Fm62Sfnz5Nn6n;
Wed, 19 Jun 2024 20:37: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 4W4Fm56kJXz4PD7;
Wed, 19 Jun 2024 20:37:09 +0000 (UTC)
(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
t=1718829429;
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=yiRK9OZw5PvQgyhSP2GBPtOghyibdThpfxqFLkiYdxU=;
b=rjbSt9OxqvRVYp5605nadLOZAiw1Kla9PVLGi8erq29f0LaoB9IUhPI+0hLgFrRagr4kG5
br6OymaPNsY5IuRHVOnAUrpS7PbTcdmkclBullVCOwLM9bfYd0ufkiDotPUASw4Id45E2Z
Zv/WLhgpX/MK4/LyVCmVxyoLZupe18oz6mRLE08YqxdJn7/glbx0OPthTJPU1m//xfN183
s/1vAvUL3cb4C+WwJ9x42o11OahbRxAElGpd9AlRm/etHgrQgzRq681di9kubNu9RHNSYb
zgaG8jPHS3gukwKcxVpnwoR+PJJQ9q/X3Pp/Hf0RMNoDQ7tmpe/VF1cHGRHZNQ==
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1718829429; a=rsa-sha256; cv=none;
b=FVTpy9u61v8hIkfvbx4zFIIEwuGI6PAK3Cbu19bnfgJwSg4REr4Prl0pqa8g2O4SNnNAFA
Ej2Ka+ubuM/e2SEjrKOpnzgCrMPfLVVH1wR3rSXvGR3NKCSCNs82w3628nn4UwrICL89kK
ZMhjPYFeP9xY0rCFR3wvCvrkfLW662jf67ybo/q3nmaOEqgA1oL3I0lxxEQ9oE7+9bAyP4
LR1KQKD1nTD66zsWr0PRg7MdXb2LQB3nwaecdCk6I1fnKXjUuT13zIRkhmBejWXuOtsww2
+QaZtc6+CrwcbuPzuS4smho52MtOPS3FXssXScOiaypa2l1WCuyi7PqxEGUKpQ==
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=1718829429;
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=yiRK9OZw5PvQgyhSP2GBPtOghyibdThpfxqFLkiYdxU=;
b=xlxifj+DorBm/Cmld9hrKe3mCXb5DycFqGBv649yGBRZcSCGsQr/0Lof3NEftdIGQXpsjF
3xs0GQh98FiEeYgWq1cFkCnCV7z45NThpnGgY5x4L8z3hYCqgEZljdsyfyxMEagS5nSHwy
a2QprxUQrjUElWnypEpTsI/k4ZKZwINtaJLg6zI1KniGfcZqp8wQQmFLlCj6BRuHZdj1Cx
DqiC5bCmpuhulS4qZhp9yVD+yWgFBQYzGZ3Xb7GNHDGzPNmi23fnc78+aUCnwkkVjXcpMw
Ysw6OiHuo0WmBfd5N1Yd1QwcE/pYrJ6f9hLsu27p/gzX4c8i7um9NyvnBbCeWQ==
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 4W4Fm56LqczwpZ;
Wed, 19 Jun 2024 20:37: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 45JKb99M002405;
Wed, 19 Jun 2024 20:37:09 GMT
(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 45JKb9FE002402;
Wed, 19 Jun 2024 20:37:09 GMT
(envelope-from git)
Date: Wed, 19 Jun 2024 20:37:09 GMT
Message-Id: <202406192037.45JKb9FE002402@gitrepo.freebsd.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
dev-commits-src-branches@FreeBSD.org
From: Gordon Tetlow <gordon@FreeBSD.org>
Subject: git: eb410545d00d - releng/13.3 - killpg(): more carefully
avoid LoR
List-Id: Commits to the stable branches of the FreeBSD src repository <dev-commits-src-branches.freebsd.org>
List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches
List-Help: <mailto:dev-commits-src-branches+help@freebsd.org>
List-Post: <mailto:dev-commits-src-branches@freebsd.org>
List-Subscribe: <mailto:dev-commits-src-branches+subscribe@freebsd.org>
List-Unsubscribe: <mailto:dev-commits-src-branches+unsubscribe@freebsd.org>
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: gordon
X-Git-Repository: src
X-Git-Refname: refs/heads/releng/13.3
X-Git-Reftype: branch
X-Git-Commit: eb410545d00d55a40c4c30eb42b9d2ef5bb2361d
Auto-Submitted: auto-generated
The branch releng/13.3 has been updated by gordon:
URL: https://cgit.FreeBSD.org/src/commit/?id=eb410545d00d55a40c4c30eb42b9d2ef5bb2361d
commit eb410545d00d55a40c4c30eb42b9d2ef5bb2361d
Author: Konstantin Belousov <kib@FreeBSD.org>
AuthorDate: 2023-07-07 17:19:33 +0000
Commit: Gordon Tetlow <gordon@FreeBSD.org>
CommitDate: 2024-06-18 17:26:29 +0000
killpg(): more carefully avoid LoR
Approved by: so
Security: FreeBSD-EN-24:12.killpg
(cherry picked from commit 7a70f17ac4bd64dc1a5020f963ba4380cf37b7e5)
(cherry picked from commit cd73b38955f62d9c05ded8e641a7462ca0f06179)
---
sys/kern/kern_proc.c | 15 +++++++++++++--
sys/kern/kern_prot.c | 6 ++----
2 files changed, 15 insertions(+), 6 deletions(-)
diff --git a/sys/kern/kern_proc.c b/sys/kern/kern_proc.c
index 61c389f0b345..0db3718e15ff 100644
--- a/sys/kern/kern_proc.c
+++ b/sys/kern/kern_proc.c
@@ -587,8 +587,12 @@ enterpgrp(struct proc *p, pid_t pgid, struct pgrp *pgrp, struct session *sess)
("enterpgrp: session leader attempted setpgrp"));
old_pgrp = p->p_pgrp;
- if (!sx_try_xlock(&old_pgrp->pg_killsx))
+ if (!sx_try_xlock(&old_pgrp->pg_killsx)) {
+ sx_xunlock(&proctree_lock);
+ sx_xlock(&old_pgrp->pg_killsx);
+ sx_xunlock(&old_pgrp->pg_killsx);
return (ERESTART);
+ }
MPASS(old_pgrp == p->p_pgrp);
if (sess != NULL) {
@@ -656,11 +660,18 @@ enterthispgrp(struct proc *p, struct pgrp *pgrp)
("%s: p %p belongs to pgrp %p", __func__, p, pgrp));
old_pgrp = p->p_pgrp;
- if (!sx_try_xlock(&old_pgrp->pg_killsx))
+ if (!sx_try_xlock(&old_pgrp->pg_killsx)) {
+ sx_xunlock(&proctree_lock);
+ sx_xlock(&old_pgrp->pg_killsx);
+ sx_xunlock(&old_pgrp->pg_killsx);
return (ERESTART);
+ }
MPASS(old_pgrp == p->p_pgrp);
if (!sx_try_xlock(&pgrp->pg_killsx)) {
sx_xunlock(&old_pgrp->pg_killsx);
+ sx_xunlock(&proctree_lock);
+ sx_xlock(&pgrp->pg_killsx);
+ sx_xunlock(&pgrp->pg_killsx);
return (ERESTART);
}
diff --git a/sys/kern/kern_prot.c b/sys/kern/kern_prot.c
index a91b7ec3015f..5dea43971e3d 100644
--- a/sys/kern/kern_prot.c
+++ b/sys/kern/kern_prot.c
@@ -345,10 +345,8 @@ again:
error = EPERM;
} else {
error = enterpgrp(p, p->p_pid, newpgrp, newsess);
- if (error == ERESTART) {
- sx_xunlock(&proctree_lock);
+ if (error == ERESTART)
goto again;
- }
MPASS(error == 0);
td->td_retval[0] = p->p_pid;
newpgrp = NULL;
@@ -458,11 +456,11 @@ again:
error = enterthispgrp(targp, pgrp);
}
done:
- sx_xunlock(&proctree_lock);
KASSERT(error == 0 || newpgrp != NULL,
("setpgid failed and newpgrp is NULL"));
if (error == ERESTART)
goto again;
+ sx_xunlock(&proctree_lock);
uma_zfree(pgrp_zone, newpgrp);
return (error);
}
From nobody Wed Jun 19 20:37: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 4W4Fm729Jzz5NnYt;
Wed, 19 Jun 2024 20:37: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 "R3" (verified OK))
by mx1.freebsd.org (Postfix) with ESMTPS id 4W4Fm70fRRz4PQS;
Wed, 19 Jun 2024 20:37:11 +0000 (UTC)
(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
t=1718829431;
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=WVY6U8USC4g6TyWlGgxcxqpzSGFOKxhazWHZNCHu6bA=;
b=d5AtLtlrM3ZqI8WMf29dzkkUdZpzbOXX4VKU5PsV83BFSsZChQCBKxOy4kDeWXH0wTlfyN
0p0hi2s8TyRfaAy0WqyBsHXPXDd1KSGcqzt8K6bjQcPNRLvyA3Y6qdEEajQRJWeGF5PEKW
RVlmmcN62EHXY1+kpXdl509P7mq6yfxDM8If6QbW3Bs5txTB3wjI8V025Zx0Gzwi0cD7HJ
ehYhUiaLodPdA3frXdgGTSS+Z7BvUpdK448VwEPQH5mxacvncvJyvwgMv/wA8ex38ap9Vj
nNKsAfG/7BfXYifI8cLpvCDCSrYOSP0io3QjJonYoF3nkCXFk7xeXts1P8YTBg==
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1718829431; a=rsa-sha256; cv=none;
b=VH9z7f6WbtvpcgENTww+kBZ47iZ7uPFqvh7KUyF+Gbyv7Q4+jJTxVBO2cVX5sDBx83YH9y
OWBWEqP0zZiM7edrnSJuohVSisSN5tRDX/Wcbz/KfRLxov2JK84DVANvk4GugZ4ksgFTib
Qs1nA7eUTqRokCB/R6aN7/xRQBsylHpBIAjJe3DRvlfL6Eadbz2+AlFETh6SICB6Fb+D73
QVF/UvJDgjbRTHHaRfwz2y4wbwt9ns/XqTQ4AyBnpQ1e5g8Z18l6qGaPl/SzzHE8HPTd68
MWFpVrQ7mKQS5z7zLMVBZwjhjvYyAk7q8w3jvIXQsgNA3N8MYnl4WaGtg+rlAQ==
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=1718829431;
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=WVY6U8USC4g6TyWlGgxcxqpzSGFOKxhazWHZNCHu6bA=;
b=pgtLzIaThHZT9/lDOyUQgZ5SK8Op7EOyIIk5KT0p91WcsvFYzrGIwwHXlDk9nug0bkKGQa
zxZKhVaW0h7hvLN63p37E7lBLCIIlBzS17hf97aSZXIRyuSdSKK13Zb2iFg9rjdtOzsULY
a7odBHU3guZs4EXXLmLWZ/Mc+2vdQGuPyLd5z4yRIRVEN/Kmd/MZxlzGVbBBfvQmey2vkF
15kTV28BUmVRDP4KmqpchUim6tns5ciRuvxczg3ihs5dVE9ElwwRsxJ4o1IJMeVxE+ODBf
H7LRWCps82qk5/4NmsxqPsMJAvkBsV/46G9msnYrHv09HjEpUqYx5wUACUtfOg==
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 4W4Fm70GsFzwZv;
Wed, 19 Jun 2024 20:37: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 45JKbA2c002468;
Wed, 19 Jun 2024 20:37:10 GMT
(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 45JKbA0f002465;
Wed, 19 Jun 2024 20:37:10 GMT
(envelope-from git)
Date: Wed, 19 Jun 2024 20:37:10 GMT
Message-Id: <202406192037.45JKbA0f002465@gitrepo.freebsd.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
dev-commits-src-branches@FreeBSD.org
From: Gordon Tetlow <gordon@FreeBSD.org>
Subject: git: 2dc3f3a5e231 - releng/13.3 - Add UPDATING entries and
bump the branch version.
List-Id: Commits to the stable branches of the FreeBSD src repository <dev-commits-src-branches.freebsd.org>
List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches
List-Help: <mailto:dev-commits-src-branches+help@freebsd.org>
List-Post: <mailto:dev-commits-src-branches@freebsd.org>
List-Subscribe: <mailto:dev-commits-src-branches+subscribe@freebsd.org>
List-Unsubscribe: <mailto:dev-commits-src-branches+unsubscribe@freebsd.org>
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: gordon
X-Git-Repository: src
X-Git-Refname: refs/heads/releng/13.3
X-Git-Reftype: branch
X-Git-Commit: 2dc3f3a5e2316622ff6d04c982618a9bea71f981
Auto-Submitted: auto-generated
The branch releng/13.3 has been updated by gordon:
URL: https://cgit.FreeBSD.org/src/commit/?id=2dc3f3a5e2316622ff6d04c982618a9bea71f981
commit 2dc3f3a5e2316622ff6d04c982618a9bea71f981
Author: Gordon Tetlow <gordon@FreeBSD.org>
AuthorDate: 2024-06-18 17:29:59 +0000
Commit: Gordon Tetlow <gordon@FreeBSD.org>
CommitDate: 2024-06-19 20:20:58 +0000
Add UPDATING entries and bump the branch version.
Approved by: so
---
UPDATING | 8 ++++++++
sys/conf/newvers.sh | 2 +-
2 files changed, 9 insertions(+), 1 deletion(-)
diff --git a/UPDATING b/UPDATING
index 97c8abff980a..1c9d8acbde6d 100644
--- a/UPDATING
+++ b/UPDATING
@@ -12,6 +12,14 @@ Items affecting the ports and packages system can be found in
/usr/ports/UPDATING. Please read that file before updating system packages
and/or ports.
+20240619:
+ 13.3-RELEASE-p3 EN-24:11.ldns
+ EN-24:12.killpg
+
+ Fix LDNS uses nameserver commented out in resolv.conf [EN-24:11.ldns]
+
+ Fix lock order reversal in killpg causing livelock [EN-24:12.killpg]
+
20240424:
13.3-RELEASE-p2 EN-24:09.zfs
diff --git a/sys/conf/newvers.sh b/sys/conf/newvers.sh
index c6e44a41b9f8..2e6012da6667 100644
--- a/sys/conf/newvers.sh
+++ b/sys/conf/newvers.sh
@@ -53,7 +53,7 @@
TYPE="FreeBSD"
REVISION="13.3"
-BRANCH="RELEASE-p2"
+BRANCH="RELEASE-p3"
if [ -n "${BRANCH_OVERRIDE}" ]; then
BRANCH=${BRANCH_OVERRIDE}
fi
From nobody Fri Jun 21 03:47: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 4W53Fk1gd5z5PN4t;
Fri, 21 Jun 2024 03:47: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 4W53Fk15vhz4jCR;
Fri, 21 Jun 2024 03:47:06 +0000 (UTC)
(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
t=1718941626;
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=xOCiNrtCqZFmFvIoqg7zKZU3h1EYiG4tuapFCR/OWuE=;
b=UdfPyT5RLOnGILvhUBuj6HLszNXVPnSHzbmxuhBohyoX6OYjQawrGvVYVPjl9NgkkE4Mpg
zYVcZATx1WmUzDV9n9W6pfhn1xbQiGhGLfgb3M0GLrP/JH0zExCYKnMZS8kW/Jspply0hc
Paqo17q/GczRBeN3MhgWLpv/5fwq0FiyoM/JrxcE3Jl1jQx4m7Ylf2FarPQcMKi7Wjnnd8
OXVr6i/dUt/CuC/2skV2c+T6R5yJi+mV/ae9dKMv4mljCSfSsH11Rk8mZL/bbZvV5+yIyZ
D2v4YsL+GyM59DIieaEjf26dxSfXhOlPCbAF8XxELt9wofm15hTFJaDq5t7xEA==
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1718941626; a=rsa-sha256; cv=none;
b=bTNcMgqo2v8LVKLIg/PbGr6+8DOVNxyDHPbF720MDXTb46QrvLcc7RfvO9ppnJ3H7hR8Xv
MLXxf54BYG7YFDlyQ01Z6Z7VvUxkwDD35EUvUkUJsalyZVpLSj+kVTBT9bmPh2vrf7j5Kt
bOTAVMFjGPEQr9T4A37QuLcxqVUsqCK7y7XCdBOPvl8MSnN76JwPomfBv8IymQZUZMoraK
3nu1MI3ZDPjIwukO+2RtMvm58wUKujWP9ETnCtwkqaf6DE12TnfTKsf4GdiDpXT4UVAK9L
hnAFZlA8U7vQISeO1dazmxy4GGfwdD1XxQ1tVHnaIw8O89o3bp18hN/zfhrung==
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=1718941626;
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=xOCiNrtCqZFmFvIoqg7zKZU3h1EYiG4tuapFCR/OWuE=;
b=mZeMqlLjcgPX5gui0VFnCM6Cvo+xQ8PbpAOSMFr0w6TqqjY+1jLVjwAz9Jb4/GyrZ74KCu
W/hncCQspMZvEmVr2Y+3XKpiVn1Ipvr3m+UOAP12WqRJfk2OreWeGvGOPIH043ngXzKVcR
lQCp+sYVBttFJtBlRQrpLyA+yERvz8wIv4AXPFz6nmSo5AUjPEnTOQ4t3vAbIIsKUcT7NC
oQnwGApP9rNaJuBnUZ3RApQQ3Fa7qnfitJDNTA3eOTKLFA/3Tc6dD1STHOp4TpmuSUdDJi
O+WQXfBvTDPZ9+e98wHLJ8vx3EXV8NKXrfBEyriOKGaCsSqNR8Hji17LZlziHw==
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 4W53Fk0j8LzsLf;
Fri, 21 Jun 2024 03:47:06 +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 45L3l5sJ065195;
Fri, 21 Jun 2024 03:47:05 GMT
(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 45L3l5co065192;
Fri, 21 Jun 2024 03:47:05 GMT
(envelope-from git)
Date: Fri, 21 Jun 2024 03:47:05 GMT
Message-Id: <202406210347.45L3l5co065192@gitrepo.freebsd.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
dev-commits-src-branches@FreeBSD.org
From: Gordon Bergling <gbe@FreeBSD.org>
Subject: git: 17bcc10aec4b - stable/14 - virtio(4): Fix two typos
in KASSERT messages
List-Id: Commits to the stable branches of the FreeBSD src repository <dev-commits-src-branches.freebsd.org>
List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches
List-Help: <mailto:dev-commits-src-branches+help@freebsd.org>
List-Post: <mailto:dev-commits-src-branches@freebsd.org>
List-Subscribe: <mailto:dev-commits-src-branches+subscribe@freebsd.org>
List-Unsubscribe: <mailto:dev-commits-src-branches+unsubscribe@freebsd.org>
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: 17bcc10aec4b1e13e42a02c0a185ed0dac56af1b
Auto-Submitted: auto-generated
The branch stable/14 has been updated by gbe:
URL: https://cgit.FreeBSD.org/src/commit/?id=17bcc10aec4b1e13e42a02c0a185ed0dac56af1b
commit 17bcc10aec4b1e13e42a02c0a185ed0dac56af1b
Author: Gordon Bergling <gbe@FreeBSD.org>
AuthorDate: 2024-06-16 16:02:46 +0000
Commit: Gordon Bergling <gbe@FreeBSD.org>
CommitDate: 2024-06-21 03:46:51 +0000
virtio(4): Fix two typos in KASSERT messages
- s/emtpy/empty/
(cherry picked from commit 018a361f8902d629fca64be372ef9b266fee53ba)
---
sys/dev/virtio/console/virtio_console.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/sys/dev/virtio/console/virtio_console.c b/sys/dev/virtio/console/virtio_console.c
index d8048d0f1f6e..45cd11ddb5ef 100644
--- a/sys/dev/virtio/console/virtio_console.c
+++ b/sys/dev/virtio/console/virtio_console.c
@@ -979,7 +979,7 @@ vtcon_ctrl_poll(struct vtcon_softc *sc,
*/
VTCON_CTRL_TX_LOCK(sc);
KASSERT(virtqueue_empty(vq),
- ("%s: virtqueue is not emtpy", __func__));
+ ("%s: virtqueue is not empty", __func__));
error = virtqueue_enqueue(vq, control, &sg, sg.sg_nseg, 0);
if (error == 0) {
virtqueue_notify(vq);
@@ -1367,7 +1367,7 @@ vtcon_port_out(struct vtcon_port *port, void *buf, int bufsize)
vq = port->vtcport_outvq;
KASSERT(virtqueue_empty(vq),
- ("%s: port %p out virtqueue not emtpy", __func__, port));
+ ("%s: port %p out virtqueue not empty", __func__, port));
sglist_init(&sg, 2, segs);
error = sglist_append(&sg, buf, bufsize);
From nobody Fri Jun 21 03: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 4W53GG3lFJz5PMr7;
Fri, 21 Jun 2024 03: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 4W53GG3DBcz4jkZ;
Fri, 21 Jun 2024 03: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=1718941654;
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=F3KiPDUlwfkKngBG+smsAGPTgD2vT4tMeQmfTjfRIn0=;
b=aAMgJ3eRHwTfYj8sTiwc0BkrSVM/7R2/1B1W/ssrYMBqtiMBl0W5xp2OfvaSDzS+c9EywO
oEBFl4Ab/ddWWYOiPrPEaiIAwxLLdlb1lUYMo/YYQuM2v7dI/IqzdNuRu5Uade+eWqa7vK
k0JG9oUcHhSrQuzCiWKwCiXkbKbGgbsp/RoL6B5Uqwx84je03RSTgO4/2cAzLoF/fsOtuG
efjTcdwrMZcPijgF9s/5NmIsGfOfFvZFNmrrBY08aYbAxw4Gy7Wup6K6et1iU2dACk6FxK
TLgWgFrNvxXH5I3ZYjgwbA1uBDtnJpgdO5PyZCBvW+Ta1l6y5f96i+488a5ILA==
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1718941654; a=rsa-sha256; cv=none;
b=WhkwIoygsDzjvANZCpcSe+kNNT/HBDUBbxzn06sZeW77Wxuc2FikECL8zzKslqm/dA/prT
0RzFNOT1syJz/KiX+yUcNHtpbW1bgj5LNVUyEmykMsmCFtdmKi8SRcGJdJ32I3S+L6vDHr
NYf81NZg4efEb5r/af9eA4TzVtlZx+oy1VQA/2sfaY+YsXJ4OmmCzAWOypiYB6rCiX4uAq
1oXehmdDGJn0MQqb3NB4UhOgts9bK/yWqI8N10teM88wpTypko+aeUBBk76bZnZVlphdB3
31Xs5j+DKr1cfY7Kic50MrA9+7Gdnqq2RdBKwl9kpcnqGA/yOWJkpB+TAKO7WQ==
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=1718941654;
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=F3KiPDUlwfkKngBG+smsAGPTgD2vT4tMeQmfTjfRIn0=;
b=qtT5Xake3VJL5IYQ/LIaiZSd5OHYVNFgN2r1r6OD4MkMBNtjPH16s81Gpr5G/gVDweeIF7
/qjYOfuWTinGme0nMEYbuknDHoQKP24Eh9/GQ4areG/IOs2eDlWu7by5lsOCJMf6YRmojP
pRRvDJPpmR1pX0eub9b1MDusEoaEOOl4zhygiLD4WpWEWLyTam1Bk5WTGeUflLUXAwDTSy
BivgUcUFyWNicO4TcgZLuDqw5bnUeNl3Dq8L5fw9QIjXKF9H4YWMji9Wsr616rGxXy73+C
POZbmD3o2+8W93pqLuFytgwYYrd8YVbc+GuhaW9tPaOdfxPfRtUJMejaqAxr6Q==
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 4W53GG2p7QzsX0;
Fri, 21 Jun 2024 03: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 45L3lYbI065368;
Fri, 21 Jun 2024 03: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 45L3lYrf065365;
Fri, 21 Jun 2024 03:47:34 GMT
(envelope-from git)
Date: Fri, 21 Jun 2024 03:47:34 GMT
Message-Id: <202406210347.45L3lYrf065365@gitrepo.freebsd.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
dev-commits-src-branches@FreeBSD.org
From: Gordon Bergling <gbe@FreeBSD.org>
Subject: git: 35dfbe1ec827 - stable/13 - virtio(4): Fix two typos
in KASSERT messages
List-Id: Commits to the stable branches of the FreeBSD src repository <dev-commits-src-branches.freebsd.org>
List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches
List-Help: <mailto:dev-commits-src-branches+help@freebsd.org>
List-Post: <mailto:dev-commits-src-branches@freebsd.org>
List-Subscribe: <mailto:dev-commits-src-branches+subscribe@freebsd.org>
List-Unsubscribe: <mailto:dev-commits-src-branches+unsubscribe@freebsd.org>
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: 35dfbe1ec827d902e1096de2e0be4db300f4851f
Auto-Submitted: auto-generated
The branch stable/13 has been updated by gbe:
URL: https://cgit.FreeBSD.org/src/commit/?id=35dfbe1ec827d902e1096de2e0be4db300f4851f
commit 35dfbe1ec827d902e1096de2e0be4db300f4851f
Author: Gordon Bergling <gbe@FreeBSD.org>
AuthorDate: 2024-06-16 16:02:46 +0000
Commit: Gordon Bergling <gbe@FreeBSD.org>
CommitDate: 2024-06-21 03:47:22 +0000
virtio(4): Fix two typos in KASSERT messages
- s/emtpy/empty/
(cherry picked from commit 018a361f8902d629fca64be372ef9b266fee53ba)
---
sys/dev/virtio/console/virtio_console.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/sys/dev/virtio/console/virtio_console.c b/sys/dev/virtio/console/virtio_console.c
index a966d72f2084..96ccb398ab34 100644
--- a/sys/dev/virtio/console/virtio_console.c
+++ b/sys/dev/virtio/console/virtio_console.c
@@ -981,7 +981,7 @@ vtcon_ctrl_poll(struct vtcon_softc *sc,
*/
VTCON_CTRL_TX_LOCK(sc);
KASSERT(virtqueue_empty(vq),
- ("%s: virtqueue is not emtpy", __func__));
+ ("%s: virtqueue is not empty", __func__));
error = virtqueue_enqueue(vq, control, &sg, sg.sg_nseg, 0);
if (error == 0) {
virtqueue_notify(vq);
@@ -1369,7 +1369,7 @@ vtcon_port_out(struct vtcon_port *port, void *buf, int bufsize)
vq = port->vtcport_outvq;
KASSERT(virtqueue_empty(vq),
- ("%s: port %p out virtqueue not emtpy", __func__, port));
+ ("%s: port %p out virtqueue not empty", __func__, port));
sglist_init(&sg, 2, segs);
error = sglist_append(&sg, buf, bufsize);
From nobody Fri Jun 21 03:47: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 4W53Gj42Scz5PN0f;
Fri, 21 Jun 2024 03:47: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 4W53Gj3JC8z4jrV;
Fri, 21 Jun 2024 03:47:57 +0000 (UTC)
(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
t=1718941677;
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=2vBHirl0AlhofNBkYFaw3Qx+JzxdDFX4fFwzDeIPKfU=;
b=PZTG14nPTfvk4C3bSHd+2Kibqqa79kdE4Yo2sciNGUfl8vSXsVxQLxe77Tan5AkwgcQCYE
DUJlWr331n4ejdrRZXdiQ0vZz9HlZPRsvTIJys3mP8y+Qpat486YASZg6jFc12eOnw8gib
Q6GFRdfXUDIg6elXRxfaOjJ1QiwUyIQrTLHUf5BQ5cmIHb2Xw97jYIW3l0sZ1bInXwDjwG
t5i0imEXzRpsG5pGr56yjcoRJF+XxRYF/aRzvrvBnNXVG1b5oYTnt4QiawpIPYnaTWVg2F
hSvk6f8xRaRJvt/VJgHBFPfJ1Nsv+3ETMsc8uBWP7MIo9xA1gmk41qchgzlFBg==
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1718941677; a=rsa-sha256; cv=none;
b=P7kuhI7MxZU949ZJKALot+oH+mPZt96V9kuLnR/mzbH7+tv9tZdoromCVshZJXq7MJ7vju
awNloyJIdx8oFpmI/ygJQGnpu6n2SDQQUYPl07GuAeT9WQwo9TnsDtFNTx+Xbhuw8zgZfx
Jf+1hbpVvJKdy5A+/8XTtr/D/4W3lqsQNtENYfqTY37g7VyIjuq8I7l4TnxnOuByv4APHe
SVAEgBKgEnRGfIYL6TYlFrZ777YpE2Fj1S/2+pbX0u5dVThA6DKWHSbVvPGBbnQ5JhUCQU
FdIZjFVvTjCOqsPt9EQuGeIry5YGWOw1cIoF31Mw2VL2PWNq9xh2wyr/nrfEzQ==
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=1718941677;
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=2vBHirl0AlhofNBkYFaw3Qx+JzxdDFX4fFwzDeIPKfU=;
b=tUdDlFtvIkBgNhaazPT/4JgwnHPv0llrC/zoI8gkRqSNTa6VikR/8P/86erOOH0vlxeZt0
V5Zi5Et67GE1QqmdA0zpIvHKFV5xv9ZNikgfFGWrqpwBZcgqeSsYuhGl/eZANZU7nCbzIm
MZHZwmLhaDTcntkHZupSqB7RFvGnlc6bIEQL47wD2OMD6zKHkRjSMxqJifsFRqPfu0dY4r
ttj84OpSzHHRiwZF3wLNRZi0cziycZEK5BhJrIrgEtjNu5UsZ3bRA5L7MAmKaas0NTBhD3
CFIdmsECrEboTcVYDmAEIlQjTJDQmNM63H65UMFG7cxPdv4wzESZkGO+ja1ytg==
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 4W53Gj2v0TzsLg;
Fri, 21 Jun 2024 03:47:57 +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 45L3lvFC065570;
Fri, 21 Jun 2024 03:47:57 GMT
(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 45L3lvdP065567;
Fri, 21 Jun 2024 03:47:57 GMT
(envelope-from git)
Date: Fri, 21 Jun 2024 03:47:57 GMT
Message-Id: <202406210347.45L3lvdP065567@gitrepo.freebsd.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
dev-commits-src-branches@FreeBSD.org
From: Gordon Bergling <gbe@FreeBSD.org>
Subject: git: 6f545abb9ac3 - stable/12 - virtio(4): Fix two typos
in KASSERT messages
List-Id: Commits to the stable branches of the FreeBSD src repository <dev-commits-src-branches.freebsd.org>
List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches
List-Help: <mailto:dev-commits-src-branches+help@freebsd.org>
List-Post: <mailto:dev-commits-src-branches@freebsd.org>
List-Subscribe: <mailto:dev-commits-src-branches+subscribe@freebsd.org>
List-Unsubscribe: <mailto:dev-commits-src-branches+unsubscribe@freebsd.org>
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/12
X-Git-Reftype: branch
X-Git-Commit: 6f545abb9ac30b95740be355a5312c2fc24ea9cd
Auto-Submitted: auto-generated
The branch stable/12 has been updated by gbe:
URL: https://cgit.FreeBSD.org/src/commit/?id=6f545abb9ac30b95740be355a5312c2fc24ea9cd
commit 6f545abb9ac30b95740be355a5312c2fc24ea9cd
Author: Gordon Bergling <gbe@FreeBSD.org>
AuthorDate: 2024-06-16 16:02:46 +0000
Commit: Gordon Bergling <gbe@FreeBSD.org>
CommitDate: 2024-06-21 03:47:47 +0000
virtio(4): Fix two typos in KASSERT messages
- s/emtpy/empty/
(cherry picked from commit 018a361f8902d629fca64be372ef9b266fee53ba)
---
sys/dev/virtio/console/virtio_console.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/sys/dev/virtio/console/virtio_console.c b/sys/dev/virtio/console/virtio_console.c
index 919e61be90f7..fd78bec2540f 100644
--- a/sys/dev/virtio/console/virtio_console.c
+++ b/sys/dev/virtio/console/virtio_console.c
@@ -967,7 +967,7 @@ vtcon_ctrl_poll(struct vtcon_softc *sc,
*/
VTCON_CTRL_TX_LOCK(sc);
KASSERT(virtqueue_empty(vq),
- ("%s: virtqueue is not emtpy", __func__));
+ ("%s: virtqueue is not empty", __func__));
error = virtqueue_enqueue(vq, control, &sg, sg.sg_nseg, 0);
if (error == 0) {
virtqueue_notify(vq);
@@ -1355,7 +1355,7 @@ vtcon_port_out(struct vtcon_port *port, void *buf, int bufsize)
vq = port->vtcport_outvq;
KASSERT(virtqueue_empty(vq),
- ("%s: port %p out virtqueue not emtpy", __func__, port));
+ ("%s: port %p out virtqueue not empty", __func__, port));
sglist_init(&sg, 2, segs);
error = sglist_append(&sg, buf, bufsize);
From nobody Fri Jun 21 05:45: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 4W55ss0crQz5PWy1;
Fri, 21 Jun 2024 05:45: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 "R3" (verified OK))
by mx1.freebsd.org (Postfix) with ESMTPS id 4W55sr70mmz4tLd;
Fri, 21 Jun 2024 05:45:04 +0000 (UTC)
(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
t=1718948705;
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=REEBGfxB9yD9KkWeB6x2gugVhlMhyCdCbYdoXJBy2wY=;
b=K4KC5DV33DDl6H7ILDPWcYnDsEV9yCPPR4M+fh5bDN/geX8rKyVKn9mCsLYm8HKdqvFWm3
7LhDxFxu19NcAF69KSfPmdJo+YazRVtkWOp44DcrHT8ahamA6DDnA4WSkFFWjelo7xosWy
/a9CyC5efBf1Fs1oahkDI8WfzSjzo0yiM12ssFiUd6qdAABdDMeq70ojgmvC+NPgq5RizH
F+CnuAkj7QfFDkKFAr/HsNaODrVL3eOr6sRvDfcRBA5YWvazAI6ciMLeTxrivQxPPBs+4M
3R7Hnu9eroI51h3xh3Eo8JTaw/AdBzO58iRtqYM4XFZ9RzZj1KphdQgQ+nIsjA==
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1718948705; a=rsa-sha256; cv=none;
b=qrgMM/EGY0R/m10/qRLMbFm6rHuzAlv+j9BXUMPSbRJUCog5iUucH/lPs0JYZI5LE1SuPq
snhx0Z7zINldamNt+Zwunqz+6AjETenMSV7oMCGbUDshWAghM+QmASSpzSIaQT4U3SW/ix
03xRIKZAIjd33PyrwCQFr9Aq+G9gbDfThVt1zhH0jk1HRNLjZIwZ/5rl64hAiKzTEZW1SV
nvfs2noE+AncNNaJeOP/mdYGbV+kabcUoHQjy+wr6mnQyQ6q9C2CykwFl1Qy2u//f+9GOm
My1db7GjEOCRs/Igil3mEpaWWNKVXIF/7367XWYxbp8eenJsPpYRoHoj8z2Hww==
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=1718948705;
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=REEBGfxB9yD9KkWeB6x2gugVhlMhyCdCbYdoXJBy2wY=;
b=TFb2mNr77M1DIWip/rkK4/F0tLhjd4MWA9WOKCVT56u5Irff67l7ps6V8jt3je1nqYWakk
B35xJoCUnIW5819Ij8rWyYrYMQ1R3h+nRZ29GHAmhiMdAgklIuwS8rA/SRGkPs0ANTlEYp
0oOscpL1649psCDypkONG4Emnw/bkt1OQLBIZHKfG1oOlqsF0Qfz+WfeedzqHG4jSANTbu
eQP+gpQiHGiEYt/taGVNxjTiuhBLRtA/WFrM0bd8paug7jsSFYCFDKp1GSybR+rb4qV9UD
gB0cW9B5ZPOYmjvZly0f9oF9SKLxIG94gZylh2szjw/z02h2DasjwwwuUnUVEQ==
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 4W55sr6YWCzwHl;
Fri, 21 Jun 2024 05:45: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 45L5j4hU066923;
Fri, 21 Jun 2024 05:45:04 GMT
(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 45L5j47N066920;
Fri, 21 Jun 2024 05:45:04 GMT
(envelope-from git)
Date: Fri, 21 Jun 2024 05:45:04 GMT
Message-Id: <202406210545.45L5j47N066920@gitrepo.freebsd.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
dev-commits-src-branches@FreeBSD.org
From: Xin LI <delphij@FreeBSD.org>
Subject: git: 224e20ceb121 - stable/14 - gve: Make gve_free_qpls
idempotent
List-Id: Commits to the stable branches of the FreeBSD src repository <dev-commits-src-branches.freebsd.org>
List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches
List-Help: <mailto:dev-commits-src-branches+help@freebsd.org>
List-Post: <mailto:dev-commits-src-branches@freebsd.org>
List-Subscribe: <mailto:dev-commits-src-branches+subscribe@freebsd.org>
List-Unsubscribe: <mailto:dev-commits-src-branches+unsubscribe@freebsd.org>
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: delphij
X-Git-Repository: src
X-Git-Refname: refs/heads/stable/14
X-Git-Reftype: branch
X-Git-Commit: 224e20ceb1212579887397b67c43b42d41108c62
Auto-Submitted: auto-generated
The branch stable/14 has been updated by delphij:
URL: https://cgit.FreeBSD.org/src/commit/?id=224e20ceb1212579887397b67c43b42d41108c62
commit 224e20ceb1212579887397b67c43b42d41108c62
Author: Shailend Chand <shailend@google.com>
AuthorDate: 2024-06-05 05:31:46 +0000
Commit: Xin LI <delphij@FreeBSD.org>
CommitDate: 2024-06-21 05:44:34 +0000
gve: Make gve_free_qpls idempotent
This fixes a panic caused by double free.
PR: kern/279410
Differential Revision: https://reviews.freebsd.org/D45489
(cherry picked from commit b81cbb12410b000074483899e61e9e767ba3ec1d)
---
sys/dev/gve/gve_qpl.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/sys/dev/gve/gve_qpl.c b/sys/dev/gve/gve_qpl.c
index 3c6d9af6feee..9a946a2a2f2d 100644
--- a/sys/dev/gve/gve_qpl.c
+++ b/sys/dev/gve/gve_qpl.c
@@ -182,6 +182,7 @@ gve_free_qpls(struct gve_priv *priv)
for (i = 0; i < num_qpls; i++)
gve_free_qpl(priv, i);
free(priv->qpls, M_GVE_QPL);
+ priv->qpls = NULL;
}
}
From nobody Fri Jun 21 05:46:07 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 4W55v33tLmz5PWd4;
Fri, 21 Jun 2024 05:46: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 4W55v33Hw0z4tjw;
Fri, 21 Jun 2024 05:46:07 +0000 (UTC)
(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
t=1718948767;
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=01s0ov1xkeT9yECFBiT4M+AdQFIU3s2WpG7TaGWbGok=;
b=ksvQiFWadXcoHYRf2ntZx+4aASNXhVU+3oRLVduRehNQOpvlp/GhAGTsBCnyb4OcovuIxP
apeqLF6EuQimjYK1TaE+i5l4gjQlm9hyctbk4lFMRTZlGRNwPKCj84Kjsei/QaYOb7YrX+
qn/Pnl2jynwErmF1h2r+m4woXDm8aR+ZIZncpTpAWYBv+n4Vv7jDp/ZMfdn3KfGpnFnzYD
Dj0NmiaU5Pw9EsGNj7XnqOIBwbvYC2yq8mzOkIcf+zmj6py7j32RsBvMPbqPbKI4sgKBq6
pbiL+CF0i26FAYvNhH3vzp0bheVlwod9q7+FdCbSknJosFSbFIKO2s9tgu7+eQ==
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1718948767; a=rsa-sha256; cv=none;
b=gQFa3bO4ccFEm7ztY/yjVtmqMAfs/DmbLstJTfkZHxY0dgXfc7gKDohZbOU7xVX0TCm89d
XqtFhOREQ6B9jfZx6+M0K7Abgm3mmuq2biMwPXABxSP+vF/tza/n+dd8JeW92edm0pDPeV
3SIKsO+uGCGl8VB7j7wKy5TosH15kfGpHrfGgVvQT43NChCw6QHBF8WxwFQVl6anWJ85+Q
GdjDzvnvTUvrE8RXKSHgWZcVTL3hejg5BVy74a4SpHywGjRtzWLqODpjU0SLtMFhrZaB69
m7jdxwZMdkFd+7b+xmzj7gZeHItEi7tmZQYqRiqeoLTwTHAdGHoUk2XgHGV+Ig==
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=1718948767;
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=01s0ov1xkeT9yECFBiT4M+AdQFIU3s2WpG7TaGWbGok=;
b=vvp0DLbi3vK9CoZmW9+PyTQLJ6Jn/UQF/blT0IQeCV/RAky++npQW3YtdYAuJQt/9LROiV
mcwskvevCcRoMN9FeipNjWUbr8ikqy5w4oHhg0/FPKVPb4/1QLT6+1RwxOenBvbHyDa/i2
+cHabuOhAD4pnGVzFqHAd7WcEAAbM3sbqkWESn1EMeTXZ1Cv1LyaoFFBc+8iMpWN+ocppA
ye4p5reAx54EsU2nDtChJZd0NVzf8pMbf+SxoAOvgg8aXmkzbcy+0upEA7lsZP2KZnFryK
twAoKB+gPRZV08JLrtfdcHkmsjqY/oKbRpXB7p+1GiUsfmifHBMebxWXaKskpg==
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 4W55v32vHkzwjh;
Fri, 21 Jun 2024 05:46: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 45L5k76U067236;
Fri, 21 Jun 2024 05:46:07 GMT
(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 45L5k7Vn067233;
Fri, 21 Jun 2024 05:46:07 GMT
(envelope-from git)
Date: Fri, 21 Jun 2024 05:46:07 GMT
Message-Id: <202406210546.45L5k7Vn067233@gitrepo.freebsd.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
dev-commits-src-branches@FreeBSD.org
From: Xin LI <delphij@FreeBSD.org>
Subject: git: 14454f417201 - stable/13 - gve: Make gve_free_qpls
idempotent
List-Id: Commits to the stable branches of the FreeBSD src repository <dev-commits-src-branches.freebsd.org>
List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches
List-Help: <mailto:dev-commits-src-branches+help@freebsd.org>
List-Post: <mailto:dev-commits-src-branches@freebsd.org>
List-Subscribe: <mailto:dev-commits-src-branches+subscribe@freebsd.org>
List-Unsubscribe: <mailto:dev-commits-src-branches+unsubscribe@freebsd.org>
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: delphij
X-Git-Repository: src
X-Git-Refname: refs/heads/stable/13
X-Git-Reftype: branch
X-Git-Commit: 14454f417201a6c1075768c1a571b22c6d4c57d2
Auto-Submitted: auto-generated
The branch stable/13 has been updated by delphij:
URL: https://cgit.FreeBSD.org/src/commit/?id=14454f417201a6c1075768c1a571b22c6d4c57d2
commit 14454f417201a6c1075768c1a571b22c6d4c57d2
Author: Shailend Chand <shailend@google.com>
AuthorDate: 2024-06-05 05:31:46 +0000
Commit: Xin LI <delphij@FreeBSD.org>
CommitDate: 2024-06-21 05:45:58 +0000
gve: Make gve_free_qpls idempotent
This fixes a panic caused by double free.
PR: kern/279410
Differential Revision: https://reviews.freebsd.org/D45489
(cherry picked from commit b81cbb12410b000074483899e61e9e767ba3ec1d)
---
sys/dev/gve/gve_qpl.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/sys/dev/gve/gve_qpl.c b/sys/dev/gve/gve_qpl.c
index 3c6d9af6feee..9a946a2a2f2d 100644
--- a/sys/dev/gve/gve_qpl.c
+++ b/sys/dev/gve/gve_qpl.c
@@ -182,6 +182,7 @@ gve_free_qpls(struct gve_priv *priv)
for (i = 0; i < num_qpls; i++)
gve_free_qpl(priv, i);
free(priv->qpls, M_GVE_QPL);
+ priv->qpls = NULL;
}
}
From nobody Fri Jun 21 05:46: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 4W55vk29nMz5PWY8;
Fri, 21 Jun 2024 05:46: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 "R3" (verified OK))
by mx1.freebsd.org (Postfix) with ESMTPS id 4W55vk1Mlqz4ttQ;
Fri, 21 Jun 2024 05:46:42 +0000 (UTC)
(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
t=1718948802;
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=J/CkdFcglABSx0FNGbgp3KI9/gOzRevFaQAUzTnj9HQ=;
b=D38KnRBuEBsgrrm4hW/eA0Dazg4wr8e+N4oPGQCLmmWQ2WiOvCsyIrSqe5EdClDwNfwh/2
n0o+k/NRAXRiGSPttarecS5l/dDBZLNSh17uLjrjrJPJ6g8qeZkskDQ60xu9B2HzaRo63S
Lqn/+m1uwS03/TN3jPFZ/kCAet2w03AmanYMJE1/2QarpdmYwkm0gjJTRvZurHn5OTRV8w
eAc0J+uTdDRfo0CxEGR+BhLmPAAn+CnUWW4/3sY3sC3TR7VkTdJwMO8tqSPZFnQWAzmxO0
7sB2KwckWsjQyh6/u8n4N3sr3YCncBZcXe2oBorx98/tiln0uoH3Qb+Eapvvhg==
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1718948802; a=rsa-sha256; cv=none;
b=j8NLxK4pwACNMeuNFTImdfr1OXjLf6EC/RWkfpmKpEnvC4lByzmVEXduMwy8rgWl87taur
jQEu2AjAFxGU3XomglXVJ0XSRxL5ZBHtI7Ihu+tQPxGkHf+X04uYQVoZOBGBD1V9vRQVMK
lghQ64LOG0aOzCw/JmXrxisWHbQHJhMTT3y7oQtZKzerqRGVpw0qowA2STtY8FdrlORL5t
vJEARlhCMdyJTV91BO0MsoPjVDeFmhDwUSZDwbPS3yW5aZqU9wbfd8B+IgBn40GrFJZh/Q
famIvfk8lf/Qay+qvtOl4TS1FZiep/4ZeDJjwhoaWx0j/EWCl8qC9aVH/499Zg==
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=1718948802;
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=J/CkdFcglABSx0FNGbgp3KI9/gOzRevFaQAUzTnj9HQ=;
b=fwZYp/XciKgXeNIiIU5gvJgFFngltWr+puC8pCnbqywN9TVtCFdgea2Ts+/Rk9JnbIKByg
+Cgw/8pB17B/xVrA6O06MixEu8Dfspl19zeTxoilGggXV0IN5zV1C0jtAanxCcVu1D0OHs
OKam/rjhhXkDZLnzHLxLdTIBLQE+miVU8Nf8A3HeiLz4QHP3M4j1CGw7D5JA1ZF6DOMBH4
Ey8HuLHWmgScQDC6cvI8oQdx3xY96JB97K5bUO32TGA5V5fjz2YTzbcXong4VEyIFncyXS
wRDZASmHDf7o4kIUN7xGubvJ3l4UUeI7ptgw9pC3Nc8Rn8EbPduNWIJmqTBZgA==
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 4W55vk0z0Rzwjk;
Fri, 21 Jun 2024 05:46: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 45L5kgkD067429;
Fri, 21 Jun 2024 05:46:42 GMT
(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 45L5kgGc067426;
Fri, 21 Jun 2024 05:46:42 GMT
(envelope-from git)
Date: Fri, 21 Jun 2024 05:46:42 GMT
Message-Id: <202406210546.45L5kgGc067426@gitrepo.freebsd.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
dev-commits-src-branches@FreeBSD.org
From: Xin LI <delphij@FreeBSD.org>
Subject: git: 70ad4a1f4b55 - stable/14 - Update leap-seconds to
leap-seconds.3676924800
List-Id: Commits to the stable branches of the FreeBSD src repository <dev-commits-src-branches.freebsd.org>
List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches
List-Help: <mailto:dev-commits-src-branches+help@freebsd.org>
List-Post: <mailto:dev-commits-src-branches@freebsd.org>
List-Subscribe: <mailto:dev-commits-src-branches+subscribe@freebsd.org>
List-Unsubscribe: <mailto:dev-commits-src-branches+unsubscribe@freebsd.org>
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: delphij
X-Git-Repository: src
X-Git-Refname: refs/heads/stable/14
X-Git-Reftype: branch
X-Git-Commit: 70ad4a1f4b557e1fcc58cbcabc61216dc1efbeb6
Auto-Submitted: auto-generated
The branch stable/14 has been updated by delphij:
URL: https://cgit.FreeBSD.org/src/commit/?id=70ad4a1f4b557e1fcc58cbcabc61216dc1efbeb6
commit 70ad4a1f4b557e1fcc58cbcabc61216dc1efbeb6
Author: Xin LI <delphij@FreeBSD.org>
AuthorDate: 2024-06-19 02:10:33 +0000
Commit: Xin LI <delphij@FreeBSD.org>
CommitDate: 2024-06-21 05:46:30 +0000
Update leap-seconds to leap-seconds.3676924800
Obtained from: ftp://ftp.boulder.nist.gov/pub/time/leap-seconds.3676924800
(cherry picked from commit 8a607939decc9eddf31420a169d7a7ffe22295bf)
---
usr.sbin/ntp/ntpd/leap-seconds | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/usr.sbin/ntp/ntpd/leap-seconds b/usr.sbin/ntp/ntpd/leap-seconds
index 3fe9a1210e3c..c5a95aa51799 100644
--- a/usr.sbin/ntp/ntpd/leap-seconds
+++ b/usr.sbin/ntp/ntpd/leap-seconds
@@ -204,10 +204,10 @@
# current -- the update time stamp, the data and the name of the file
# will not change.
#
-# Updated through IERS Bulletin C66
-# File expires on: 28 June 2024
+# Updated through IERS Bulletin C67
+# File expires on: 28 December 2024
#
-#@ 3928521600
+#@ 3944332800
#
2272060800 10 # 1 Jan 1972
2287785600 11 # 1 Jul 1972
@@ -252,4 +252,4 @@
# the hash line is also ignored in the
# computation.
#
-#h 16edd0f0 3666784f 37db6bdd e74ced87 59af48f1
+#h 199a9d45 3f630d2f e47cb9cc c2f0fa47 96932227
From nobody Fri Jun 21 05:46: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 4W55vw6ftQz5PX0y;
Fri, 21 Jun 2024 05:46: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 4W55vw4rHtz4v88;
Fri, 21 Jun 2024 05:46:52 +0000 (UTC)
(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
t=1718948812;
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=MyoeQwmJ9tqm9fyYx5ggnUjUEDZCigsrPiRqyCLPPgE=;
b=ZWBm0iraFfNIJ3qvrzxzU4lN612C0BFS2I25DfghDT7WZmkEnO3cTyrt2ykJyX0qWIht1P
Zo9DunIlw2ToK7A54wXFcSZrNbxhcxXRJXbllf3An2x82Jc8OzummKtmNtkMVoZMUI1WbK
rvPq+KWCBxTX/VhyMrRAVxOEGxJqLmk/q4uIm2XugtZmLpFMim2eZjhMdrmVITRccLxbAy
ARIMpaZVvLOhzi1vGTG965wZy846o/NEzIfcnE+MUEg4pc2YA7L7+ewUR0eBTbtH55Jli+
Z0UGo2jLi+cXeL4XlqMzsyK/fEs+VchpkKIybT0oXU0EUcc/zf84w+r0NapeLg==
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1718948812; a=rsa-sha256; cv=none;
b=sDtvAb5AJ9f8xeZOUpMAs9gdzHgT80ty0da2FpDU/Ts4mqHBoo3/9nJxknojTUPIc5v3NP
PCEhf7WXRnUwVHe09/+amGCfIFkDdS19J7k0sfPMIyU1DqskRgbENryy2I3f62PK6HiRHg
UUaiXypVs3my8EGZ57n7vfD1aHO9Ec+hV5b9jJQMljo91m1THL7KKoxAi7J/2OJsHmF3Hk
GOOIbvATo7vuH3ELsFiJ94h2HoxBeWk6NdYqDlnnulhGqR7K7InLdSGYp3R01oeRkS7oU9
u/UHubMQmoi7XL0zk/XlrZIiimWEdyRqqKzfshDzw25iJcpgMWhGm+aWosnWQg==
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=1718948812;
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=MyoeQwmJ9tqm9fyYx5ggnUjUEDZCigsrPiRqyCLPPgE=;
b=EF3e2DaB9eBmI2lHu9mxmVyd/zL+pLq1pFjg1Ez6vv4xbJxCq9Ca2PzQ5mSGAkyJmxS/Y5
HXNd5QjtwuaJeu6lh20M45ZPcRl17GavLXPZIPGER4oXy/9OOQZxvOgNTYy1O3b1/LXKMB
waao6gf/2fjQIcBBq0GmCCHtSqIU7aF5Msmed+omXWi+ZqHhW1IOqJ4PioWsnwEdT3VSTi
Bm8m/X25n7QmrFkOf0gDlg0X/jOUPr962VyWCstawUX8wNB1uLGXJ35q+zxmC3cGYBrUhY
9cV0io9ImRAO/m5eDWttrsv96y+CNi+O5Z59hTu/ZQFlJ9h3yWryzveVH2Kggw==
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 4W55vw493Wzwwc;
Fri, 21 Jun 2024 05:46: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 45L5kqsI067589;
Fri, 21 Jun 2024 05:46:52 GMT
(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 45L5kqbu067586;
Fri, 21 Jun 2024 05:46:52 GMT
(envelope-from git)
Date: Fri, 21 Jun 2024 05:46:52 GMT
Message-Id: <202406210546.45L5kqbu067586@gitrepo.freebsd.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
dev-commits-src-branches@FreeBSD.org
From: Xin LI <delphij@FreeBSD.org>
Subject: git: cbfeaa80e39f - stable/13 - Update leap-seconds to
leap-seconds.3676924800
List-Id: Commits to the stable branches of the FreeBSD src repository <dev-commits-src-branches.freebsd.org>
List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches
List-Help: <mailto:dev-commits-src-branches+help@freebsd.org>
List-Post: <mailto:dev-commits-src-branches@freebsd.org>
List-Subscribe: <mailto:dev-commits-src-branches+subscribe@freebsd.org>
List-Unsubscribe: <mailto:dev-commits-src-branches+unsubscribe@freebsd.org>
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: delphij
X-Git-Repository: src
X-Git-Refname: refs/heads/stable/13
X-Git-Reftype: branch
X-Git-Commit: cbfeaa80e39fd7012e7c4e6616c47e8cd8a3b6c0
Auto-Submitted: auto-generated
The branch stable/13 has been updated by delphij:
URL: https://cgit.FreeBSD.org/src/commit/?id=cbfeaa80e39fd7012e7c4e6616c47e8cd8a3b6c0
commit cbfeaa80e39fd7012e7c4e6616c47e8cd8a3b6c0
Author: Xin LI <delphij@FreeBSD.org>
AuthorDate: 2024-06-19 02:10:33 +0000
Commit: Xin LI <delphij@FreeBSD.org>
CommitDate: 2024-06-21 05:46:46 +0000
Update leap-seconds to leap-seconds.3676924800
Obtained from: ftp://ftp.boulder.nist.gov/pub/time/leap-seconds.3676924800
(cherry picked from commit 8a607939decc9eddf31420a169d7a7ffe22295bf)
---
usr.sbin/ntp/ntpd/leap-seconds | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/usr.sbin/ntp/ntpd/leap-seconds b/usr.sbin/ntp/ntpd/leap-seconds
index 3fe9a1210e3c..c5a95aa51799 100644
--- a/usr.sbin/ntp/ntpd/leap-seconds
+++ b/usr.sbin/ntp/ntpd/leap-seconds
@@ -204,10 +204,10 @@
# current -- the update time stamp, the data and the name of the file
# will not change.
#
-# Updated through IERS Bulletin C66
-# File expires on: 28 June 2024
+# Updated through IERS Bulletin C67
+# File expires on: 28 December 2024
#
-#@ 3928521600
+#@ 3944332800
#
2272060800 10 # 1 Jan 1972
2287785600 11 # 1 Jul 1972
@@ -252,4 +252,4 @@
# the hash line is also ignored in the
# computation.
#
-#h 16edd0f0 3666784f 37db6bdd e74ced87 59af48f1
+#h 199a9d45 3f630d2f e47cb9cc c2f0fa47 96932227
From nobody Fri Jun 21 08:28: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 4W59VN03yGz5Pk9H;
Fri, 21 Jun 2024 08:28:28 +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 4W59VM6fXSz4CtN;
Fri, 21 Jun 2024 08:28:27 +0000 (UTC)
(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
t=1718958507;
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=u26JqSwKiQk8t7PBmBihFQoMr2Cr2LeF95JOKAO1Eao=;
b=aQ+wbdEiFTQmFp5rCq8rEF1CrZD8IMYC5a1+JYkFTFQTy0gfR8RuaBh9/KN59sYYi9qOis
JJKWpR6KbJWctgKkRC7omT1+qYLs3tR5LTfhO9aQcC8AgJRw8E5Yqs6NuwxHlziKXX2ovU
YY2lJHKdPedyNB42+U/EneftQO5WEZUCeOPf1bo2eSbsXgNaPp6VTXqqa9g74SPv3KXdHR
tZ6DiEamtIuI+sWSjmVyMbBdUoNS1oics2yjNXFUeq9PRgYVWLgrWGf5yZMo5sQN0YIdfH
tQ7NbJwHWF03XmwoyF5r2Mqh6yjHad718knE29EZnDz5ReAlWMDAhNAdim+LBw==
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1718958507; a=rsa-sha256; cv=none;
b=RaVwYmTyrVfgOO/4Ei7h+H9xbHXd6xBPh6x/ZDR+ypgbwl1sCjECBetuorwKcmBU/Amk4Z
/SRUlWCiT5jGj/QS9mDykyZFMyr7g8wbihKRDKZkUNZiHwpx7T3FIInr9qD9cBiiFXK3Cx
OYzPR5QQM5HU20z/0xufacYlS+MwgadpEqHYp1Abcsd/Io9o5p110v3zfV34fWVESW03Q+
eHLmccJWO/1NuRyxH354sCJeTda2+hmW9zqaLSRYB/ZV82FbAItSm7ROxETr6K0v9bm/Il
S0oPgxqUXZTALU9iyJ9C0WyGmQD2YKeDGug0ahZ/VLeJcIoILWSy33NbbejRuQ==
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=1718958507;
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=u26JqSwKiQk8t7PBmBihFQoMr2Cr2LeF95JOKAO1Eao=;
b=HfGg6W6aEIYwfmabmjq7YtkZVQPG8NHuv/w6Uy/0Zv4oKiMFSSacHlr6A1LO+F1k7jwyUu
5kCq16pVwjEnDrHZOG3OMxaBsWbbAczrgj0/+TjnYCwpy1gmlASJJ/dSIgRL81i4c60QgO
79YbTHQpSD41zasxUgCYwTTTBmoB4sHipXuhuj2EK549xWoFIthibUROAQpn4h0b1hYhMH
hUe6Xq9+XldkFR6rwNIrZ6kSu8l3xwn7Q3PInokb8YoJVceiJbXAPljh7WZas8gxfEApm9
2y8aS/6MGvXmpSJSsszHaYoW6hz+3LBmfe06bAvzAPCr4fXoEomUjxlBKpqcxQ==
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 4W59VM6G0nz11q3;
Fri, 21 Jun 2024 08:28: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 45L8SRIu038161;
Fri, 21 Jun 2024 08:28:27 GMT
(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 45L8SROg038158;
Fri, 21 Jun 2024 08:28:27 GMT
(envelope-from git)
Date: Fri, 21 Jun 2024 08:28:27 GMT
Message-Id: <202406210828.45L8SROg038158@gitrepo.freebsd.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
dev-commits-src-branches@FreeBSD.org
From: Eugene Grosbein <eugen@FreeBSD.org>
Subject: git: a3a09bbf21dc - stable/14 - rc.subr: improve description
for ${name}_offcmd
List-Id: Commits to the stable branches of the FreeBSD src repository <dev-commits-src-branches.freebsd.org>
List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches
List-Help: <mailto:dev-commits-src-branches+help@freebsd.org>
List-Post: <mailto:dev-commits-src-branches@freebsd.org>
List-Subscribe: <mailto:dev-commits-src-branches+subscribe@freebsd.org>
List-Unsubscribe: <mailto:dev-commits-src-branches+unsubscribe@freebsd.org>
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: eugen
X-Git-Repository: src
X-Git-Refname: refs/heads/stable/14
X-Git-Reftype: branch
X-Git-Commit: a3a09bbf21dcd4f18b90e11023e0c26368bed4d2
Auto-Submitted: auto-generated
The branch stable/14 has been updated by eugen:
URL: https://cgit.FreeBSD.org/src/commit/?id=a3a09bbf21dcd4f18b90e11023e0c26368bed4d2
commit a3a09bbf21dcd4f18b90e11023e0c26368bed4d2
Author: Eugene Grosbein <eugen@FreeBSD.org>
AuthorDate: 2024-06-18 09:11:56 +0000
Commit: Eugene Grosbein <eugen@FreeBSD.org>
CommitDate: 2024-06-21 08:27:50 +0000
rc.subr: improve description for ${name}_offcmd
Clarify that ${name}_offcmd is for method start.
(cherry picked from commit af1b0aa5b957bbfedc929167aa3459ad2d8b6653)
---
libexec/rc/rc.subr | 3 ++-
share/man/man8/rc.subr.8 | 4 ++--
2 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/libexec/rc/rc.subr b/libexec/rc/rc.subr
index a662b878860b..05d46f74e598 100644
--- a/libexec/rc/rc.subr
+++ b/libexec/rc/rc.subr
@@ -816,7 +816,8 @@ startmsg()
#
# ${name}_limits n limits(1) to apply to ${command}.
#
-# ${name}_offcmd n If set, run if a service is not enabled.
+# ${name}_offcmd n If set, run during start
+# if a service is not enabled.
#
# ${rc_arg}_cmd n If set, use this as the method when invoked;
# Otherwise, use default command (see below)
diff --git a/share/man/man8/rc.subr.8 b/share/man/man8/rc.subr.8
index 3037840007a4..a32347a09eb2 100644
--- a/share/man/man8/rc.subr.8
+++ b/share/man/man8/rc.subr.8
@@ -27,7 +27,7 @@
.\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
.\" POSSIBILITY OF SUCH DAMAGE.
.\"
-.Dd June 2, 2024
+.Dd June 18, 2024
.Dt RC.SUBR 8
.Os
.Sh NAME
@@ -632,7 +632,7 @@ Login class to use with
Defaults to
.Dq Li daemon .
.It Va ${name}_offcmd
-Shell commands to run if a service is not enabled.
+Shell commands to run during start if a service is not enabled.
.It Va ${name}_oomprotect
.Xr protect 1
.Va command
From nobody Fri Jun 21 08:30: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 4W59XM3Kxdz5PkGj;
Fri, 21 Jun 2024 08:30: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 "R3" (verified OK))
by mx1.freebsd.org (Postfix) with ESMTPS id 4W59XM2rLmz4DGS;
Fri, 21 Jun 2024 08:30:11 +0000 (UTC)
(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
t=1718958611;
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=MHPQL1HrVKO558kNOV0S4E+UnYSYuZMKS98lIZBTg6c=;
b=NRJUIj1Vle7wTZ+oPNLpDGqvdLZVC80IceK0biRbZM8aS77xGRZJah5PfT03mTrvv9d9eg
b13xk6mcNEGCpjv4Ig2511XQis1I9JIV8H1mPF0fnsJA7DUp2SgUpSTHuePKeIo87nvYYl
VZZzzxrFHl3+HKEFNbkCFuhV8y6l6fa3uJndVOtLuETijQ3ch9TJP1D/PC9Mtb8kOBKW8j
tyrh3oyPjgViWIQQeTwQUhBTwi5AkSudm3OPNfPcsI+4hTXFkrQa8cgIkssw4BC8+1KctJ
OTiwgXcMNIX7bbfU11ZoBRZL9/0NSFzuhtR4f7meiwBdWKK+knI/7tp1IubBhQ==
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1718958611; a=rsa-sha256; cv=none;
b=IRz8aYgiPyhdA53KtQOxhBXVYqG4o7wBfYyCGeFyWwNEmAmXyQqzp7ORxIF5H/LceeeHZS
9gstNNbAibxNDxtdkV4Fy7Ie8+p0Jdp/5yT+YvS47rj0LRYH7gUjxiWCSszpH4hjqIDGOf
MOJfWlmhCgq4OuBCJEKh8fE4eunLT2hOBFy5RfOJC1D1f6MQ4KqJ0d9z4+L4tOFcIquEO6
0hmV7xDnIxjo6IovisvRYj9RItAeRj52WpsjrW2VjQdJrR8S2yUuOL1hQQdcOjTfGiSEX4
21ZdgzdNv3YqFVYMjj1PtU1KDeYgifR/BklZFrPGUA0uSO7/8elZTrnSVV8TRg==
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=1718958611;
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=MHPQL1HrVKO558kNOV0S4E+UnYSYuZMKS98lIZBTg6c=;
b=FBMXe0nbGu/vABfYDqjwyNcQu0lxUPvHWfKfuCK/jVDZOXT4f/PO5bMYFUuw1upd86Aixi
X+jO7ZOMxMlu7tGOdJLeea0RxVkJTKnD8M63q318yqvQrjJY66wp4EdxA2DElg4PL7SS0e
cXMCdm4zA/Ywe8bghw4eRBdaCPMu0mIxFXVOwPdmYj4MtkXAEMfmkrHLe10jivfUQfTpDS
5FRbzzdOWF448SxFpJDVg8EGuZ8L0vYzskdHBOmL3U7e8ZKY4HSJLJOMEdMluNOJLcuhlV
ITSQP5mU4aMxERPwSc+1axXAIcIDsP2BpWdD7jxX63kLur/DbMB+Mk4DouNIFA==
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 4W59XM2RZwz11tB;
Fri, 21 Jun 2024 08:30: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 45L8UBup043169;
Fri, 21 Jun 2024 08:30:11 GMT
(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 45L8UBeo043164;
Fri, 21 Jun 2024 08:30:11 GMT
(envelope-from git)
Date: Fri, 21 Jun 2024 08:30:11 GMT
Message-Id: <202406210830.45L8UBeo043164@gitrepo.freebsd.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
dev-commits-src-branches@FreeBSD.org
From: Eugene Grosbein <eugen@FreeBSD.org>
Subject: git: 73d1f732cea1 - stable/13 - rc.subr: improve description
for ${name}_offcmd
List-Id: Commits to the stable branches of the FreeBSD src repository <dev-commits-src-branches.freebsd.org>
List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches
List-Help: <mailto:dev-commits-src-branches+help@freebsd.org>
List-Post: <mailto:dev-commits-src-branches@freebsd.org>
List-Subscribe: <mailto:dev-commits-src-branches+subscribe@freebsd.org>
List-Unsubscribe: <mailto:dev-commits-src-branches+unsubscribe@freebsd.org>
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: eugen
X-Git-Repository: src
X-Git-Refname: refs/heads/stable/13
X-Git-Reftype: branch
X-Git-Commit: 73d1f732cea18de474b58783b562b11a28f1dd99
Auto-Submitted: auto-generated
The branch stable/13 has been updated by eugen:
URL: https://cgit.FreeBSD.org/src/commit/?id=73d1f732cea18de474b58783b562b11a28f1dd99
commit 73d1f732cea18de474b58783b562b11a28f1dd99
Author: Eugene Grosbein <eugen@FreeBSD.org>
AuthorDate: 2024-06-18 09:11:56 +0000
Commit: Eugene Grosbein <eugen@FreeBSD.org>
CommitDate: 2024-06-21 08:29:53 +0000
rc.subr: improve description for ${name}_offcmd
Clarify that ${name}_offcmd is for method start.
(cherry picked from commit af1b0aa5b957bbfedc929167aa3459ad2d8b6653)
---
libexec/rc/rc.subr | 3 ++-
share/man/man8/rc.subr.8 | 4 ++--
2 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/libexec/rc/rc.subr b/libexec/rc/rc.subr
index 8ae0744939d0..f1eeb81a5d39 100644
--- a/libexec/rc/rc.subr
+++ b/libexec/rc/rc.subr
@@ -811,7 +811,8 @@ startmsg()
#
# ${name}_limits n limits(1) to apply to ${command}.
#
-# ${name}_offcmd n If set, run if a service is not enabled.
+# ${name}_offcmd n If set, run during start
+# if a service is not enabled.
#
# ${rc_arg}_cmd n If set, use this as the method when invoked;
# Otherwise, use default command (see below)
diff --git a/share/man/man8/rc.subr.8 b/share/man/man8/rc.subr.8
index b9713eb65a3c..9126cc5e8ac6 100644
--- a/share/man/man8/rc.subr.8
+++ b/share/man/man8/rc.subr.8
@@ -27,7 +27,7 @@
.\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
.\" POSSIBILITY OF SUCH DAMAGE.
.\"
-.Dd June 2, 2024
+.Dd June 18, 2024
.Dt RC.SUBR 8
.Os
.Sh NAME
@@ -632,7 +632,7 @@ Login class to use with
Defaults to
.Dq Li daemon .
.It Va ${name}_offcmd
-Shell commands to run if a service is not enabled.
+Shell commands to run during start if a service is not enabled.
.It Va ${name}_oomprotect
.Xr protect 1
.Va command
From nobody Fri Jun 21 13:05: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 4W5HfT1MJrz5Ndr2;
Fri, 21 Jun 2024 13:05: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 "R3" (verified OK))
by mx1.freebsd.org (Postfix) with ESMTPS id 4W5HfT0kwSz4j7p;
Fri, 21 Jun 2024 13:05:53 +0000 (UTC)
(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
t=1718975153;
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=UWqdHAYM7zeKMAlAT3XpKf4H++e//dEkOLaIi2yaCmE=;
b=GMHno2l85qzVMhK7H8f5qgUFPDOJldN75pzkdq72EErSy4ztcUFjHMy1wNomTW6+RATvDj
06PPg92wi6voUW9U+Zk5vkXlcxNvcB1SrxO3VO54ddPHhNSVVbXrH/4+VmgLWTphanqgcA
K/H4ucEUJut367xAVCBkQnopCiVvyQioREitNSlWSLbjHNl/J2CK4sCp2lLmLPXrDiP1It
GVWXcnfK1CxLT6Pt3eoRlJ6y19v4m8/v+YG26JlwPsvhJQyA4nqlK+Mn69GLNFt5LNadpI
nEXcp5NMZrsUEdveqQTJ6iy7aZ4u9RdtuLcaWj1awBwQGG6xBlGhAK02aNpTfQ==
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1718975153; a=rsa-sha256; cv=none;
b=w2bgVXsm/QihS/cWnTyz1YDCrvq8LwyNahF7/iDKtc4iMBOyn1dVa7KHVqYiol+w+3AyDt
9Z68LEC/UCXE8kkd4KtJOOgmYcxoal8qMooXZQ9q9Fh2CFY9iE46GMXBjVxkdkgcTm8Tzz
czu7q3FpaGkrUzBSH4QWLFIJnbJLX7RBheYfWDnwyMtLBhg59xiG+b/EydjjiSA9Q5Qilj
TPr5OEOw6uucnhfZKPVsyoluR0O/HVKtK360RlEGrMquWEezWZqFbVkY7FibQGamUHqaM/
CxnGWoH2FI1EMx33PNrUEYlNAKDMaaIaN02A0B5zShlT+/isva9/jErxVQ+GBQ==
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=1718975153;
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=UWqdHAYM7zeKMAlAT3XpKf4H++e//dEkOLaIi2yaCmE=;
b=K8s5ccAMud2+t/JMzSSworO+Wps+u932TR7RWduwFJOy2iYGRUfWLWgAvZ01Db4V55LDvT
5r17AQVOObAXJQ2lT+PKhXe6d6rbjySWn64p8JIjq/EnPE87nebaK4SRfOLZnnLK6S2cIM
WNqTL/OG2po76XjQkL8yVMhnaELFSaEZMTEEUJZN+3CF8Ol2lteP2GkcV5Sv7i71J84Uti
vr95bmL7VNpwcz+WTZz+JRE+xlxshYXDaS/x0pPEDwUOPBMEHUc54FvDKVX8q8TKqY+gM4
5sFBjgoTzKmE+VLmo3ZsIwuV6+P83qNkNrqekwBwb4xpaC4TzJ9eS0MRxJUOaA==
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 4W5HfT0DKjz18h1;
Fri, 21 Jun 2024 13:05:53 +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 45LD5qpk011879;
Fri, 21 Jun 2024 13:05:52 GMT
(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 45LD5qtu011876;
Fri, 21 Jun 2024 13:05:52 GMT
(envelope-from git)
Date: Fri, 21 Jun 2024 13:05:52 GMT
Message-Id: <202406211305.45LD5qtu011876@gitrepo.freebsd.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
dev-commits-src-branches@FreeBSD.org
From: Mitchell Horne <mhorne@FreeBSD.org>
Subject: git: a3e8efd45a42 - stable/14 - git-arc.1: list width typo
List-Id: Commits to the stable branches of the FreeBSD src repository <dev-commits-src-branches.freebsd.org>
List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches
List-Help: <mailto:dev-commits-src-branches+help@freebsd.org>
List-Post: <mailto:dev-commits-src-branches@freebsd.org>
List-Subscribe: <mailto:dev-commits-src-branches+subscribe@freebsd.org>
List-Unsubscribe: <mailto:dev-commits-src-branches+unsubscribe@freebsd.org>
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: a3e8efd45a42d5c4c1bde45ba7f636a840dc6e44
Auto-Submitted: auto-generated
The branch stable/14 has been updated by mhorne:
URL: https://cgit.FreeBSD.org/src/commit/?id=a3e8efd45a42d5c4c1bde45ba7f636a840dc6e44
commit a3e8efd45a42d5c4c1bde45ba7f636a840dc6e44
Author: Alexander Ziaee <concussious@runbox.com>
AuthorDate: 2024-06-01 06:19:33 +0000
Commit: Mitchell Horne <mhorne@FreeBSD.org>
CommitDate: 2024-06-21 13:05:01 +0000
git-arc.1: list width typo
Reviewed by: mhorne
MFC after: 3 days
Fixes: 760be44702 ("git-arc: document "create" command options")
Pull Request: https://github.com/freebsd/freebsd-src/pull/1272
(cherry picked from commit 41d6858ebd6ae0431196c1bc6f03f8e388eae8e6)
---
tools/tools/git/git-arc.1 | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/tools/tools/git/git-arc.1 b/tools/tools/git/git-arc.1
index c816de672984..064c86ec9e47 100644
--- a/tools/tools/git/git-arc.1
+++ b/tools/tools/git/git-arc.1
@@ -70,7 +70,7 @@ The available verbs are:
.It Cm create
Create new Differential Revisions from the specified commits.
Accepts options:
-.Bl -tag -width subscriber
+.Bl -tag -width "-s subscriber"
.It Fl l
Before processing commit(s) display list of commits to be processed
and wait for confirmation.
From nobody Fri Jun 21 13:05: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 4W5HfV285Rz5NfDK;
Fri, 21 Jun 2024 13:05: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 4W5HfV1SjHz4hpq;
Fri, 21 Jun 2024 13:05:54 +0000 (UTC)
(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
t=1718975154;
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=znGuygTR554Fk3XxioouG1u4RuYZy134WzH2zpsl/zg=;
b=vNixSJy1RfDzrcyB7XtRYQl988t7dluMvBt/YAN23I5AKV2/xJCHe+T6RZnTdUibwoWVGW
HrXXO5oD11LolqbSrkDgU2dDllLiE5bbuSUAJNybKPfUbKdlXTR3ynM3KCfYF4f+R74bt+
TxpiXxL6o9BQlcI8lrZrmvSzphR5K/0HSH+UarQ91nLgCKM2jpNoAMGMi8YZPjzHtB8fan
3Q4tm+xnwzfSq99gf7CuR3wOGf5N4nxnoMugzKCh/zsH6A1QTS6R+ZwY/5mHNxuknh6X2x
dqN6aAsgLc9a8sdiHNJKjAAfNHjgsK/HI1qoplebSSTBde5g5HKKHyr9D+UtBg==
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1718975154; a=rsa-sha256; cv=none;
b=ORWgvXPRIGGees+YqsU5lbi1wB8oOej89cVdorA+wjo18KkIMIc/p0P9e/CkRhTD9tl6I5
OVsqsReZfOUH8CEfMml0pubqhBoUhOZQDdrxczVmFqVINh/MKm6PczmaXDla5uuZS8Rwko
zgC44RFcf0psNAWBafjpENoecNMmkaUFhexXYPwCJX6mvcDmmMyrTCFkI6o6Zh/eBdAudk
XA2w4se25pRUqVAexd7TmBF2e6AKgWNAZp6nWoEcZBcLsbL82Q+/O9t5Gvpf8sX8WNDQ0r
9mwVQhZlrlsI9WrYvYwZyDvIGicTo6xo7DRU8X9K077Li6bgU2Qd/pOY/jf3Kw==
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=1718975154;
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=znGuygTR554Fk3XxioouG1u4RuYZy134WzH2zpsl/zg=;
b=x0Y+3peA+4XS0CSB2JEKSE3syuUYkWgzz3/xuOidbSQ9EGIYARpC5d0ng81YwyDitm/oWV
BrdN6fNNwslxra2eRBt/9CYKpihiImTzu1soyHhAoxpws2PGUhWqFb6lj7Rtr5H4s5+a+1
HMiI9vaysFZmn++vVxC2FCzEW90PBwqfGFum1A2Q+GCBJGWW72o56QO5cxDWTWlo15++19
xRY3oX832I/TRtyzgs7g1/ib6TNdwutx4bWasML2UDB0D1qvheIwID5khM6KUgM+YysxE/
utcFVdwIYqchhM7Qt2lPKNUifADsDYLeNFolLmwfZinZZXVdt1TlCC5dwusbtg==
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 4W5HfV10NRz18h2;
Fri, 21 Jun 2024 13:05: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 45LD5seK011931;
Fri, 21 Jun 2024 13:05:54 GMT
(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 45LD5sIG011928;
Fri, 21 Jun 2024 13:05:54 GMT
(envelope-from git)
Date: Fri, 21 Jun 2024 13:05:54 GMT
Message-Id: <202406211305.45LD5sIG011928@gitrepo.freebsd.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
dev-commits-src-branches@FreeBSD.org
From: Mitchell Horne <mhorne@FreeBSD.org>
Subject: git: 6d87472f3234 - stable/14 - build.7: nit section order,
tag spdx
List-Id: Commits to the stable branches of the FreeBSD src repository <dev-commits-src-branches.freebsd.org>
List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches
List-Help: <mailto:dev-commits-src-branches+help@freebsd.org>
List-Post: <mailto:dev-commits-src-branches@freebsd.org>
List-Subscribe: <mailto:dev-commits-src-branches+subscribe@freebsd.org>
List-Unsubscribe: <mailto:dev-commits-src-branches+unsubscribe@freebsd.org>
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: 6d87472f32342f1e17b07b75be743ef354dd0b18
Auto-Submitted: auto-generated
The branch stable/14 has been updated by mhorne:
URL: https://cgit.FreeBSD.org/src/commit/?id=6d87472f32342f1e17b07b75be743ef354dd0b18
commit 6d87472f32342f1e17b07b75be743ef354dd0b18
Author: Alexander Ziaee <concussious@runbox.com>
AuthorDate: 2024-06-02 13:23:40 +0000
Commit: Mitchell Horne <mhorne@FreeBSD.org>
CommitDate: 2024-06-21 13:05:01 +0000
build.7: nit section order, tag spdx
Reviewed by: mhorne
MFC after: 3 days
Pull Request: https://github.com/freebsd/freebsd-src/pull/1273
(cherry picked from commit 8327796cc873ad86dfdef2846412a68709dcbbf2)
---
share/man/man7/build.7 | 13 ++++++++-----
1 file changed, 8 insertions(+), 5 deletions(-)
diff --git a/share/man/man7/build.7 b/share/man/man7/build.7
index 6846b38c99a6..09e58d4ff013 100644
--- a/share/man/man7/build.7
+++ b/share/man/man7/build.7
@@ -1,3 +1,6 @@
+.\"-
+.\" SPDX-License-Identifier: BSD-2-Clause
+.\"
.\" Copyright (c) 2000
.\" Mike W. Meyer
.\"
@@ -891,11 +894,6 @@ cd /usr/src
make TARGET_ARCH=armv6 buildworld buildkernel
make TARGET_ARCH=armv6 DESTDIR=/clients/arm installworld installkernel
.Ed
-.Sh HISTORY
-The
-.Nm
-manpage first appeared in
-.Fx 4.3 .
.Sh SEE ALSO
.Xr cc 1 ,
.Xr install 1 ,
@@ -911,5 +909,10 @@ manpage first appeared in
.Xr etcupdate 8 ,
.Xr reboot 8 ,
.Xr shutdown 8
+.Sh HISTORY
+The
+.Nm
+manpage first appeared in
+.Fx 4.3 .
.Sh AUTHORS
.An Mike W. Meyer Aq Mt mwm@mired.org
From nobody Fri Jun 21 13:05: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 4W5HfW4zNDz5Ndw6;
Fri, 21 Jun 2024 13:05: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 "R3" (verified OK))
by mx1.freebsd.org (Postfix) with ESMTPS id 4W5HfW2Cq9z4jQC;
Fri, 21 Jun 2024 13:05:55 +0000 (UTC)
(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
t=1718975155;
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=oAIyJ5CbMFQD3nYHuHzTfKgWClCa0pvty0cPdXRDYY8=;
b=DznijQfr8cGFsqaXB+04lbaS0Zsk1Jq4516AgY0nqBsWiO9Oc42L45gB11vkqHeW44Yyrn
5pJDXpwCrkE8m4FyBgAwM4MtpYD4ksdgadqgHSCULNEdKFOx57ui6u66CbcdqmsXjnWiDg
PWZzoyz1Pt7n+JCTEgGD6hn4KPCi4J+SJP3WKnXUqqmohrV+54a68JwojP3tKSdXmKh/dV
yXPi5eWDksHO97sqy1rSZRGHlr8A9mzdJ5k16g4BZhD+zhgJ05jd/mndnIA/pcg4AXQ7DH
T6/WN5YgpPZJeAFyfgb293DpxX8S/MtTjdMZT2i4K+YN8/dmx/QJbIEFxHCiKQ==
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1718975155; a=rsa-sha256; cv=none;
b=nfhAa9qYol856WDq13L8dNAdRib9nirTyAuYwJEHn32JNxbKQWuNRr+XZoYAm228CQ2dPt
+UHhamzdjdds9Raa9gd5kLaHzNxEasMO3EU1xO/S6BQohYPj0v8zJvGsMDS/N/ARWKKd1o
sVw3mbqjoWvIEEaAj9hr1LaMFZyKkLx7zrsUlX9ljdYM5G/7R/1vwPtPqn9ehvXyXGuR7K
CHyU5CcgPj6UowtJlf0LDKTcWDeiKm8lUPVMoR8/6j9XX/dsxu0WJhecNlmLnbNlFHrAKP
L98hRYO0P1eBeg/6BNiYm6WKF+zReoxx/JzSGxskZS2g2JsAsalH7LbsD87rIQ==
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=1718975155;
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=oAIyJ5CbMFQD3nYHuHzTfKgWClCa0pvty0cPdXRDYY8=;
b=IUL7Mdc18hnaXKqpqFIyON0qE8Vb4PcBLzIlu6zmHTUS7kUm1IJrCwi1yqithm3baf7XdI
4UEF9FveOnS8lDPpyYeD0wsDF+f9bfo/p1LPp6GmEJtEXFJLuMBL6sn/IS5UIjBSFXkJpp
PL/+srlN/T+MpuwqJ0EyQVzK0GLCtqFHNNUEyGd3vkL5nwa0Y2MG27nrMKxUh6P5leYweU
jhQU5+v0XfcKQi7kLLyra4U5++tG9tlooKCNy6MdfMUFVy78ZeUXrlLDZAppeCGX2zthhu
kn4Y0dZXY/yIvmAOgJNWcpcLkhOj7o8tTm8vrDH53KrgnLDtQBfrGe/UOHO5yQ==
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 4W5HfW1nQsz18CK;
Fri, 21 Jun 2024 13:05: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 45LD5tSK011979;
Fri, 21 Jun 2024 13:05:55 GMT
(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 45LD5tas011976;
Fri, 21 Jun 2024 13:05:55 GMT
(envelope-from git)
Date: Fri, 21 Jun 2024 13:05:55 GMT
Message-Id: <202406211305.45LD5tas011976@gitrepo.freebsd.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
dev-commits-src-branches@FreeBSD.org
From: Mitchell Horne <mhorne@FreeBSD.org>
Subject: git: 1b8d4c8496cf - stable/14 - build.7: +freebsd to
description, link development
List-Id: Commits to the stable branches of the FreeBSD src repository <dev-commits-src-branches.freebsd.org>
List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches
List-Help: <mailto:dev-commits-src-branches+help@freebsd.org>
List-Post: <mailto:dev-commits-src-branches@freebsd.org>
List-Subscribe: <mailto:dev-commits-src-branches+subscribe@freebsd.org>
List-Unsubscribe: <mailto:dev-commits-src-branches+unsubscribe@freebsd.org>
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: 1b8d4c8496cf5d4665a4daeaac37d0d655bd8702
Auto-Submitted: auto-generated
The branch stable/14 has been updated by mhorne:
URL: https://cgit.FreeBSD.org/src/commit/?id=1b8d4c8496cf5d4665a4daeaac37d0d655bd8702
commit 1b8d4c8496cf5d4665a4daeaac37d0d655bd8702
Author: Alexander Ziaee <concussious@runbox.com>
AuthorDate: 2024-06-02 13:25:19 +0000
Commit: Mitchell Horne <mhorne@FreeBSD.org>
CommitDate: 2024-06-21 13:05:02 +0000
build.7: +freebsd to description, link development
Reviewed by: mhorne
MFC after: 3 days
Pull Request: https://github.com/freebsd/freebsd-src/pull/1273
(cherry picked from commit a8a2d5ef126f9ed866f2524a4fe012ba831add2f)
---
share/man/man7/build.7 | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/share/man/man7/build.7 b/share/man/man7/build.7
index 09e58d4ff013..916382f98b76 100644
--- a/share/man/man7/build.7
+++ b/share/man/man7/build.7
@@ -30,7 +30,9 @@
.Os
.Sh NAME
.Nm build
-.Nd General instructions on how to build the system
+.Nd general instructions on how to build the
+.Fx
+system
.Sh DESCRIPTION
The sources for the
.Fx
@@ -901,6 +903,7 @@ make TARGET_ARCH=armv6 DESTDIR=/clients/arm installworld installkernel
.Xr make.conf 5 ,
.Xr src.conf 5 ,
.Xr arch 7 ,
+.Xr development 7 ,
.Xr pkg 7 ,
.Xr ports 7 ,
.Xr release 7 ,
From nobody Fri Jun 21 13:05: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 4W5HfX42ppz5Nf7C;
Fri, 21 Jun 2024 13:05: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 4W5HfX3793z4jLQ;
Fri, 21 Jun 2024 13:05:56 +0000 (UTC)
(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
t=1718975156;
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=jxoDEMcJX+k6HGXZiY8MlDumcpDQTR0ZiRCsn6KnDB0=;
b=R6YbQtw3Bj4tQK6UlmQBeTqs1a31gEZlYshxwzidqqOM29nGG1+ulYopwM6K3BevfbCqFw
Sfwwm1pdOeoX2pcMU8BwZ8SRHC2EG4+Er5iAmNLHQmY7IWCPFpbCEPg3q6pX7Y+8Q9xice
6aL6KI7iCYlVFghg01RLzcy9TY1LG+G+AmRfaAUbpdaS85wzQ+VeeRN510PWoNyhNZD6YZ
zVl0NlYY8TpFJCCLG/N/rsuYpD6t4cYXFExF3IqHPYJj6kwvCLGWleg3Gn9phfm+TQfWOO
iWUteDikp1FZh8NCvmSPuqTTEfPi3rZGmbbkJacOSIegacBCt951tS9XjWPDpQ==
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1718975156; a=rsa-sha256; cv=none;
b=MmFEYcN9MGmCwa1dO68KkgreNNTgol8xZMKy6yjcw6tnxVFyAA6j12sR4kuc3F0Bvs8y7+
u564JICZs+vURHi54Tdoy97RIPL19P/wdgC90R95TwbjjeQUNio28tYSRqnO9Gb1qxbgVN
Ks/o6LiAx3RQZEyMiSqhNeLXaPJRGTsvWNxXlacbwH9WgoBo0fesYVBQA2VXJ1V7954Bxd
AnASohIL/lT0KacTqHXqO5FnoCxHtDTxnrZqKqzi2NLNTQ47BRcE9DY2LMmW/HTbDtZVPW
Vo0IaWDrVqqHDcG35bk6t7tJAEPTuqcyiyIV0pLzBFkt077oFukiV0dctBzFSQ==
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=1718975156;
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=jxoDEMcJX+k6HGXZiY8MlDumcpDQTR0ZiRCsn6KnDB0=;
b=BqkgpsUEfYjsOcSMpfN0nZRsxnAfDGGkipey308qfl3PRo7JwNT6/Ipahq79H6pIge1jPO
XTtsJdx6HhbdjjYtxbEdEU1YXbfQKVt2ZbTrzlTcGXcDM3ohmkKoLIfnsoml9y3gCj7w4j
kU4RKjDbmYEbl8afkQDL+rscuQWWarVWW2fAga1HmRBAN2i4uSDe5h5a7HoYDXYE2a43Tk
atwg0598z5MZ2a96y5jefYuPt3JbL1JgJ7HaQFywsYrtvLc1Lb+VXT6lczCguqEB1c1HXT
Gr3EJkn1I7CkLmcQ+9jTlJMQjBmp5tM6sNc7SESe+GN7fz8+waTdF66gBKv4AA==
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 4W5HfX2lRGz187f;
Fri, 21 Jun 2024 13:05: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 45LD5ulR012025;
Fri, 21 Jun 2024 13:05:56 GMT
(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 45LD5uFg012022;
Fri, 21 Jun 2024 13:05:56 GMT
(envelope-from git)
Date: Fri, 21 Jun 2024 13:05:56 GMT
Message-Id: <202406211305.45LD5uFg012022@gitrepo.freebsd.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
dev-commits-src-branches@FreeBSD.org
From: Mitchell Horne <mhorne@FreeBSD.org>
Subject: git: b8f2781b4623 - stable/14 - build.7: update cross-compile
example
List-Id: Commits to the stable branches of the FreeBSD src repository <dev-commits-src-branches.freebsd.org>
List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches
List-Help: <mailto:dev-commits-src-branches+help@freebsd.org>
List-Post: <mailto:dev-commits-src-branches@freebsd.org>
List-Subscribe: <mailto:dev-commits-src-branches+subscribe@freebsd.org>
List-Unsubscribe: <mailto:dev-commits-src-branches+unsubscribe@freebsd.org>
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: b8f2781b46237fe54f472537d72cfad84991aefb
Auto-Submitted: auto-generated
The branch stable/14 has been updated by mhorne:
URL: https://cgit.FreeBSD.org/src/commit/?id=b8f2781b46237fe54f472537d72cfad84991aefb
commit b8f2781b46237fe54f472537d72cfad84991aefb
Author: Mitchell Horne <mhorne@FreeBSD.org>
AuthorDate: 2024-06-04 18:22:54 +0000
Commit: Mitchell Horne <mhorne@FreeBSD.org>
CommitDate: 2024-06-21 13:05:02 +0000
build.7: update cross-compile example
Replace armv6 with the more-relevant arm64.
MFC after: 3 days
(cherry picked from commit afa166be99fc202027ab5b2030205b59d5104299)
---
share/man/man7/build.7 | 11 ++++++-----
1 file changed, 6 insertions(+), 5 deletions(-)
diff --git a/share/man/man7/build.7 b/share/man/man7/build.7
index 916382f98b76..79c05f5ab63a 100644
--- a/share/man/man7/build.7
+++ b/share/man/man7/build.7
@@ -25,7 +25,7 @@
.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
.\" SUCH DAMAGE.
.\"
-.Dd August 1, 2023
+.Dd June 4, 2024
.Dt BUILD 7
.Os
.Sh NAME
@@ -889,12 +889,13 @@ method of updating your system from the latest sources, please see the
section in
.Pa src/UPDATING .
.Pp
-The following sequence of commands can be used to cross-build the
-system for the armv6 architecture on an amd64 host:
+The following sequence of commands can be used to cross-build the system for
+the arm64 (aarch64) architecture on a different host architecture, such as
+amd64:
.Bd -literal -offset indent
cd /usr/src
-make TARGET_ARCH=armv6 buildworld buildkernel
-make TARGET_ARCH=armv6 DESTDIR=/clients/arm installworld installkernel
+make TARGET=arm64 buildworld buildkernel
+make TARGET=arm64 DESTDIR=/clients/arm64 installworld installkernel
.Ed
.Sh SEE ALSO
.Xr cc 1 ,
From nobody Sat Jun 22 01:26: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 4W5c4Z2pQcz5NjMc;
Sat, 22 Jun 2024 01:26: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 4W5c4Z2LMKz3xPJ;
Sat, 22 Jun 2024 01:26:06 +0000 (UTC)
(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
t=1719019566;
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=HeIWiTkYzyKNrPkeVVOlh2jQIjpCb7AzLXlZf/qIDic=;
b=hC4dlvpwjYornw/p8moz3TqSfc6/rHIJdMN4PookW8lEwPLgC0ngvchXS0LmYyivJ4v6dv
Ev2y8qetpjPNkQj48ITTXudVM8iHbwrnXtWd/gqU9KJjr/fKu5f8I7WYWe9mG8Ee3BqB3n
4BRebuQ54m70TTEaSJh6lywRf5rPUCJevAKp7wJLgSqHurkBuFJCeAtwiSB62wvo9K3ZPa
fZg3XRCTr1lklRfxejGSeHZDhgIb5A2Bk7ZqfmRmtoWnKO+AYfDUhYid46RAk16PAFvOgn
N8g2s82tSpGyyqrdiQu0E5/G2tcqB5NSXkd56v/sZiqg85VXgbKq357vr+B1BA==
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1719019566; a=rsa-sha256; cv=none;
b=fuaYoL0sc9dn/TwU2fKw4oZBrJKbfTa3JuhK1Ev8ZfaVELabHtAEMfGS8eOYInCgtsbHC7
R/n8mEvOY3XyE8EvzGWlB/sCMdbJcYoMyTkH6eMaJFW54gqQ9yZnZXgiTKveAkt3Xll7BO
v2QEwtvRm6PQgT4z1kY37Q2fF0x0Ux9vEIPrU84jEuKH4FS7FvnRAxQQmWrpUaIwIqKIHV
AdwyBgiK3/p69uY01vmV/y0G62UtEUu6NfKHPy5ZMSN24tculZZkk1wQgyhOPMAUBHcEXa
3CZl0f/0y3/JEaYoCnbXE2DIyK5MhmeN0ztZPKA9ptCirF4u7jTOq9Jq1zqd2Q==
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=1719019566;
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=HeIWiTkYzyKNrPkeVVOlh2jQIjpCb7AzLXlZf/qIDic=;
b=MVA/OgHKeGaCSAvePqDv7LMbbLWxUHf8gwt2f+laFOHpfLMRVcjy5lKy2RMlb+CFDRUjop
aZtpg6Il+aqTYb1bb0DTN+rZo3IG0u3iHgbO7VI1gOqpZcK6OiFcE8BVObKPxrp0U4PPUZ
q/KyD+DEwCRLQXCIo9GpTQohMY28w758MM7cgA67NhKDeFiIYg2Q7QYMjmnhtt+Y/Iy4Hj
o0jtdruycI3YYUg/YsdEA4BEQIcWAGgSPLgkofSeTaksVIXkmjGpoHQjCcdpcry46s7eNh
L03uKVybJZLGTkIQTDazB0P2amWXVbqWKUkrUE1SE1WInKIKnqU8u85zi6wUWA==
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 4W5c4Z1s7YzXV5;
Sat, 22 Jun 2024 01:26:06 +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 45M1Q6iQ063500;
Sat, 22 Jun 2024 01:26:06 GMT
(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 45M1Q67w063498;
Sat, 22 Jun 2024 01:26:06 GMT
(envelope-from git)
Date: Sat, 22 Jun 2024 01:26:06 GMT
Message-Id: <202406220126.45M1Q67w063498@gitrepo.freebsd.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
dev-commits-src-branches@FreeBSD.org
From: Rick Macklem <rmacklem@FreeBSD.org>
Subject: git: 85641d316a87 - stable/14 - nfsd: Delete an unused
VNET global variable
List-Id: Commits to the stable branches of the FreeBSD src repository <dev-commits-src-branches.freebsd.org>
List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches
List-Help: <mailto:dev-commits-src-branches+help@freebsd.org>
List-Post: <mailto:dev-commits-src-branches@freebsd.org>
List-Subscribe: <mailto:dev-commits-src-branches+subscribe@freebsd.org>
List-Unsubscribe: <mailto:dev-commits-src-branches+unsubscribe@freebsd.org>
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: rmacklem
X-Git-Repository: src
X-Git-Refname: refs/heads/stable/14
X-Git-Reftype: branch
X-Git-Commit: 85641d316a8764eced62ea9c4b5cbcdc6f9e08bd
Auto-Submitted: auto-generated
The branch stable/14 has been updated by rmacklem:
URL: https://cgit.FreeBSD.org/src/commit/?id=85641d316a8764eced62ea9c4b5cbcdc6f9e08bd
commit 85641d316a8764eced62ea9c4b5cbcdc6f9e08bd
Author: Rick Macklem <rmacklem@FreeBSD.org>
AuthorDate: 2024-06-08 23:40:52 +0000
Commit: Rick Macklem <rmacklem@FreeBSD.org>
CommitDate: 2024-06-22 01:24:36 +0000
nfsd: Delete an unused VNET global variable
During code inspection, I noticed that
NFSD_VNET_DEFINE(nfsrv_dontlisthead)
is unused, so delete it.
(cherry picked from commit 13a51233e4c7d6cff04043c38845b1ec1af38680)
---
sys/fs/nfsserver/nfs_nfsdsubs.c | 3 ---
1 file changed, 3 deletions(-)
diff --git a/sys/fs/nfsserver/nfs_nfsdsubs.c b/sys/fs/nfsserver/nfs_nfsdsubs.c
index 0d7e4c73fe69..d80826993f23 100644
--- a/sys/fs/nfsserver/nfs_nfsdsubs.c
+++ b/sys/fs/nfsserver/nfs_nfsdsubs.c
@@ -57,9 +57,6 @@ NFSD_VNET_DECLARE(int, nfs_rootfhset);
NFSD_VNET_DECLARE(uid_t, nfsrv_defaultuid);
NFSD_VNET_DECLARE(gid_t, nfsrv_defaultgid);
-NFSD_VNET_DEFINE(struct nfsdontlisthead, nfsrv_dontlisthead);
-
-
char nfs_v2pubfh[NFSX_V2FH];
struct nfsdontlisthead nfsrv_dontlisthead;
struct nfslayouthead nfsrv_recalllisthead;