Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5cb82a38 authored by Pablo Neira Ayuso's avatar Pablo Neira Ayuso
Browse files

netfilter: nf_tables: pass netns to set->ops->remove() 



This new parameter is required by the new bitmap set type that comes in a
follow up patch.

Signed-off-by: default avatarPablo Neira Ayuso <pablo@netfilter.org>
parent c078ca3b

include/net/netfilter/nf_tables.h

+2 −1
Original line number Diff line number Diff line
@@ -298,7 +298,8 @@ struct nft_set_ops { 
	bool				(*deactivate_one)(const struct net *net,

							  const struct nft_set *set,

							  void *priv);

	void				(*remove)(const struct nft_set *set,

	void				(*remove)(const struct net *net,

						  const struct nft_set *set,

						  const struct nft_set_elem *elem);

	void				(*walk)(const struct nft_ctx *ctx,

						struct nft_set *set,

net/netfilter/nf_tables_api.c

+3 −3
Original line number Diff line number Diff line
@@ -3752,7 +3752,7 @@ static int nft_add_set_elem(struct nft_ctx *ctx, struct nft_set *set, 
	return 0;



err6:

	set->ops->remove(set, &elem);

	set->ops->remove(ctx->net, set, &elem);

err5:

	kfree(trans);

err4:
@@ -4804,7 +4804,7 @@ static int nf_tables_commit(struct net *net, struct sk_buff *skb) 
			nf_tables_setelem_notify(&trans->ctx, te->set,

						 &te->elem,

						 NFT_MSG_DELSETELEM, 0);

			te->set->ops->remove(te->set, &te->elem);

			te->set->ops->remove(net, te->set, &te->elem);

			atomic_dec(&te->set->nelems);

			te->set->ndeact--;

			break;
@@ -4925,7 +4925,7 @@ static int nf_tables_abort(struct net *net, struct sk_buff *skb) 
		case NFT_MSG_NEWSETELEM:

			te = (struct nft_trans_elem *)trans->data;



			te->set->ops->remove(te->set, &te->elem);

			te->set->ops->remove(net, te->set, &te->elem);

			atomic_dec(&te->set->nelems);

			break;

		case NFT_MSG_DELSETELEM:

net/netfilter/nft_set_hash.c

+2 −1
Original line number Diff line number Diff line
@@ -203,7 +203,8 @@ static void *nft_hash_deactivate(const struct net *net, 
	return he;

}



static void nft_hash_remove(const struct nft_set *set,

static void nft_hash_remove(const struct net *net,

			    const struct nft_set *set,

			    const struct nft_set_elem *elem)

{

	struct nft_hash *priv = nft_set_priv(set);

net/netfilter/nft_set_rbtree.c

+2 −1
Original line number Diff line number Diff line
@@ -151,7 +151,8 @@ static int nft_rbtree_insert(const struct net *net, const struct nft_set *set, 
	return err;

}



static void nft_rbtree_remove(const struct nft_set *set,

static void nft_rbtree_remove(const struct net *net,

			      const struct nft_set *set,

			      const struct nft_set_elem *elem)

{

	struct nft_rbtree *priv = nft_set_priv(set);