Received-SPF: pass (google.com: domain of linux-kernel+bounces-23766-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:4601:e00::3 as permitted sender) client-ip=2604:1380:4601:e00::3;
From: Pavel Tikhomirov <ptikhomirov@virtuozzo.com>
To: "David S. Miller" <davem@davemloft.net>,
	Eric Dumazet <edumazet@google.com>,
	Jakub Kicinski <kuba@kernel.org>,
	Paolo Abeni <pabeni@redhat.com>,
	Florian Westphal <fw@strlen.de>,
	David Ahern <dsahern@kernel.org>,
	Jozsef Kadlecsik <kadlec@netfilter.org>,
	Kees Cook <keescook@chromium.org>,
	Nikolay Aleksandrov <razor@blackwall.org>,
	Pablo Neira Ayuso <pablo@netfilter.org>,
	Roopa Prabhu <roopa@nvidia.com>
Cc: netdev@vger.kernel.org,
	linux-kernel@vger.kernel.org,
	netfilter-devel@vger.kernel.org,
	coreteam@netfilter.org,
	bridge@lists.linux.dev,
	kernel@openvz.org,
	Pavel Tikhomirov <ptikhomirov@virtuozzo.com>
Subject: [PATCH v3 3/4] netfilter: propagate net to nf_bridge_get_physindev
Date: Thu, 11 Jan 2024 23:06:39 +0800
Message-ID: <20240111150645.85637-4-ptikhomirov@virtuozzo.com>
In-Reply-To: <20240111150645.85637-1-ptikhomirov@virtuozzo.com>
References: <20240111150645.85637-1-ptikhomirov@virtuozzo.com>
Content-Transfer-Encoding: 8bit
Content-Type: text/plain
Precedence: bulk
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0:
	=?us-ascii?Q?1GPtmgXcE9GmxZLxRQfE7xvTmk4USs1xT3O2xHzYBykmMORKhSkyHCOgRTTO?=
 =?us-ascii?Q?9QMkXqkrCoIw/PqwM2h29cmW5BDu7tdBhK9iubt/ITfbG1nsmKeFwgmaf3LN?=
 =?us-ascii?Q?tQKjIo8LhOhP+QPHW9kgY6Ba0rymb39E8eN1DYPmTtZNm6U6bSJPvxJOB2U7?=
 =?us-ascii?Q?5aoiuCxgz3Bj5D+qraJLmP0a/csjGOGhdJzSaLlBiUVhS71i331JPcSRbJsr?=
 =?us-ascii?Q?0LWpAq61NjmAI7uIOr8h3B+UwS0883MQVIrlDpFBxylFVCoKe+FGf/EkhxHi?=
 =?us-ascii?Q?jK6sJn4PLYQ3AG2XPPf4KmhCI7cvY2uNpJbxTZSFgJor3wGBHnCDaXfK5UpG?=
 =?us-ascii?Q?BWw3QGO+1w2qmhI2OIcopbKZF0tWfyrwUO79J1l626SSC4EfpqK3lQENyvpP?=
 =?us-ascii?Q?tvjhnraitRP+ohwNG2Lo4MAs+cFZau0YEWwSqx15ORwv1nYzykpUS+wZtePE?=
 =?us-ascii?Q?wkXbGMbV1zDuO0RTfa0XwUZV36DhB4bzb07oHzAa99zNdnJoablZDGJ5JKWW?=
 =?us-ascii?Q?pogJXXDt/AQ1jcUMNI5wXMLfXEwp0cfBJXjZKhYsKvMsU9p5KG+jEOJp1g8e?=
 =?us-ascii?Q?peZq1RwyIuEIfHv4spxdtP7YVay6Y3r29VT642MWK+6mX/uPAEPXYhoa4jOg?=
 =?us-ascii?Q?Yi26OYHn2mWcO741XvE3N01LZ1308YpHrUAgJLOkrh5Ro3nzq716N/YleICo?=
 =?us-ascii?Q?pJlj2I/7qpTe2mnRfOHiZ6JTADrHdqfCjuBmFMEEcALffhN0q9lxcyJ8LGkQ?=
 =?us-ascii?Q?xfqIwCa/xtkRGPXY9eFpybVdJ3J0kddO7dD4rwsph4vLj/+9tkZD2H8vCyli?=
 =?us-ascii?Q?LOPesPy6LuhwT1m8CtZFujRV2UQocDRekUQ8bUwyZriySVEcq4Cwor23Qb4Y?=
 =?us-ascii?Q?ryNMByjfAN/aABXS+M/8Z0l/yCJErJnZ5Z87F6oNL5FeyIvSTc2sGhf1L1HY?=
 =?us-ascii?Q?JSY87a+7hkdTozgXO8HqBtwnwEEVOUmfw22Er7nh0McYAGlE1vow8IrHUS6T?=
 =?us-ascii?Q?xYwg4oeXQGPOTSBoETvpTwWMa8nj+1X488pC71jW25b8Fny0UchBDl6/BWwj?=
 =?us-ascii?Q?KEnfOSo0iOVdpuuAxQ5UHMnvAukJhWmzTnNcxnHeCSmnH/PtFsRlPw8pCuUK?=
 =?us-ascii?Q?QboXKtNXKZFY3+hp/nAqPbe+A8rBkg8v8JplkK1bW/zLFWAxMIrydG1IkgSt?=
 =?us-ascii?Q?ZT5RWeAyEME/Ri0HQQxN3Sz2M+HQnlwbWkoaGdFgqUh36fBEJBavrM7apmyF?=
 =?us-ascii?Q?Fy7U//Pup3iyBt3K5DEJbLK1+PCVjvm6n9rSWuLyaDmxQt2liiCIS37z8ZTP?=
 =?us-ascii?Q?mJCdz8iNWhZ307ewbKa2guvVfaZkjPS04JFoSDd+jLZL5A2YdMbKihotiCtB?=
 =?us-ascii?Q?N/MTLrif0Aki2VoH8YrPyuP/r/SkeZ30vNAnsaq7ZRV7/1KyqXQw5/ycqOxW?=
 =?us-ascii?Q?An01vmtXgStNVBQc3Q4rSg3XYlaSiBVNffn8ibT1o1a9BWHw8DawHdjwNhXL?=
 =?us-ascii?Q?rIAFzCmbvsMqX8nJl+cLXkYTXv9Frioe+B5HZAym8+K43U72iiHBv4Pra+ib?=
 =?us-ascii?Q?4k6xPvcc8yaGcqPzibRB0N7U9XCgNKrMsW8NeCOcotUBa+oBx+Xl+rFRIJYo?=
 =?us-ascii?Q?JNPPk0pCQ2YmGN31YpGlO4VRpJnxerxKFd/jvbZLpN5WfzR5GPHi3YMyt/cF?=
 =?us-ascii?Q?+MZMQw=3D=3D?=
