From nobody Mon Apr 21 21:15:45 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 4ZhJ7P58GHz5t3Tq; Mon, 21 Apr 2025 21:15:45 +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 4ZhJ7P2pqxz3KVV; Mon, 21 Apr 2025 21:15:45 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1745270145; 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=l9VoUNZb6YF1NUuhEnqMMd46PrrdlP/oyka2Um92ohA=; b=EeS1LtdDD/7DfFcwQgziXSPM089ecyvjCn1zY14Cg1ctlCz8JnYgVW7PAVF+15C4Xo6oMP y+56g8deHr7dF1gjfdoR8w8YR5XB9qd/A5LobOSzcPsXes6r76iPcw2HLRUPzk5l9r2Oqx Ya4swwu7NDPP6aCwquQNgEB5jo/zAgjskZYhiiSND20KGe19APN5zMTMLNHz9bmn+WPfhC pSSVfsbV+9q9++X8yceAKHR4bkMw9smcccHiIURS90mbCRslQyrslBLe9v/9yvJQg4q7Sa w5lkKT/dsSWAxZ1/66NmYMO5QVrr16J2lSskYxS4D/qDRFMayfDVFeb20cM6nA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1745270145; a=rsa-sha256; cv=none; b=O+fD848C/O1eYbOaYtJXMjG7DnbtGfBu8LRx3/GDwVbAdwEWGHZs7s+vUch/lG1fPoUDcF sp0haoqkcgMlEw1yxWpnZBgt1viR1iwDihmr2xi3Zc/pM9yY0b6OSCtFQvafUOoK3nGftG ivp+qMiH3n/pI0/J1t1HT6aUt1WjbWvKA1ViYLiyFl6W8HrPKbDcJgvLlhN1rhMcVg0OXB e2bInXI2d+vy2p9pBhdvoYFXSLfrx0or8Oi6gOyUssdMcLnTlNitdcqMWAxtJEiS2OM+mf Azwir9Dvf4Mgt28D7kzc0P+f3jxdwZO/V9ewctL5uEBA5hsjLWDfj+/ja+f9cg== 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=1745270145; 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=l9VoUNZb6YF1NUuhEnqMMd46PrrdlP/oyka2Um92ohA=; b=rwOU9YxLMHmUEvCbMf7nRmm/EySNdXaP+MVf04/Yn1xWG6GMQdTekBfTWUo3PAD9MxvaXL ml3sX4ABhkuyE427k/2K6yixfHUmvNrQ68AOBs9Gt5UDf4jIiVI8MGLk4RKuG5i7t0Obm5 sgmgMVLKZCmMbq/trKKPqCOs9vRhvQdKfzfwq5DG/j7Maw3VN3skcmqVNEa51A1d1doaj1 wHV9TzXm5vzi/W21tx8BbaW+PjSdoECRR5+hG9xWCf51iV+Duu288EUThOgs+FjwcTPPok 99XodhHxADZxV8BzPvv/9o7UqCKJzEk+PGr+VFUeEoycbQmLc5B6dGsx9Tczmg== 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 4ZhJ7P28y5z15YH; Mon, 21 Apr 2025 21:15:45 +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 53LLFjhc033371; Mon, 21 Apr 2025 21:15:45 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 53LLFjp1033368; Mon, 21 Apr 2025 21:15:45 GMT (envelope-from git) Date: Mon, 21 Apr 2025 21:15:45 GMT Message-Id: <202504212115.53LLFjp1033368@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: 7161339bb5e9 - stable/13 - pf: don't use state keys after pf_state_insert() 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: 7161339bb5e9feda4e63c5903314fc17ea1e5319 Auto-Submitted: auto-generated The branch stable/13 has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=7161339bb5e9feda4e63c5903314fc17ea1e5319 commit 7161339bb5e9feda4e63c5903314fc17ea1e5319 Author: Kristof Provost AuthorDate: 2025-03-27 14:35:40 +0000 Commit: Kristof Provost CommitDate: 2025-04-21 21:14:16 +0000 pf: don't use state keys after pf_state_insert() pf_state_insert() may free the state keys, it's not safe to access these pointers after the call. Introduce osrc/odst (similar to osport/odport) to store the original source and destination addresses. This allows us to undo NAT transformations without having to access the state keys. Reviewed by: glebius, markj MFC after: 3 weeks Sponsored by: Rubicon Communications, LLC ("Netgate") Differential Revision: https://reviews.freebsd.org/D49551 (cherry picked from commit bdea9cbcf2decafeb4da5a0280313efccc09e1b3) --- sys/net/pfvar.h | 6 ++++-- sys/netpfil/pf/pf.c | 12 ++++++++---- 2 files changed, 12 insertions(+), 6 deletions(-) diff --git a/sys/net/pfvar.h b/sys/net/pfvar.h index 66bdbf43e212..e2db4f8f5c3a 100644 --- a/sys/net/pfvar.h +++ b/sys/net/pfvar.h @@ -1307,8 +1307,10 @@ struct pf_pdesc { struct pf_krule *nat_rule; /* nat/rdr rule applied to packet */ struct pf_addr *src; /* src address */ struct pf_addr *dst; /* dst address */ - u_int16_t *sport; - u_int16_t *dport; + struct pf_addr osrc; + struct pf_addr odst; + u_int16_t *sport; + u_int16_t *dport; 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 363e678cbe24..8306b400b1d9 100644 --- a/sys/netpfil/pf/pf.c +++ b/sys/netpfil/pf/pf.c @@ -3397,8 +3397,8 @@ pf_return(struct pf_krule *r, struct pf_krule *nr, struct pf_pdesc *pd, /* undo NAT changes, if they have taken place */ if (nr != NULL) { - PF_ACPY(saddr, &sk->addr[pd->sidx], af); - PF_ACPY(daddr, &sk->addr[pd->didx], af); + PF_ACPY(saddr, &pd->osrc, pd->af); + PF_ACPY(daddr, &pd->odst, pd->af); if (pd->sport) *pd->sport = sk->port[pd->sidx]; if (pd->dport) @@ -4697,8 +4697,8 @@ pf_create_state(struct pf_krule *r, struct pf_krule *nr, struct pf_krule *a, 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, &skt->addr[pd->sidx], pd->af); - PF_ACPY(pd->dst, &skt->addr[pd->didx], pd->af); + 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]; if (pd->dport) @@ -7499,6 +7499,8 @@ pf_test(int dir, int pflags, struct ifnet *ifp, struct mbuf **m0, struct inpcb * pd.src = (struct pf_addr *)&h->ip_src; pd.dst = (struct pf_addr *)&h->ip_dst; + PF_ACPY(&pd.osrc, pd.src, pd.af); + PF_ACPY(&pd.odst, pd.dst, pd.af); pd.sport = pd.dport = NULL; pd.ip_sum = &h->ip_sum; pd.proto_sum = NULL; @@ -7974,6 +7976,8 @@ pf_test6(int dir, int pflags, struct ifnet *ifp, struct mbuf **m0, struct inpcb pd.src = (struct pf_addr *)&h->ip6_src; pd.dst = (struct pf_addr *)&h->ip6_dst; + PF_ACPY(&pd.osrc, pd.src, pd.af); + PF_ACPY(&pd.odst, pd.dst, pd.af); pd.sport = pd.dport = NULL; pd.ip_sum = NULL; pd.proto_sum = NULL;