Received-SPF: pass (google.com: domain of linux-kernel+bounces-22038-linux.lists.archive=gmail.com@vger.kernel.org designates 139.178.88.99 as permitted sender) client-ip=139.178.88.99;
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>
Cc: netdev@vger.kernel.org,
	linux-kernel@vger.kernel.org,
	kernel@openvz.org,
	Pavel Tikhomirov <ptikhomirov@virtuozzo.com>
Subject: [PATCH 1/4] netfilter: nfnetlink_log: use proper helper for fetching physinif
Date: Wed, 10 Jan 2024 19:00:11 +0800
Message-ID: <20240110110451.5473-2-ptikhomirov@virtuozzo.com>
In-Reply-To: <20240110110451.5473-1-ptikhomirov@virtuozzo.com>
References: <20240110110451.5473-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?1eJ75sM1Fq6qriWRwcQ9PATQA20dlIjdYrpA+KsEDIy3XF99bGeS1QR3x7RR?=
 =?us-ascii?Q?gRx1u2IqpqxWrRiTVJNaPkmoV9JXdV1T91bbqV4v5p9EL9CRiOJA+EZkRCNh?=
 =?us-ascii?Q?RkcWSCT7yY29bRM+/zygxC+9uk4VKfKT8l2chJ9DUIECqFH5MhZkC14DItM/?=
 =?us-ascii?Q?/PZ7ehBpD7rtyB/mvAeRCWyk1WEQnj7WIZwkoxm3fVsjCHuuolHWtCxXwLoo?=
 =?us-ascii?Q?r/s+K9xbfE4TExS24YBi2tM7IoEsW0i9qtx3b+6fHm0D8HSSc/R5cFitmgzy?=
 =?us-ascii?Q?ONmEMxr9y/mzophCJgTaxuY5QQbu7s13sAeydf+qcJm9jG+HGc1W+wYe4Gen?=
 =?us-ascii?Q?dRrAWg6rBsbsldUUuA7nHUop21sUC7kvlL9H1T/P4TKSMknENFiTKpcZj/oL?=
 =?us-ascii?Q?yRjgWUMp0VcxnsYJxl9UspPqFndaqku+ZaICBP8gzD9VI20TrVRWOGb+A3fS?=
 =?us-ascii?Q?Kl8lWv6w7GD+wRRIl/SLN/b9pAZ6IJSR6p7dhCpcYgJ+ghO5uO+yuVGUbA/n?=
 =?us-ascii?Q?fD02ZGHMAQPQMOOqRXBgk6vA8ENU4mTSZcta8p8nJDlj4fkK6m12PvfswX6s?=
 =?us-ascii?Q?9pX7RhBLRDIr8GgZUCAioO08NP7e1FY4x4eOJqMd0B3PrL+D9shQ9VMnBIbe?=
 =?us-ascii?Q?E4tUJPXW2uiL7v+dVb6iwWLshqYdybmX2DJ6UTwIic0h0Tu4G5Onj5JAsr1+?=
 =?us-ascii?Q?ukOfcym4Uu9PqjfPe/sdPTvpGGxcrJOFssYMpvuGZOb8nlTXZA2E11BeiHYV?=
 =?us-ascii?Q?VELqiS0tHA1AT4BuEM/XPrftrBzLrhTTdeOQuPBu1CKpIbuNAe6/frnlY/SJ?=
 =?us-ascii?Q?9qWI3xPJ8Ojz+TZi1WU9AAn+FZuL6770Le26WICArFQ0Pb/fYBuIDHPxx8he?=
 =?us-ascii?Q?0ddnbHM2nnt3y9LzPXz0fVl63+CxANRV+Wx/9m2uiCb2txj6HfeytDU3iVYi?=
 =?us-ascii?Q?0AS9xHtULHLsBT0Wh3anF8bgKuZTL6x9k4kBZNZvWDCRxivZ4udys5A8qJk0?=
 =?us-ascii?Q?zHgt20H0rHoMY+9O5FBiAEvLn8/MTlHQ/hIf719r5eGM3M1HkoBvd9uzm3fo?=
 =?us-ascii?Q?SFH5k1KCBWvrKPXN4EmUhmNlp6/Er1dd82iZiiEaIZXzzu+ZDISAfRu+Nq8L?=
 =?us-ascii?Q?3eHriTjOl+WnklJL44PjjMiCOQfccoH/qM6p9NXo+NCf0yE24YpBx+Z+FPRb?=
 =?us-ascii?Q?LkjMGu1haO+3UveY+vxQExCGO0ZV7d0JsZl20gFAItk9JqlK67eLw5Ke3Yp9?=
 =?us-ascii?Q?9orQtaE0+wj/kF3mL2kT98ME//pmQ9Ai7QlG5GRZBZm8/kjd/kS3imhbT896?=
 =?us-ascii?Q?I+Q1LB8pAqsnpJxu19ZVa3ZpTWXBaXhWuDfP7A6BAm07GFxGTxfBkNpaSZwf?=
 =?us-ascii?Q?K1n+ZA96hoAEaYoHLGRoTHvbPigxeasGiupk7KiYA4fTIXReLXDNFKIGehrs?=
 =?us-ascii?Q?zhvveXrTMO5AonGJKB6ZrnnDwYmeAe3xSP5yvrFyLZVnfLXOaEjdze/H36cO?=
 =?us-ascii?Q?nt8PBFw4tcwYxgmBk7hgOeqS1ij8L4eHLW0YOUIG2V2y6owL4YIjPdwHO+iw?=
 =?us-ascii?Q?p03uZiNlRMjSH4RNLE5JjLmyPxOJ5tl6eyxdp1PZdTUx3uNLz5o8BuWADkzI?=
 =?us-ascii?Q?RGE+6twHKeJvwiIxH6GSOtASBScHJ2VZeMqFr3qXFzZZ2ZTsAJXUJIJjC4ZE?=
 =?us-ascii?Q?s9xMmQ=3D=3D?=
