From nobody Fri Jun 6 21:22:57 2025 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 4bDZ6V2FMyz5y2FV; Fri, 06 Jun 2025 21:22:58 +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 4bDZ6V1MRDz3nyN; Fri, 06 Jun 2025 21:22:58 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1749244978; 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=O2rCdXyjLaAESMDFOcuVmh/db2FMBdOhgyrOxaSTIpU=; b=bOB5jEn8mACvjaiqLdEAkMHVH4IEaDVaWbD/FarrDtFUQrp5ufts8lBKddavRT5yfWbDhh qlag9Dpi1GWBD9Pavy4Rv/qo8XKXuTd8giIe1gxfmLybgh/TgOIhCxTl9cEyMotp8Q2c/Z SoWON9oHkNdB6ilFjUlB9JHJ7BrGymFFg5zttMHOEvBEUWisoE1No9RW/IFDg8eMTYFPAJ XNECmZZ8GYEUFinKXdsSIy6s8DGdm70rWuFPTS2xva2tKMaxwUbjuYPkv8N/jxHwvmWL9q rWyCb8T+pW+3MyIOqDQEPAKjah7IDc/c0zH0X2F3C3Eb+uncht0Ktnwgv8KUdw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1749244978; 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=O2rCdXyjLaAESMDFOcuVmh/db2FMBdOhgyrOxaSTIpU=; b=QkDqNKrgkGoaoeg29SLjD1Z2euXPLGLPbHsErlL/wfLQ08kQGopGkybnhicoEKVIvitcmW WZDZ6XgIX8BYTk9+2lYp8Ky601v9I/Nc+EX1xT3HGDQgTFuDRTRVjJWkPQzCDR3VxlntXs 85ksB3Z4xy9HAsI8a9Y+FmJtKf+e/11Lj4YcFMh3ufmZIKqoYqUlK86gC0fiG51ipVTTGi 5QKzIYgM6eQAG9Q74GqF/Ij+WHiXNObh1pV0YBr76nFgt2TWAZfX7Q+oqx3UkYuPyTCP+c tOfSkAikNU1ng3FxkokOjXI1M82nt9hhnwVO4CsmA/GQiAjMjJsdDpszEBoRCA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1749244978; a=rsa-sha256; cv=none; b=atSbG6vKxT74ihT6PuK9qonYRJUVjGQtaeqe57YKG60SFCOqXD409ylqvVs0uh3yCeRRlf IISlp+el+/0mA4MkgdfphQtVzJWad5RKZlvo7OmwGQ9sTrXWojpXRFaTP0oyZLmyNkDzNb hMCManVH+C+hu3VB1bpwe67IzZR6B+7qQdkyOpY+TDDokonJBWVOAuFTIRD7PNPead8l72 GioPSESluhP26hDTMfLly5m1DOhMgTbzplXfAjAHPRsmYggM4oi0KoeAf7PU1PWOIh1JyI 8HheSR6fQH5SuSU2bqVzw7z1+vt2SCM0eRk63L4nFkdNCzGb8VCmhoTaXwDtBA== 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 4bDZ6V0kjrz19tH; Fri, 06 Jun 2025 21:22:58 +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 556LMw6J029396; Fri, 6 Jun 2025 21:22:58 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 556LMvvV029393; Fri, 6 Jun 2025 21:22:57 GMT (envelope-from git) Date: Fri, 6 Jun 2025 21:22:57 GMT Message-Id: <202506062122.556LMvvV029393@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Kristof Provost Subject: git: 06664c3b0ec2 - stable/13 - pf: fix panic in pf_return() 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 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/stable/13 X-Git-Reftype: branch X-Git-Commit: 06664c3b0ec2f446466f0d7e53addad0d7c2dd64 Auto-Submitted: auto-generated The branch stable/13 has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=06664c3b0ec2f446466f0d7e53addad0d7c2dd64 commit 06664c3b0ec2f446466f0d7e53addad0d7c2dd64 Author: Kristof Provost AuthorDate: 2025-06-06 21:20:16 +0000 Commit: Kristof Provost CommitDate: 2025-06-06 21:20:16 +0000 pf: fix panic in pf_return() We (correctly) NULL out sk and nk before calling pf_return(), but that function still tried to use them to undo NAT transformations. Store the old port numbers and use those rather than sk/nk. This is a partial import of e11dacbf8484adc7bbb61b20fee3ab8385745925 (osport/odport), and the missing parts of bdea9cbcf2decafeb4da5a0280313efccc09e1b3. Direct commit to stable/14. PR: 287254 (cherry picked from commit 6f6ca5288060110c7385b9424e4729b192ed6308) --- sys/net/pfvar.h | 6 ++++-- sys/netpfil/pf/pf.c | 31 ++++++++++++++++--------------- 2 files changed, 20 insertions(+), 17 deletions(-) diff --git a/sys/net/pfvar.h b/sys/net/pfvar.h index e2db4f8f5c3a..9661471daf5b 100644 --- a/sys/net/pfvar.h +++ b/sys/net/pfvar.h @@ -1309,8 +1309,10 @@ struct pf_pdesc { struct pf_addr *dst; /* dst address */ struct pf_addr osrc; struct pf_addr odst; - u_int16_t *sport; - u_int16_t *dport; + u_int16_t *sport; + u_int16_t *dport; + u_int16_t osport; + u_int16_t odport; struct pf_mtag *pf_mtag; struct pf_rule_actions act; diff --git a/sys/netpfil/pf/pf.c b/sys/netpfil/pf/pf.c index 1cf8d9b8e920..298793e6228e 100644 --- a/sys/netpfil/pf/pf.c +++ b/sys/netpfil/pf/pf.c @@ -304,7 +304,7 @@ static int pf_create_state(struct pf_krule *, struct pf_krule *, struct pf_krule *, struct pf_pdesc *, struct pf_ksrc_node *, struct pf_state_key *, struct pf_state_key *, struct mbuf *, int, - u_int16_t, u_int16_t, int *, struct pfi_kkif *, + int *, struct pfi_kkif *, struct pf_kstate **, int, u_int16_t, u_int16_t, int); static int pf_test_fragment(struct pf_krule **, int, @@ -3388,7 +3388,7 @@ pf_send_tcp(const struct pf_krule *r, sa_family_t af, static void pf_return(struct pf_krule *r, struct pf_krule *nr, struct pf_pdesc *pd, - struct pf_state_key *sk, int off, struct mbuf *m, struct tcphdr *th, + int off, struct mbuf *m, struct tcphdr *th, struct pfi_kkif *kif, u_int16_t bproto_sum, u_int16_t bip_sum, int hdrlen, u_short *reason) { @@ -3401,9 +3401,9 @@ pf_return(struct pf_krule *r, struct pf_krule *nr, struct pf_pdesc *pd, PF_ACPY(saddr, &pd->osrc, pd->af); PF_ACPY(daddr, &pd->odst, pd->af); if (pd->sport) - *pd->sport = sk->port[pd->sidx]; + *pd->sport = pd->osport; if (pd->dport) - *pd->dport = sk->port[pd->didx]; + *pd->dport = pd->odport; if (pd->proto_sum) *pd->proto_sum = bproto_sum; if (pd->ip_sum) @@ -4189,6 +4189,9 @@ pf_test_rule(struct pf_krule **rm, struct pf_kstate **sm, int direction, break; } + pd->osport = sport; + pd->odport = dport; + r = TAILQ_FIRST(pf_main_ruleset.rules[PF_RULESET_FILTER].active.ptr); /* check packet for BINAT/NAT/RDR */ @@ -4454,7 +4457,7 @@ pf_test_rule(struct pf_krule **rm, struct pf_kstate **sm, int direction, ((r->rule_flag & PFRULE_RETURNRST) || (r->rule_flag & PFRULE_RETURNICMP) || (r->rule_flag & PFRULE_RETURN))) { - pf_return(r, nr, pd, sk, off, m, th, kif, bproto_sum, + pf_return(r, nr, pd, off, m, th, kif, bproto_sum, bip_sum, hdrlen, &reason); } @@ -4472,13 +4475,13 @@ pf_test_rule(struct pf_krule **rm, struct pf_kstate **sm, int direction, (pd->flags & PFDESC_TCP_NORM))) { int action; action = pf_create_state(r, nr, a, pd, nsn, nk, sk, m, off, - sport, dport, &rewrite, kif, sm, tag, bproto_sum, bip_sum, + &rewrite, kif, sm, tag, bproto_sum, bip_sum, hdrlen); sk = nk = NULL; if (action != PF_PASS) { if (action == PF_DROP && (r->rule_flag & PFRULE_RETURN)) - pf_return(r, nr, pd, sk, off, m, th, kif, + pf_return(r, nr, pd, off, m, th, kif, bproto_sum, bip_sum, hdrlen, &reason); return (action); } @@ -4518,8 +4521,8 @@ cleanup: static int pf_create_state(struct pf_krule *r, struct pf_krule *nr, struct pf_krule *a, struct pf_pdesc *pd, struct pf_ksrc_node *nsn, struct pf_state_key *nk, - struct pf_state_key *sk, struct mbuf *m, int off, u_int16_t sport, - u_int16_t dport, int *rewrite, struct pfi_kkif *kif, struct pf_kstate **sm, + struct pf_state_key *sk, struct mbuf *m, int off, + int *rewrite, struct pfi_kkif *kif, struct pf_kstate **sm, int tag, u_int16_t bproto_sum, u_int16_t bip_sum, int hdrlen) { struct pf_kstate *s = NULL; @@ -4673,7 +4676,8 @@ pf_create_state(struct pf_krule *r, struct pf_krule *nr, struct pf_krule *a, if (nr == NULL) { KASSERT((sk == NULL && nk == NULL), ("%s: nr %p sk %p, nk %p", __func__, nr, sk, nk)); - sk = pf_state_key_setup(pd, m, off, pd->src, pd->dst, sport, dport); + sk = pf_state_key_setup(pd, m, off, pd->src, pd->dst, + pd->osport, pd->odport); if (sk == NULL) goto csfailed; nk = sk; @@ -4698,15 +4702,12 @@ pf_create_state(struct pf_krule *r, struct pf_krule *nr, struct pf_krule *a, pf_set_protostate(s, PF_PEER_SRC, PF_TCPS_PROXY_SRC); /* undo NAT changes, if they have taken place */ if (nr != NULL) { - struct pf_state_key *skt = s->key[PF_SK_WIRE]; - if (pd->dir == PF_OUT) - skt = s->key[PF_SK_STACK]; PF_ACPY(pd->src, &pd->osrc, pd->af); PF_ACPY(pd->dst, &pd->odst, pd->af); if (pd->sport) - *pd->sport = skt->port[pd->sidx]; + *pd->sport = pd->osport; if (pd->dport) - *pd->dport = skt->port[pd->didx]; + *pd->dport = pd->odport; if (pd->proto_sum) *pd->proto_sum = bproto_sum; if (pd->ip_sum)