From nobody Tue Jun 23 16:28:39 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4gl9Vc5LFPz6hhdC for ; Tue, 23 Jun 2026 16:28:40 +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 "YR1" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gl9Vc15kGz3NNb for ; Tue, 23 Jun 2026 16:28:40 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1782232120; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=3fmkLeUbhU92zZp2F+6M91TkiZcBG9uroNe7ADqoiwQ=; b=fUqDKafsAv3zbftCOZDGSeKWIcZ+v9LnqBqUMTL5A6mlsLJ9dQlUNPA7tAxHZ7mNOa18Vk 96dM4gNKrdNEQrO54rzGxcweBMFN3gVo4oDXnAEdJzZek+XCb4G1K8UDfC9evHC2JZoenG +xs/H6i0RFU+iElPQakTykkw1NrNu6W7+67rjcL+KfTz3e6E6nQtuuy3x3UBaB6s9y6uGA xxPUeIflRkl6QthOGZ2cFBbxPNEU4VN97ggI8QRKhi67Qp8uDCy+CyIyxenJQzwmphmNWO n82gnBWJ0VAHYuYGd1rnoeTirY+Mz4yXWh8+La67EH2o9J7Iu8nUFcQw8OGzuw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1782232120; a=rsa-sha256; cv=none; b=h61Io3BF+fju9mCCyTBv8u1c3MkKcZsrtF9A/H2+KSgZjSaFI3fgwfX1t5RwczaqYICVIo STSdnm/LLcCCu0fn1dsmTwz6naRQJJu2xWMa2bZVPh9UNfv5P9drXkUPR4BryYE3YUiq86 SOu55poMNELSIiIYHbiCkh7ggUkUY6bJ9QSZChcFFuWuAq9TOyX2NudDdiq+BMVa9GWimy Shz9SV3O2h1CSQI6tAkDCxsrjvmmcrflt7uYjptJKaFAytmg2X35NWgrEGZw4ByFKIyJOe lCMyNAycTKbsLgiiZaWWcc6ouWEOlbHef8OcxcZsUvM1XuCOgw8wlnNM/Xg/7A== 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=1782232120; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=3fmkLeUbhU92zZp2F+6M91TkiZcBG9uroNe7ADqoiwQ=; b=r9VDPrZteGLMjOFBaEQxdDRxcz0wHXH+nxOqdKAmtM22ByCIpJfoohXQLw//IieqirXbsT gn+KsIhLd29YcUUhPH9HS1K2w/JTiu/4ibOGKsFeyf3hvOmsO+5NlKPzcFhnLiBLzqh9Ht DDHCjk6YWva2yNBiQvadZekWlorzDM8Q+wtBrfDh47mdbO86w060LaJyPFW6hnblGN7gsF aT9NMXO/kvarV5w3MdQIX+eyh9J1/TIerp2sLhChAlQbdsQMgB+QZte9uAbRmSRpmoAg0U jJ1dP8K+Mvn1r08HZFANGC+5NOjkg+U1w5EbLnKtCY1r3HaC8t8ONIMQi6PLFA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gl9Vb71sKzhcM for ; Tue, 23 Jun 2026 16:28:39 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 26e24 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 23 Jun 2026 16:28:39 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: John Baldwin Subject: git: d0f6c4ba5a13 - stable/15 - ctld: Don't ignore pp/vp values of kernel ports with pp == 0 but vp != 0 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhb X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: d0f6c4ba5a132089021b6a0dabf3c129afaba4d5 Auto-Submitted: auto-generated Date: Tue, 23 Jun 2026 16:28:39 +0000 Message-Id: <6a3ab437.26e24.55621222@gitrepo.freebsd.org> The branch stable/15 has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=d0f6c4ba5a132089021b6a0dabf3c129afaba4d5 commit d0f6c4ba5a132089021b6a0dabf3c129afaba4d5 Author: John Baldwin AuthorDate: 2026-05-27 20:56:39 +0000 Commit: John Baldwin CommitDate: 2026-06-23 16:17:31 +0000 ctld: Don't ignore pp/vp values of kernel ports with pp == 0 but vp != 0 Fixes: c6f1e9b8a412 ("ctld: Simplify XML parsing memory management") Sponsored by: Chelsio Communications (cherry picked from commit 7a436d378951bedbdaa71d45bf236fb001323549) --- usr.sbin/ctld/kernel.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/usr.sbin/ctld/kernel.cc b/usr.sbin/ctld/kernel.cc index d1210079ca1a..111c98e5026a 100644 --- a/usr.sbin/ctld/kernel.cc +++ b/usr.sbin/ctld/kernel.cc @@ -549,7 +549,7 @@ conf_new_from_kernel(struct kports &kports) continue; std::string name = port.port_name; - if (port.pp != 0) { + if (port.pp != 0 || port.vp != 0) { name += "/" + std::to_string(port.pp); if (port.vp != 0) name += "/" + std::to_string(port.vp);