X-OriginatorOrg: virtuozzo.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 9aa885cc-3d70-496d-a2fe-08dc11cc0668
X-MS-Exchange-CrossTenant-AuthSource: DU0PR08MB9003.eurprd08.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 10 Jan 2024 11:05:16.1331
 (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: dW1X6rbMZ+/drMyafQmy2sB8OUFMO7YtWgqq/90mus7Bpc//r5ivYwmgDqgVJZuAmL3fGSF9TvL25W+CBIkKo5TCjpp3z8sfsVx5F68Rgyw=
X-MS-Exchange-Transport-CrossTenantHeadersStamped: AS8PR08MB5990

We don't use physindev in __build_packet_message except for getting
physinif from it. So let's switch to nf_bridge_get_physinif to get what
we want directly.

Signed-off-by: Pavel Tikhomirov <ptikhomirov@virtuozzo.com>
---
 net/netfilter/nfnetlink_log.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/net/netfilter/nfnetlink_log.c b/net/netfilter/nfnetlink_log.c
index f03f4d4d7d889..134e05d31061e 100644
--- a/net/netfilter/nfnetlink_log.c
+++ b/net/netfilter/nfnetlink_log.c
@@ -508,7 +508,7 @@ __build_packet_message(struct nfnl_log_net *log,
 					 htonl(br_port_get_rcu(indev)->br->dev->ifindex)))
 				goto nla_put_failure;
 		} else {
-			struct net_device *physindev;
+			int physinif;
 
 			/* Case 2: indev is bridge group, we need to look for
 			 * physical device (when called from ipv4) */
@@ -516,10 +516,10 @@ __build_packet_message(struct nfnl_log_net *log,
 					 htonl(indev->ifindex)))
 				goto nla_put_failure;
 
-			physindev = nf_bridge_get_physindev(skb);
-			if (physindev &&
+			physinif = nf_bridge_get_physinif(skb);
+			if (physinif &&
 			    nla_put_be32(inst->skb, NFULA_IFINDEX_PHYSINDEV,
-					 htonl(physindev->ifindex)))
+					 htonl(physinif)))
 				goto nla_put_failure;
 		}
 #endif
-- 
2.43.0