system/linux
system/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux synced 2024-09-19 18:46:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

netfilter: nf_tables: bogus EBUSY in helper removal from transaction

Browse source 
Proper use counter updates when activating and deactivating the object,
otherwise, this hits bogus EBUSY error.

Fixes: cd5125d8f5 ("netfilter: nf_tables: split set destruction in deactivate and destroy phase")
Reported-by: Laura Garcia <nevola@gmail.com>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
This commit is contained in:
Pablo Neira Ayuso 2019-03-14 10:50:20 +01:00
parent 6d65561f3d
commit 8ffcd32f64
1 changed files with 16 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
net/netfilter/nft_objref.c
View file

@ -65,21 +65,34 @@ static int nft_objref_dump(struct sk_buff *skb, const struct nft_expr *expr)
return -1; return -1;
} }
static void nft_objref_destroy(const struct nft_ctx *ctx, static void nft_objref_deactivate(const struct nft_ctx *ctx,
const struct nft_expr *expr) const struct nft_expr *expr,
enum nft_trans_phase phase)
{ {
struct nft_object *obj = nft_objref_priv(expr); struct nft_object *obj = nft_objref_priv(expr);
if (phase == NFT_TRANS_COMMIT)
return;
obj->use--; obj->use--;
} }
static void nft_objref_activate(const struct nft_ctx *ctx,
const struct nft_expr *expr)
{
struct nft_object *obj = nft_objref_priv(expr);
obj->use++;
}
static struct nft_expr_type nft_objref_type; static struct nft_expr_type nft_objref_type;
static const struct nft_expr_ops nft_objref_ops = { static const struct nft_expr_ops nft_objref_ops = {
.type = &nft_objref_type, .type = &nft_objref_type,
.size = NFT_EXPR_SIZE(sizeof(struct nft_object *)), .size = NFT_EXPR_SIZE(sizeof(struct nft_object *)),
.eval = nft_objref_eval, .eval = nft_objref_eval,
.init = nft_objref_init, .init = nft_objref_init,
.destroy = nft_objref_destroy, .activate = nft_objref_activate,
.deactivate = nft_objref_deactivate,
.dump = nft_objref_dump, .dump = nft_objref_dump,
}; };