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

Commit 00c0a1fb authored by Pablo Neira Ayuso's avatar Pablo Neira Ayuso Committed by Greg Kroah-Hartman
Browse files

netfilter: nf_tables: bogus EBUSY when deleting flowtable after flush 



From: Laura Garcia Liebana <nevola@gmail.com>

commit 9b05b6e11d5e93a3a517cadc12b9836e0470c255 upstream.

The deletion of a flowtable after a flush in the same transaction
results in EBUSY. This patch adds an activation and deactivation of
flowtables in order to update the _use_ counter.

Signed-off-by: default avatarLaura Garcia Liebana <nevola@gmail.com>
Signed-off-by: default avatarPablo Neira Ayuso <pablo@netfilter.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 73b5b387

include/net/netfilter/nf_tables.h

+4 −0
Original line number Diff line number Diff line
@@ -1161,6 +1161,10 @@ struct nft_flowtable *nft_flowtable_lookup(const struct nft_table *table, 
					   const struct nlattr *nla,

					   u8 genmask);



void nf_tables_deactivate_flowtable(const struct nft_ctx *ctx,

				    struct nft_flowtable *flowtable,

				    enum nft_trans_phase phase);



void nft_register_flowtable_type(struct nf_flowtable_type *type);

void nft_unregister_flowtable_type(struct nf_flowtable_type *type);

net/netfilter/nf_tables_api.c

+16 −0
Original line number Diff line number Diff line
@@ -5519,6 +5519,22 @@ struct nft_flowtable *nft_flowtable_lookup(const struct nft_table *table, 
}

EXPORT_SYMBOL_GPL(nft_flowtable_lookup);



void nf_tables_deactivate_flowtable(const struct nft_ctx *ctx,

				    struct nft_flowtable *flowtable,

				    enum nft_trans_phase phase)

{

	switch (phase) {

	case NFT_TRANS_PREPARE:

	case NFT_TRANS_ABORT:

	case NFT_TRANS_RELEASE:

		flowtable->use--;

		/* fall through */

	default:

		return;

	}

}

EXPORT_SYMBOL_GPL(nf_tables_deactivate_flowtable);



static struct nft_flowtable *

nft_flowtable_lookup_byhandle(const struct nft_table *table,

			      const struct nlattr *nla, u8 genmask)

net/netfilter/nft_flow_offload.c

+19 −0
Original line number Diff line number Diff line
@@ -175,6 +175,23 @@ static int nft_flow_offload_init(const struct nft_ctx *ctx, 
	return nf_ct_netns_get(ctx->net, ctx->family);

}



static void nft_flow_offload_deactivate(const struct nft_ctx *ctx,

					const struct nft_expr *expr,

					enum nft_trans_phase phase)

{

	struct nft_flow_offload *priv = nft_expr_priv(expr);



	nf_tables_deactivate_flowtable(ctx, priv->flowtable, phase);

}



static void nft_flow_offload_activate(const struct nft_ctx *ctx,

				      const struct nft_expr *expr)

{

	struct nft_flow_offload *priv = nft_expr_priv(expr);



	priv->flowtable->use++;

}



static void nft_flow_offload_destroy(const struct nft_ctx *ctx,

				     const struct nft_expr *expr)

{
@@ -203,6 +220,8 @@ static const struct nft_expr_ops nft_flow_offload_ops = { 
	.size		= NFT_EXPR_SIZE(sizeof(struct nft_flow_offload)),

	.eval		= nft_flow_offload_eval,

	.init		= nft_flow_offload_init,

	.activate	= nft_flow_offload_activate,

	.deactivate	= nft_flow_offload_deactivate,

	.destroy	= nft_flow_offload_destroy,

	.validate	= nft_flow_offload_validate,

	.dump		= nft_flow_offload_dump,