From nobody Sun Oct 11 14:47:36 2026 X-Original-To: dev-commits-src-main@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 4j2k3D2y9wz6vxN9 for ; Sun, 11 Oct 2026 14:47: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 "YR2" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4j2k3D212Qz3D1G for ; Sun, 11 Oct 2026 14:47:36 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1791730056; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=2pQes+4M5q6VTLJYb0eYlCTTuz3/cZlG7kb0A9nXsiM=; b=p8ROI4O2Dsj4T+/JTh1Qw2Q9/OhWAUvjpvYd1D1HR770UNmzjJbWUu1PmPDRWL/NW8jA5v R0pm+MSnvsuURkIQWGx0pCN/P+WHzcIOzl9EV0XEebK5tmpsXtGXRwAFLiXUvRA7NDgkuI lzp82iUEVuyIaiousK9xeMg+B+f4tuLx6cch16WlpsG6Ie2FRejHlExax4ji8/BhkrDuMv 4OqaxE06DwFBSjrdtsHIZ+MrCK+3EXaliCIHYPWWUrKpm0j3mEJnzdK3O0cOa1XvP86qR9 D2WRuMytTCslx9fLF/Oxm3NXXHZX2PfiTVk3pgSeVf/ti8i1q04E4a3E14qW+Q== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1791730056; b=ocO7cwDjT/jpM+fORoD/nK/CEnZAEYXDZJNdCb3LOAy+tlTsaMwSOwDnDPTmNx1FSZcYQd abxwmsJU2AIMWnsT4wgpZ7gx/YtQ+W8lts7L9R0yp8lyyHh9A7il79egysz5n5Zedqc7wl GMgZKVTwlQYiM+GmBBz36oM8cK9V2QjIf4uEg6Cm457Sz4YRqLjg4PEYapBNZt7t3Q25ay 1GRghBmBCzsQBNV5eM28YR/81YBEWKz6bkQbixfkEXbsPWlHDjsqVJvIPugNLvf02zda2N p8MROJCQxaknym1Rmk6EASWAIwXHY2WC2dUNfg8e7uE57mcCAUwkZZsWNOrEwg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1791730056; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=2pQes+4M5q6VTLJYb0eYlCTTuz3/cZlG7kb0A9nXsiM=; b=by1klcl0PIaH1LvAWGm/qCjJqUfwRSgsIDY1kIdXQ+cythkwb4gV1vRlgB+rYTpWMOBaOz +zXJ+FGnA45QMTHo/Cp+rQK3Gidt57Qi6da0IQIsTyipROtDqP9deXApW716BbwBBth/eA EBGwp9IA9SdNGODVDiSLxHy8Bg/3crwrYC+m6W+95B69WevF/DvTP4Ns+acILdMGjiKddR gFl8RHVfzngdfzT/CeuKUDe4ITWejYPHKPIAqpFHS+dHo96OorEm/zL1C+4kaoRkpVzQpg F3sO3siKicuUTwnobhfPS8BMK+0kHWcWtogk5trG0RhAfKfVfQd/gCgLhbl+Lg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4j2k3D0xRlzmYc for ; Sun, 11 Oct 2026 14:47:36 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3b2f5 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 11 Oct 2026 14:47:36 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: R. Christian McDonald Subject: git: 5fc8fe3df5b9 - main - libpfctl: Fix the counts returned by pfctl_ina_define() List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org List-Id: Commit messages for the main branch of the src repository List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: rcm X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 5fc8fe3df5b9ede9e1cc1e35a0d10e6390b030d9 Auto-Submitted: auto-generated Date: Sun, 11 Oct 2026 14:47:36 +0000 Message-Id: <6acba188.3b2f5.49fff3a2@gitrepo.freebsd.org> The branch main has been updated by rcm: URL: https://cgit.FreeBSD.org/src/commit/?id=5fc8fe3df5b9ede9e1cc1e35a0d10e6390b030d9 commit 5fc8fe3df5b9ede9e1cc1e35a0d10e6390b030d9 Author: R. Christian McDonald AuthorDate: 2026-10-11 14:46:41 +0000 Commit: R. Christian McDonald CommitDate: 2026-10-11 14:47:10 +0000 libpfctl: Fix the counts returned by pfctl_ina_define() The counts of a table definition were stored only if the caller's variables already held a non-zero value, and read uninitialised ones otherwise. pfctl_ina_define() passes the address of two uninitialised locals and sums them up. Reviewed by: kp Fixes: 219ce3063840 ("pf: convert DIOCRINADEFINE to netlink") Sponsored by: Rubicon Communications, LLC ("Netgate") Differential Revision: https://reviews.freebsd.org/D60614 --- lib/libpfctl/libpfctl.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/libpfctl/libpfctl.c b/lib/libpfctl/libpfctl.c index 097c4743da2c..16a6ce8c7702 100644 --- a/lib/libpfctl/libpfctl.c +++ b/lib/libpfctl/libpfctl.c @@ -4079,9 +4079,9 @@ _pfctl_ina_define(struct pfctl_handle *h, struct pfr_table *tbl, continue; } - if (*nadd) + if (nadd) *nadd = attrs.nadd; - if (*naddr) + if (naddr) *naddr = attrs.naddr; out: