From nobody Mon Apr 21 21:15:44 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 4ZhJ7N5g09z5t3Tp; Mon, 21 Apr 2025 21:15:44 +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 4ZhJ7N3MZ4z3KS1; Mon, 21 Apr 2025 21:15:44 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1745270144; 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=apoen5/mhl7tUX9Rl+b4KGRIZqqa2cDm+iifBMik418=; b=xMZ6kI3ShBEh6tgiChObK08zHki/tE1zvtkBPsarRwTbjV5y8nVilYhTArDk9Qfl+mlGXj Q0LYf38x9Str3qSgSidiKyKlmnHubpRp/t8oM3uVuZIVNd4Hbea5G6W+hstg2Z6zKG5m4D KVTkS+emIQ+GizsQ2tFtUswbkpSXfRIu5I7hVLC+LsPQXGCn+9zPZ+YeB9u1UByLqYa6xx 4iNOIxa/LGY2i12q6QeglDY9fYZzSN/hyfeUtbQUCB//3F1CexwEOW0ksCHdSjuW1MkWUL tiDnITjhMtmufJoBgqSlgjbVX3foL8D7DwmjT4NvbXeR6ITSc3tv+vQMKqfuZg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1745270144; a=rsa-sha256; cv=none; b=HZ2zG/LOnI5AfooRo+kv2ESssNni604p2fIyET0wkgeqZfs/Bq3nOMapzftJy/+HWyBTlw riq4YRnLl31iIJ/95sIuY7XL35E2KdVQ/5zJE89aaNa3sJWeJEiGtdpMfRFKTY6e0Om9y4 D91nLMQ4LMm+PV5Mp4KxJCQm3JTAS3ZjXn+8gcpJkCwgaH05pbloXVGwXgtDLkffCrJYm7 6L52IcLxZCnBlxt4ccRuIX5vinTzkMzJJROen/3sY1jJ2/54SAj2cJEaLjklN65F+7RVFF 8Zm8YWkH6tjL2DzdiKb0L4G6NZbF+n9bEpa4JHwRkKDg2g2iySkiFpAmu+ClEg== 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=1745270144; 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=apoen5/mhl7tUX9Rl+b4KGRIZqqa2cDm+iifBMik418=; b=kDRLOI2O+71pYxL9Zz+APATAHhFMf6SM76pk6loq6llqOagNFbOXmHJJRz78QFAUfqDZHi 5H4r6R5WALZlC1ZHGkCuA9BuwPrUZohbYtLDKCQvYPJv7GN2gr9rF6fAhjyRxWCFu0w/5A iwcUyiHTC7wbiS7zcIHLMlz/vlmz4MQ8/aZctw6c/GWM522Mt47zBy922KzkmUFmAByNYg zWpWdZNGALqFCpdtXTz9iYiSqzkOWmlmHkltkSC+bH4SQfGxL6RT0cvi1EDbGABOmNylN9 V34/cCxlnqKF4+JJRre6JM3sBthW6QnBvhxzy9w+WGtm1ZvBApSdcTpivdIDQQ== 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 4ZhJ7N2ZqTz15kl; Mon, 21 Apr 2025 21:15:44 +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 53LLFihh033331; Mon, 21 Apr 2025 21:15:44 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 53LLFi8S033328; Mon, 21 Apr 2025 21:15:44 GMT (envelope-from git) Date: Mon, 21 Apr 2025 21:15:44 GMT Message-Id: <202504212115.53LLFi8S033328@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: 8b9d1dc82ac4 - stable/14 - pf: don't use state keys after pf_state_insert() 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/stable/14 X-Git-Reftype: branch X-Git-Commit: 8b9d1dc82ac420ee1c1f524861affef59c4d5ba7 Auto-Submitted: auto-generated The branch stable/14 has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=8b9d1dc82ac420ee1c1f524861affef59c4d5ba7 commit 8b9d1dc82ac420ee1c1f524861affef59c4d5ba7 Author: Kristof Provost AuthorDate: 2025-03-27 14:35:40 +0000 Commit: Kristof Provost CommitDate: 2025-04-21 20:25:45 +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 949cb36ee474..2f7e4b913c91 100644 --- a/sys/net/pfvar.h +++ b/sys/net/pfvar.h @@ -1557,8 +1557,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 c962821b8acd..c74d2f5efadb 100644 --- a/sys/netpfil/pf/pf.c +++ b/sys/netpfil/pf/pf.c @@ -3472,8 +3472,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) @@ -5305,8 +5305,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) @@ -8501,6 +8501,8 @@ pf_test(int dir, int pflags, struct ifnet *ifp, struct mbuf **m0, 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.ip_sum = &h->ip_sum; pd.proto = h->ip_p; pd.tos = h->ip_tos & ~IPTOS_ECN_MASK; @@ -9052,6 +9054,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.tos = IPV6_DSCP(h); pd.tot_len = ntohs(h->ip6_plen) + sizeof(struct ip6_hdr);