From nobody Wed Jun 10 22:03:50 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 4gbKYL5gkwz6hJlZ for ; Wed, 10 Jun 2026 22:03:50 +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 "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gbKYL4s0Jz3VDp for ; Wed, 10 Jun 2026 22:03:50 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1781129030; 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=M9bKVSSorZDNkyniNXue5j5UxgRWg0yYIGr/X02IZR8=; b=chsgQRGi5C6H0UEnxmKyO/299d555NSser0LmpklbtT9lkXvfFZpKQLgTcSTtpQl8esD9p JSc7NhMtgMQuET5nIaqU+6MqeqHbD1susojX0NjXbH80mEb2eGFkQpOo3q6LWgIX7d4LJJ BUmdHSUk+M+ZlpOPaTDq6qgQ49lvVHQumxCzRw9r8apNxTT1DFTjBVA+p4mH2diR1m5Usu JWbIjhrhhlKFctj2Rcfq/gVLHgFNM39mzf7hnxwwznzAkFHKpZnYbm1nKTBFld/QODetRb wENHh1h3E95HWcLKKaTsxav5WI/N8O52dAT3GzTq9a6s8FuD51DjazqpRvvuXQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1781129030; a=rsa-sha256; cv=none; b=ufzDv88ZFViEmA7DfnhkBuXdhGQenVL4unrwPe+2FDi30baZ8Q+iuz0bFH5Z9HLEdHlLOI U0HRXQyYhXO3tvbHkRvkax5QvDuckbEuNHeMFT2Gms6S2BaD6uSimlvg7vKeiTCF6fnZy+ tAiuaKYVO+Nnz46pXfu2NYN92j6XcSQZsscaNh6e3sXLcn2J3RqOUImnZPsbsJXTVOfE3b Mm6UMydrH5UkD/76rL7Yq7K9CVbMVhOwBNrMe1+MEmOAcSZqvL1ha5YoKlRswnyItEG9EY Oq6ZpxL3VPeHg8ZF+qUTtSH92z4UPER0xS8FAS8H626gkWt8PNCk4/iRVgKbTg== 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=1781129030; 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=M9bKVSSorZDNkyniNXue5j5UxgRWg0yYIGr/X02IZR8=; b=TcEWLOjf5fjGM36SE9gQCKnvGBZZF5AOlOTsPADzlJ9+XYsqlZdCb1AfBWlpktoI4i2js8 JFbdD3zU24ATDiVXrf1N+2qesLCC4cYcroLeWP2zEcgB0jwaoDn3+hR0jbcQuVOv4iHSnc Sc7S7WkS5dkNtgBzcTq/4bJbeF6qaHcSAv+a9fU+CJucbFo6LFpWl2UMvHz3EEVnz7BNYs UZ8BigGl03Ggg5YdwF/XTxDvZDwQ+/0iRA895aUQCUk2IlsZ6ktqMTYp87xTQm118+yOFT FYreL2tLIdbVkl0fItQ5CeArhYZ0vylQWwjPDFm7jzjqJZT+jwmo+wa08K9fdA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gbKYL4QRtz7FQ for ; Wed, 10 Jun 2026 22:03:50 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 33006 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 10 Jun 2026 22:03:50 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Siva Mahadevan Subject: git: 432ac5c07c6b - main - pf: free match rules after exiting critical section List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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/main X-Git-Reftype: branch X-Git-Commit: 432ac5c07c6b1fb960f2e7d8e8cfb1306ce351ff Auto-Submitted: auto-generated Date: Wed, 10 Jun 2026 22:03:50 +0000 Message-Id: <6a29df46.33006.32d4c5dd@gitrepo.freebsd.org> The branch main has been updated by siva: URL: https://cgit.FreeBSD.org/src/commit/?id=432ac5c07c6b1fb960f2e7d8e8cfb1306ce351ff commit 432ac5c07c6b1fb960f2e7d8e8cfb1306ce351ff Author: Siva Mahadevan AuthorDate: 2026-06-07 01:26:55 +0000 Commit: Siva Mahadevan CommitDate: 2026-06-10 21:50:27 +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 --- 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 98b5657f7285..c7d5e923d50b 100644 --- a/sys/netpfil/pf/pf.c +++ b/sys/netpfil/pf/pf.c @@ -11544,10 +11544,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); @@ -11559,6 +11555,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