From: Phil Sutter <phil@nwl.cc>
Date: Thu, 9 Jan 2025 17:31:35 +0000 (+0100)
Subject: netfilter: nf_tables: Compare netdev hooks based on stored name
X-Git-Tag: block-6.14-20240131~28^2~7^2~8
X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=bc87b75847d86f073a3df56e4ad44265b3d64e44;p=linux-block.git

netfilter: nf_tables: Compare netdev hooks based on stored name

The 1:1 relationship between nft_hook and nf_hook_ops is about to break,
so choose the stored ifname to uniquely identify hooks.

Signed-off-by: Phil Sutter <phil@nwl.cc>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
---

diff --git a/net/netfilter/nf_tables_api.c b/net/netfilter/nf_tables_api.c
index 87175cd1d39b..ed15c52e3c65 100644
--- a/net/netfilter/nf_tables_api.c
+++ b/net/netfilter/nf_tables_api.c
@@ -2317,7 +2317,7 @@ static struct nft_hook *nft_hook_list_find(struct list_head *hook_list,
 	struct nft_hook *hook;
 
 	list_for_each_entry(hook, hook_list, list) {
-		if (this->ops.dev == hook->ops.dev)
+		if (!strcmp(hook->ifname, this->ifname))
 			return hook;
 	}