X-OriginatorOrg: virtuozzo.com
X-MS-Exchange-CrossTenant-Network-Message-Id: d654b1de-78da-4a58-21db-08dc12b6ff9e
X-MS-Exchange-CrossTenant-AuthSource: DU0PR08MB9003.eurprd08.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 11 Jan 2024 15:07:16.4206
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: 0bc7f26d-0264-416e-a6fc-8352af79c58f
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: AGbQmPG9s3k3FuSjp1VoPMNAxItCTcGS2YDOu62Yik37WRv6jgOzk7Fp9Lh3RG+EIXSmzkadXuujtrD7ZACt8nm/3Ffvjp00TaZEEret0N8=
X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB4PR08MB9238

This is a preparation patch for replacing physindev with physinif on
nf_bridge_info structure. We will use dev_get_by_index_rcu to resolve
device, when needed, and it requires net to be available.

Signed-off-by: Pavel Tikhomirov <ptikhomirov@virtuozzo.com>
---
v2: remove leftover net propagation to __build_packet_message
---
 include/linux/netfilter_bridge.h           |  2 +-
 net/ipv4/netfilter/nf_reject_ipv4.c        |  2 +-
 net/ipv6/netfilter/nf_reject_ipv6.c        |  2 +-
 net/netfilter/ipset/ip_set_hash_netiface.c |  8 ++++----
 net/netfilter/nf_log_syslog.c              | 13 +++++++------
 net/netfilter/nf_queue.c                   |  2 +-
 net/netfilter/xt_physdev.c                 |  2 +-
 7 files changed, 16 insertions(+), 15 deletions(-)

