Received-SPF: pass (google.com: domain of linux-kernel+bounces-23764-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:40f1:3f00::1 as permitted sender) client-ip=2604:1380:40f1:3f00::1;
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 1/4] netfilter: nfnetlink_log: use proper helper for fetching physinif
Date: Thu, 11 Jan 2024 23:06:37 +0800
Message-ID: <20240111150645.85637-2-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?7Z6PY8uxaH9N/CVrGrYnRbRMXakdebll+nPs2K/EwkdfCTySD3yC+0hzye8E?=
 =?us-ascii?Q?qhwE6LvVluepOE10q+EcocN4dr9tBuO7wN4XoIGz+JDE1ZpIkSb5GS2Qscb3?=
 =?us-ascii?Q?k1LQmJdM2SV4dj1eXtuaJXYXKfuVwiPKC/dggdsWCEdE15UX8BmZsK0WDSLo?=
 =?us-ascii?Q?rvJbUcyhrEkot2xRWRfZBzcQG2skm+kvlBt9WNWHLCuQFQFqposUMNpHR6Cv?=
 =?us-ascii?Q?5y3sbaLayqz6/VDY05i4rwBrBUKm+sbOAit/ihKv9ix25SAu/iV5lGN7o6w7?=
 =?us-ascii?Q?p9ZRM0/NPFJ7/oE3Ao7Yui8JQYBUwtIkX4BkCfpGvDvr5lhK35uG45LWji+R?=
 =?us-ascii?Q?Zsa2S9MEbbB6/qOrptUCFgF8D34/H4x9ihJ0VkAY5lUfAjOsb++xePxRXYMO?=
 =?us-ascii?Q?kZdnR9TJONnepOZq6oGIYeem4tXh9eq0Z+u+qO2RGTTSsoqpSwYsNjE5Rj+J?=
 =?us-ascii?Q?l2et8Qo00OZu+S0JRYZQDyuUsx9stpXqYlXpLr4vEKF2o6qlO8237qSzNWU9?=
 =?us-ascii?Q?FKk0w4CofTYTX6g29MlQ1yniojGHh6YoREb75ku75QYaIBFF++kcqgYGXynm?=
 =?us-ascii?Q?EjSmontN+QyIG9OMu+mwHl1wNPx6sPBfwmiIUarz1FF2EVxd8yVijedStVa8?=
 =?us-ascii?Q?6/HvUib/d/b8K6DF4rRQmqbOc9yJBqo+T+U2WGdHmR1KbMjHiYQbY3IIdqk9?=
 =?us-ascii?Q?fmago1bwAe1QupBF3bSbDN6WQoVpaJh7lMXJercmmex5on2vM41Su8DiSM0u?=
 =?us-ascii?Q?fJwGeQbImt+mALYdbR7rNQQwDfhSU2OgaHhIxWUevuMDvEzAripqu6pqoAzk?=
 =?us-ascii?Q?36dKj5LL0rbfRKJd4NpllsaoBZPXByQy1xsmByhrx9pDh34pvBjrkVhhajpj?=
 =?us-ascii?Q?wNUsdVNzmMnGlNKJmm14580GI01qwbBLJoiK5nDAprnBXV3YaYZIE4kRiI2W?=
 =?us-ascii?Q?1AFCjHDIY5KhGm90SHgO45Ft+KKcW8q4dutPvOq2C8hHS64knnDzhMDu5jnh?=
 =?us-ascii?Q?5netTWxWGZTD3bOxPRE2uNc0UYnyxXR7uGJ5fopOjf4DX8jEAGbeqlp7S5ar?=
 =?us-ascii?Q?WgZNAL3HeIlhxzGRaeI9fDWM1LU21TZV+EdOWHjf4+Dx6izFC4N3G85mjwBk?=
 =?us-ascii?Q?EnbKriP3Z3wRsj4Rlqnnht+uNo6TWQrXffwEhsrdGMqy2fvpoEiD1aoAKbVI?=
 =?us-ascii?Q?ZPx48/wt7dflMR+rwbwJLQZLHQOR7dkA9mWbcjCwERZRp/PKTCN35PVRMSxH?=
 =?us-ascii?Q?LhR/yxzG/3DLfh4LW9gewQ8F3jm7UZNg5NM1uSYzTSiUbVb6+n3dmmu5cheI?=
 =?us-ascii?Q?BVKK99QXAp2aEhd219iquzit0O3nCDBM5mn+bv9bzQf6F5KQ41oClE9c4HsY?=
 =?us-ascii?Q?oFonzOZZ+J9uTBnKauYt3J0adSFPWp0uFJSUkUZVDrHNStNqtV96MxEYvhi6?=
 =?us-ascii?Q?kr1+oh8PbvO0oqE7UCXbNI/gdg8GfmeMjIC2CG4q6QH4nwKFsGSR3snYu1LD?=
 =?us-ascii?Q?meTkCBnQ4toyQUEbNIjro6QSs0Dgib5OgFLJoE6T8IOVhYK7Gm2FO9cdrNZc?=
 =?us-ascii?Q?M9EyXqG+JswsEd6wfCk8NHny/Lb7rr73iJzaL7ktUcE+zse28WQRUAYAE4F1?=
 =?us-ascii?Q?gIuljnHsvZYOkDoTatveQQ6xoNIeOw95BZRK/IPpWKr9pm6jMA7kXP55FoW3?=
 =?us-ascii?Q?fsK+bA=3D=3D?=
X-OriginatorOrg: virtuozzo.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 5924aa60-941f-41d9-0e32-08dc12b6fa5b
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:07.6425
 (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: NbMAvFUE5hXFSENVCG8BNOFNDzDX9ot2ymF5ZB0StIkMEsUnMTQUdJDlzr5fcnZqLARPFZE+sqAzkDcnZLpPNWyjAgyYk5/A7c9zlN3fw/w=
X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB4PR08MB9238

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