Unverified Commit 22109f90 authored by openeuler-ci-bot's avatar openeuler-ci-bot Committed by Gitee
Browse files

!6086 netfilter: nft_chain_filter: handle NETDEV_UNREGISTER for inet/ingress basechain 

Merge Pull Request from: @ci-robot 
 
PR sync from: Zhengchao Shao <shaozhengchao@huawei.com>
https://mailweb.openeuler.org/hyperkitty/list/kernel@openeuler.org/message/ENVNAEE2EJVHP25XDQ4CGQ2TAE2YAPHK/ 
 
https://gitee.com/src-openeuler/kernel/issues/I9E49K 
 
Link:https://gitee.com/openeuler/kernel/pulls/6086

 

Reviewed-by: default avatarYue Haibing <yuehaibing@huawei.com>
Signed-off-by: default avatarJialin Zhang <zhangjialin11@huawei.com>
parents cbc3d106 366f309c

net/netfilter/nft_chain_filter.c

+9 −2
Original line number Diff line number Diff line
@@ -358,9 +358,10 @@ static int nf_tables_netdev_event(struct notifier_block *this, 
				  unsigned long event, void *ptr)

{

	struct net_device *dev = netdev_notifier_info_to_dev(ptr);

	struct nft_base_chain *basechain;

	struct nftables_pernet *nft_net;

	struct nft_table *table;

	struct nft_chain *chain, *nr;

	struct nft_table *table;

	struct nft_ctx ctx = {

		.net	= dev_net(dev),

	};
@@ -372,7 +373,8 @@ static int nf_tables_netdev_event(struct notifier_block *this, 
	nft_net = net_generic(ctx.net, nf_tables_net_id);

	mutex_lock(&nft_net->commit_mutex);

	list_for_each_entry(table, &nft_net->tables, list) {

		if (table->family != NFPROTO_NETDEV)

		if (table->family != NFPROTO_NETDEV &&

		    table->family != NFPROTO_INET)

			continue;



		ctx.family = table->family;
@@ -381,6 +383,11 @@ static int nf_tables_netdev_event(struct notifier_block *this, 
			if (!nft_is_base_chain(chain))

				continue;



			basechain = nft_base_chain(chain);

			if (table->family == NFPROTO_INET &&

			    basechain->ops.hooknum != NF_INET_INGRESS)

				continue;



			ctx.chain = chain;

			nft_netdev_event(event, dev, &ctx);

		}