diff --git a/include/linux/netfilter_bridge.h b/include/linux/netfilter_bridge.h
index f980edfdd2783..e927b9a15a556 100644
--- a/include/linux/netfilter_bridge.h
+++ b/include/linux/netfilter_bridge.h
@@ -56,7 +56,7 @@ static inline int nf_bridge_get_physoutif(const struct sk_buff *skb)
 }
 
 static inline struct net_device *
-nf_bridge_get_physindev(const struct sk_buff *skb)
+nf_bridge_get_physindev(const struct sk_buff *skb, struct net *net)
 {
 	const struct nf_bridge_info *nf_bridge = nf_bridge_info_get(skb);
 
diff --git a/net/ipv4/netfilter/nf_reject_ipv4.c b/net/ipv4/netfilter/nf_reject_ipv4.c
index f01b038fc1cda..86e7d390671af 100644
--- a/net/ipv4/netfilter/nf_reject_ipv4.c
+++ b/net/ipv4/netfilter/nf_reject_ipv4.c
@@ -289,7 +289,7 @@ void nf_send_reset(struct net *net, struct sock *sk, struct sk_buff *oldskb,
 	 * build the eth header using the original destination's MAC as the
 	 * source, and send the RST packet directly.
 	 */
-	br_indev = nf_bridge_get_physindev(oldskb);
+	br_indev = nf_bridge_get_physindev(oldskb, net);
 	if (br_indev) {
 		struct ethhdr *oeth = eth_hdr(oldskb);
 
diff --git a/net/ipv6/netfilter/nf_reject_ipv6.c b/net/ipv6/netfilter/nf_reject_ipv6.c
index d45bc54b7ea55..27b2164f4c439 100644
--- a/net/ipv6/netfilter/nf_reject_ipv6.c
+++ b/net/ipv6/netfilter/nf_reject_ipv6.c
@@ -354,7 +354,7 @@ void nf_send_reset6(struct net *net, struct sock *sk, struct sk_buff *oldskb,
 	 * build the eth header using the original destination's MAC as the
 	 * source, and send the RST packet directly.
 	 */
-	br_indev = nf_bridge_get_physindev(oldskb);
+	br_indev = nf_bridge_get_physindev(oldskb, net);
 	if (br_indev) {
 		struct ethhdr *oeth = eth_hdr(oldskb);
 
diff --git a/net/netfilter/ipset/ip_set_hash_netiface.c b/net/netfilter/ipset/ip_set_hash_netiface.c
index 95aeb31c60e0d..30a655e5c4fdc 100644
--- a/net/netfilter/ipset/ip_set_hash_netiface.c
+++ b/net/netfilter/ipset/ip_set_hash_netiface.c
@@ -138,9 +138,9 @@ hash_netiface4_data_next(struct hash_netiface4_elem *next,
 #include "ip_set_hash_gen.h"
 
 #if IS_ENABLED(CONFIG_BRIDGE_NETFILTER)
-static const char *get_physindev_name(const struct sk_buff *skb)
+static const char *get_physindev_name(const struct sk_buff *skb, struct net *net)
 {
-	struct net_device *dev = nf_bridge_get_physindev(skb);
+	struct net_device *dev = nf_bridge_get_physindev(skb, net);
 
 	return dev ? dev->name : NULL;
 }
@@ -177,7 +177,7 @@ hash_netiface4_kadt(struct ip_set *set, const struct sk_buff *skb,
 
 	if (opt->cmdflags & IPSET_FLAG_PHYSDEV) {
 #if IS_ENABLED(CONFIG_BRIDGE_NETFILTER)
-		const char *eiface = SRCDIR ? get_physindev_name(skb) :
+		const char *eiface = SRCDIR ? get_physindev_name(skb, xt_net(par)) :
 					      get_physoutdev_name(skb);
 
 		if (!eiface)
@@ -395,7 +395,7 @@ hash_netiface6_kadt(struct ip_set *set, const struct sk_buff *skb,
 
 	if (opt->cmdflags & IPSET_FLAG_PHYSDEV) {
 #if IS_ENABLED(CONFIG_BRIDGE_NETFILTER)
-		const char *eiface = SRCDIR ? get_physindev_name(skb) :
+		const char *eiface = SRCDIR ? get_physindev_name(skb, xt_net(par)) :
 					      get_physoutdev_name(skb);
 
 		if (!eiface)
diff --git a/net/netfilter/nf_log_syslog.c b/net/netfilter/nf_log_syslog.c
index c66689ad2b491..58402226045e8 100644
--- a/net/netfilter/nf_log_syslog.c
+++ b/net/netfilter/nf_log_syslog.c
@@ -111,7 +111,8 @@ nf_log_dump_packet_common(struct nf_log_buf *m, u8 pf,
 			  unsigned int hooknum, const struct sk_buff *skb,
 			  const struct net_device *in,
 			  const struct net_device *out,
-			  const struct nf_loginfo *loginfo, const char *prefix)
+			  const struct nf_loginfo *loginfo, const char *prefix,
+			  struct net *net)
 {
 	const struct net_device *physoutdev __maybe_unused;
 	const struct net_device *physindev __maybe_unused;
@@ -121,7 +122,7 @@ nf_log_dump_packet_common(struct nf_log_buf *m, u8 pf,
 			in ? in->name : "",
 			out ? out->name : "");
 #if IS_ENABLED(CONFIG_BRIDGE_NETFILTER)
-	physindev = nf_bridge_get_physindev(skb);
+	physindev = nf_bridge_get_physindev(skb, net);
 	if (physindev && in != physindev)
 		nf_log_buf_add(m, "PHYSIN=%s ", physindev->name);
 	physoutdev = nf_bridge_get_physoutdev(skb);
@@ -148,7 +149,7 @@ static void nf_log_arp_packet(struct net *net, u_int8_t pf,
 		loginfo = &default_loginfo;
 
 	nf_log_dump_packet_common(m, pf, hooknum, skb, in, out, loginfo,
-				  prefix);
+				  prefix, net);
 	dump_arp_packet(m, loginfo, skb, skb_network_offset(skb));
 
 	nf_log_buf_close(m);
@@ -845,7 +846,7 @@ static void nf_log_ip_packet(struct net *net, u_int8_t pf,
 		loginfo = &default_loginfo;
 
 	nf_log_dump_packet_common(m, pf, hooknum, skb, in,
-				  out, loginfo, prefix);
+				  out, loginfo, prefix, net);
 
 	if (in)
 		dump_mac_header(m, loginfo, skb);
@@ -880,7 +881,7 @@ static void nf_log_ip6_packet(struct net *net, u_int8_t pf,
 		loginfo = &default_loginfo;
 
 	nf_log_dump_packet_common(m, pf, hooknum, skb, in, out,
-				  loginfo, prefix);
+				  loginfo, prefix, net);
 
 	if (in)
 		dump_mac_header(m, loginfo, skb);
@@ -916,7 +917,7 @@ static void nf_log_unknown_packet(struct net *net, u_int8_t pf,
 		loginfo = &default_loginfo;
 
 	nf_log_dump_packet_common(m, pf, hooknum, skb, in, out, loginfo,
-				  prefix);
+				  prefix, net);
 
 	dump_mac_header(m, loginfo, skb);
 
diff --git a/net/netfilter/nf_queue.c b/net/netfilter/nf_queue.c
index 3dfcb3ac5cb44..e2f334f70281f 100644
--- a/net/netfilter/nf_queue.c
+++ b/net/netfilter/nf_queue.c
@@ -84,7 +84,7 @@ static void __nf_queue_entry_init_physdevs(struct nf_queue_entry *entry)
 	const struct sk_buff *skb = entry->skb;
 
 	if (nf_bridge_info_exists(skb)) {
-		entry->physin = nf_bridge_get_physindev(skb);
+		entry->physin = nf_bridge_get_physindev(skb, entry->state.net);
 		entry->physout = nf_bridge_get_physoutdev(skb);
 	} else {
 		entry->physin = NULL;
diff --git a/net/netfilter/xt_physdev.c b/net/netfilter/xt_physdev.c
index ec6ed6fda96c5..343e65f377d44 100644
--- a/net/netfilter/xt_physdev.c
+++ b/net/netfilter/xt_physdev.c
@@ -59,7 +59,7 @@ physdev_mt(const struct sk_buff *skb, struct xt_action_param *par)
 	    (!!outdev ^ !(info->invert & XT_PHYSDEV_OP_BRIDGED)))
 		return false;
 
-	physdev = nf_bridge_get_physindev(skb);
+	physdev = nf_bridge_get_physindev(skb, xt_net(par));
 	indev = physdev ? physdev->name : NULL;
 
 	if ((info->bitmask & XT_PHYSDEV_OP_ISIN &&
-- 
2.43.0