From nobody Fri Jun 26 15:18:26 2026 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 4gmzpC5VnPz6jf1S for ; Fri, 26 Jun 2026 15:18:27 +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 4gmzpC1RhYz3l68 for ; Fri, 26 Jun 2026 15:18:27 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1782487107; 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=AzGWqdo/Ha0sCCZcVLxQH5UMK2IN0Xk0NuKs4VLakjA=; b=GlYXEFBtU3uJCN7ppbdbKLf91VhibsvB8PqGyzbF7fMLSxbqJZSt/qPbStvwLusNcn1Cxc picJAQxsU+YkEndcGCR8ppN2r10CQh0uESVxdJ0MnGMKyX4H6eaauV0Z7ZUuZScoDx8R5g +H4oEQx+PHYrIldmj/cRVoj8MRbmg+zmKu/pWobsmlcuaCT4JyQjfUD5DhwnRJnOGW8cil Co22VsliJgjPMhyPoslFPVUDMXymO5xjd3yzIAkaVJkecRc4i618FswpwneRyQ7yyodomE 7x1Y+xhG17jXujdvCKvoEiSvasO97tCxmMNz+sNxiYX3Lpe+7bC/icytWOrjIQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1782487107; a=rsa-sha256; cv=none; b=gwwMZf8mgKES8Mi4A6Xj1IqP4QuRRXwLvt7afhR2CTI3PAHq7MVUAEwaU6HCBJyAPemf09 WrkR4MRKQOQHeZIr09RM+9RM+GfNGDSHFQbLxdJiLJexhPwOVYdijswGmB1SJuPPlgb9lj VQfr+jSPpGBO9zLKalMc0vK1MvFcqJufBQD8N8KXh3ja7zRd5buL4a0spvJb0wOYRe+2i3 Oj0aJuWLC98owc7PMq2uYkui+Y+U8wGzlQsdL5Sh1CpeNgK+4Gxsa6XAydxT2XfqrGBtRa 7dJtKkEd6OqwbOUA8yTc/qqviGuvifFZvZy69hNwxnGqN8GC76K2at69z5k1fA== 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=1782487107; 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=AzGWqdo/Ha0sCCZcVLxQH5UMK2IN0Xk0NuKs4VLakjA=; b=U1BH51d0rruYf3/uVrAVdHaC+4fomZ85CtYNUp9W3GqGrhwOByS8fQWlcr7no6WNUAtx9j jHY4C2Q8QzBBSznGTZvurANFok0IuxheS8GAlX/rLSsg/UkiWzBnTz2Njx/DuT4/9ghIWR 2sYW3S9bVwRru+oRp6lkTvyrAXsAfDfnwgiHIGHDYLOQpZVs7Bwe5NxWo9D9CeqwdFukny M57iSprxNQXMTWOlMVmBArFRKrPEbBiaWxJnb4Znx83x/5f845KeuflAPoKXR/JMY+43Vk EJRj/+ZVD4imYUtFnsCi6AJDhz4K07cwy3COXVqkgm/L2ZVYTpTxs+VdZPKAXA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gmzpB75Vxzjb5 for ; Fri, 26 Jun 2026 15:18:26 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 22815 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 26 Jun 2026 15:18:26 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Siva Mahadevan Subject: git: c8039d9ee01e - stable/15 - pf: free match rules after exiting critical section List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@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: siva X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: c8039d9ee01e6312b4373bcded89d12eadda5db7 Auto-Submitted: auto-generated Date: Fri, 26 Jun 2026 15:18:26 +0000 Message-Id: <6a3e9842.22815.3ccaf85@gitrepo.freebsd.org> The branch stable/15 has been updated by siva: URL: https://cgit.FreeBSD.org/src/commit/?id=c8039d9ee01e6312b4373bcded89d12eadda5db7 commit c8039d9ee01e6312b4373bcded89d12eadda5db7 Author: Siva Mahadevan AuthorDate: 2026-06-07 01:26:55 +0000 Commit: Siva Mahadevan CommitDate: 2026-06-26 15:16:43 +0000 pf: free match rules after exiting critical section This fixes a panic reported on armv7: sys/netpfil/pf/counters:match_block -> panic: free: called with spinlock or critical section held [...] vpanic() at vpanic pc = 0xc0321b5c lr = 0xc02f7b5c (free+0x140) sp = 0xc8c858bc fp = 0xc8c858e0 r4 = 0xe2fad648 r5 = 0xe402ce78 r6 = 0xc8c859e8 r7 = 0x0000001c r8 = 0xc8c858b4 r9 = 0xc0321b5c r10 = 0xc8c858bc free() at free+0x140 pc = 0xc02f7b5c lr = 0xe2f4f920 ($a+0x5f8) sp = 0xc8c858e8 fp = 0xc8c85930 r4 = 0xe402ce68 r5 = 0xc8c8599c r6 = 0xffffffff r10 = 0x0000001c [...] KDB: enter: panic Consequently, this fixes armv7 CI: https://ci.freebsd.org/job/FreeBSD-main-armv7-test/2287/consoleText Fixes: 6353f5d9a5c6f194bb014b8785a57f5314e8c652 Reviewed by: kp MFC after: 3 days (cherry picked from commit 432ac5c07c6b1fb960f2e7d8e8cfb1306ce351ff) --- sys/netpfil/pf/pf.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/sys/netpfil/pf/pf.c b/sys/netpfil/pf/pf.c index edd723abb3b6..d8010ef7c224 100644 --- a/sys/netpfil/pf/pf.c +++ b/sys/netpfil/pf/pf.c @@ -10852,10 +10852,6 @@ pf_counters_inc(int action, struct pf_pdesc *pd, struct pf_kstate *s, } } - if (s == NULL) { - pf_free_match_rules(mr); - } - if (a != NULL) { pf_rule_counters_inc(pd, a, dir_out, op_r_pass, af, src_host, dst_host); @@ -10867,6 +10863,10 @@ pf_counters_inc(int action, struct pf_pdesc *pd, struct pf_kstate *s, } pf_counter_u64_critical_exit(); + + if (s == NULL) { + pf_free_match_rules(mr); + } } static void