From nobody Mon Aug 18 10:07:59 2025 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 4c57gz2nPPz64w16; Mon, 18 Aug 2025 10:07: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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4c57gz1bmgz3fVh; Mon, 18 Aug 2025 10:07:59 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1755511679; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=f7sMCRUYebI4X3nw1coksat6ERHKe+gPsF8z584yhpY=; b=YM7oJexkukb2cbwtnX6s7+c47P4Oi1U8v6uBOGbz9ZOYkTMK7KeoY69wNbVrSUeqyA/N+N RB5dUUQz40PPcDENbe3CnMn8l5F1OSj5fD/0oxFt/n+5LEW5PXkgADGsnjosuavl0xXaQ7 V6gSGDOO9xn9pIUkbZZ5RGIT9EuYGkDfqp7vsqMf0Z8OmgN3Jg5LqjMJSsiNyFRdz2tLei XMmX8Lvwsd+iMDNCg+KYlYspaW+VMzHC8JadQzFGD94M4Ua7oimJL96qBbJwX9UHpOe91Z feb6Ql6PGlgothbuRzC6iAVLMZbyT/X+gxDoElcj2Vs4t9CQIb+9YWB0Y5j+Bg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1755511679; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=f7sMCRUYebI4X3nw1coksat6ERHKe+gPsF8z584yhpY=; b=doh3rCR9VEuXG/ZfecY8cKLeu8GHeMU7gMBHurdR88uSbzqESwGWMSfjChWkXJMGw9mOx3 /IsotXFVAL3t3bxMIq592JiySluZOSxjPt0kWNaROsr2ELkS7NLt5+hTEzF5p3amOSPnHd XlsDGuZOnuw9QgpynZh1BMrUMpX3ZVsO2FJo/ljKtx92CqwsGM6YjG1V2RLETd1caOuGcq JD3TCv1wGTnDnIPokTswZRy6rRNfIGHq1I0JuG96jPpPsW4FejjucblAiFIgcZjqUNx1iZ vg42zBJnWBoTGlAbWk2xGFrjhoif/rc8fKghVF7K6z4rfv7f3LnGtNm5FSvkXw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1755511679; a=rsa-sha256; cv=none; b=tW4ne3g25/1HU3eDuPxh08yGMgvFUS1O7eFIkoOdPdSZLAM3bcz81mvdABz2REcyQlRjZc IohEhbtw6qISfWOJfszkzS9pdH0aISVBd+K6onjEzLyGC1qo2vidjxx9CKwBTCaDm8p2Sg LTaCSCiZTd7s7/42k/btImuJP57XXai4KoQyPiTH63pIfPv3aYPD/pNlIKmZiQfKOcGfsz fIMeqA4C8OGPHGMKZSac6nTOeIOS/dHHNtPEfn4GIv4IZbFrdW4Pm4nJ3dJwOnk+H3/2+P A99DCnyGlEWaGtcGGqE1KP+p4ubK4kZRVz9DsbM6IMbqdaMRXDL9lSeINXEJkA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4c57gz1BQTzsHL; Mon, 18 Aug 2025 10:07:59 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 57IA7xO5056032; Mon, 18 Aug 2025 10:07:59 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 57IA7xmY056029; Mon, 18 Aug 2025 10:07:59 GMT (envelope-from git) Date: Mon, 18 Aug 2025 10:07:59 GMT Message-Id: <202508181007.57IA7xmY056029@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Kristof Provost Subject: git: da64f6e047b5 - main - pfctl: zero the number of added/deleted addresses 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 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/main X-Git-Reftype: branch X-Git-Commit: da64f6e047b5f6cd9b9e8450d19072cb0b6e44d0 Auto-Submitted: auto-generated The branch main has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=da64f6e047b5f6cd9b9e8450d19072cb0b6e44d0 commit da64f6e047b5f6cd9b9e8450d19072cb0b6e44d0 Author: Kristof Provost AuthorDate: 2025-08-18 06:49:38 +0000 Commit: Kristof Provost CommitDate: 2025-08-18 10:04:01 +0000 pfctl: zero the number of added/deleted addresses pfctl re-uses nadd between adding the table and adding the addresses, which lead to potential incorrect numbers if a table was created in addition to addresses being added. Sponsored by: Rubicon Communications, LLC ("Netgate") --- sbin/pfctl/pfctl_radix.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/sbin/pfctl/pfctl_radix.c b/sbin/pfctl/pfctl_radix.c index 0fe9ca8813bb..398c5e998330 100644 --- a/sbin/pfctl/pfctl_radix.c +++ b/sbin/pfctl/pfctl_radix.c @@ -122,6 +122,9 @@ pfr_add_addrs(struct pfr_table *tbl, struct pfr_addr *addr, int size, { int ret; + if (*nadd) + *nadd = 0; + ret = pfctl_table_add_addrs_h(pfh, tbl, addr, size, nadd, flags); if (ret) { errno = ret;