From nobody Wed Feb 12 19:39:11 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 4YtTCP29y3z5nGjB; Wed, 12 Feb 2025 19:39:13 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4YtTCM2sYnz3Xqd; Wed, 12 Feb 2025 19:39:11 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1739389151; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=lSpGts7ktbLVUL30HsdTvH+QRIdevKJMW6l/nrfbBYg=; b=NOcQiyew4R2mccl+h+gFWEioF0VJDQU7sYfGlYNXy9hhRaecRn8OKx6qttRMd3Gff/aL9Z ekwUAFtNXhla42R1shRo+tNUC6F8pATgeL5TreGhmV98h4S8zdZLFTEwBsz0+1UGmVhTOC GkXSADrPKmWfffvoigoFhGPw3Kyl0++IgbSZm3qnP4Hv/vbXG/QSyk31xfw2/qs3+go36F GsQe1NFrT3GwXqT419zIjVnDNrN1gMCWKJfNXx588oAdwPvkWnrIelt8X3D239mpiDUR/c KASNee9ncQW5ZnFCJydARbGUq/jSzSto6JSKyB/3kTMtnSggOZ55OyxngoGN2Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1739389151; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=lSpGts7ktbLVUL30HsdTvH+QRIdevKJMW6l/nrfbBYg=; b=YerDCHrvQ6h16COdfpo+SwfdZLCGJMhTlfVX1WraVaF9uoOL85V0Jwf1hUrye6KMAA9Bah Y9ehMSzwq1a1oHdRGOqE0KBUzaKiXmTryWvoWsabzHQmSNBjor9H4/FzMqa2AzS9DGf19z un8hljGrRvPPrXeuktJkB779+b5/qDDv23Is2/eZpMc0pntiOJgKVkhjqjoz0wVCSx7tow 4j9gywKWW0oaJUj8YxtF1oRF2FHIv8lBcjxrgrbTbEhwssQDz99qL7wTwT6MLYOVW5iTHc 6lY62kA1fiI+T96LwkK906uzoPfcm1Q3mQ4ZL9hwjywJIJY00shDZiEmBIcRhQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1739389151; a=rsa-sha256; cv=none; b=sFEnzXcdRk6cmKzIs1SaDA4Va9XyNLLK56CzVvvy6qX3JbA/oGuD3aegb0LHb6WhPa1kgB Bh804QgDXJ+epgIEOHSYZSXzaU5qA+oV+NivpGErMmAUVg3xezSWDeEsUwkMjXTB/7b/50 MmLXjd0by+Q6zDOrqD7fVq5HrjGWhol4ru34Z4IaODgB16+PmLrQ3U9rsbJ8bqNIaSKfwH b4BBGGxhNIEDSywhwqWCGlGQYniMXPJAk5DoOmSUP7qUXFXcuoTvmh0tDDIrK2vqKdy0Ny nhXxFPm5I37TL5dZfEg9Gb37jIg3bpHaiq8vS+DL4SeuvfqSK01VthrIBTHH2w== 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 4YtTCM2HMtz1BWq; Wed, 12 Feb 2025 19:39:11 +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 51CJdBbU061778; Wed, 12 Feb 2025 19:39:11 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 51CJdBGu061775; Wed, 12 Feb 2025 19:39:11 GMT (envelope-from git) Date: Wed, 12 Feb 2025 19:39:11 GMT Message-Id: <202502121939.51CJdBGu061775@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: 7ed8e4be2366 - main - pf: rudimentary counter fix for tables used in match rules 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: 7ed8e4be23664cb8b112a405114c9e4958d78fca Auto-Submitted: auto-generated The branch main has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=7ed8e4be23664cb8b112a405114c9e4958d78fca commit 7ed8e4be23664cb8b112a405114c9e4958d78fca Author: Kristof Provost AuthorDate: 2025-02-06 18:26:11 +0000 Commit: Kristof Provost CommitDate: 2025-02-12 19:38:39 +0000 pf: rudimentary counter fix for tables used in match rules Fixes an issue seen by reyk@ ok henning@ reyk@ Obtained from: OpenBSD, blambert , 96fa270faa Sponsored by: Rubicon Communications, LLC ("Netgate") --- sys/netpfil/pf/pf.c | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/sys/netpfil/pf/pf.c b/sys/netpfil/pf/pf.c index 6fdc0996324b..5c99cde4a9f4 100644 --- a/sys/netpfil/pf/pf.c +++ b/sys/netpfil/pf/pf.c @@ -10033,6 +10033,21 @@ pf_counters_inc(int action, struct pf_pdesc *pd, SLIST_FOREACH(ri, &s->match_rules, entry) { pf_counter_u64_add_protected(&ri->r->packets[dirndx], 1); pf_counter_u64_add_protected(&ri->r->bytes[dirndx], pd->tot_len); + + if (ri->r->src.addr.type == PF_ADDR_TABLE) + pfr_update_stats(ri->r->src.addr.p.tbl, + (s == NULL) ? pd->src : + &s->key[(s->direction == PF_IN)]-> + addr[(s->direction == PF_OUT)], + pd->af, pd->tot_len, dir == PF_OUT, + r->action == PF_PASS, ri->r->src.neg); + if (ri->r->dst.addr.type == PF_ADDR_TABLE) + pfr_update_stats(ri->r->dst.addr.p.tbl, + (s == NULL) ? pd->dst : + &s->key[(s->direction == PF_IN)]-> + addr[(s->direction == PF_IN)], + pd->af, pd->tot_len, dir == PF_OUT, + r->action == PF_PASS, ri->r->dst.neg); } }