Skip to content

Commit

Permalink
netfilter: nf_tables: do not hold reference on netdevice from prepara…
Browse files Browse the repository at this point in the history
…tion phase

The netfilter netdevice event handler hold the nfnl_lock mutex, this
avoids races with a device going away while such device is being
attached to hooks from the netlink control plane. Therefore, either
control plane bails out with ENOENT or netdevice event path waits until
the hook that is attached to net_device is registered.

Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
  • Loading branch information
Pablo Neira Ayuso committed Mar 22, 2018
1 parent d92191a commit 90d2723
Showing 1 changed file with 4 additions and 15 deletions.
19 changes: 4 additions & 15 deletions net/netfilter/nf_tables_api.c
Original file line number Diff line number Diff line change
@@ -1288,8 +1288,6 @@ static void nf_tables_chain_destroy(struct nft_chain *chain)
free_percpu(basechain->stats);
if (basechain->stats)
static_branch_dec(&nft_counters_enabled);
if (basechain->ops.dev != NULL)
dev_put(basechain->ops.dev);
kfree(chain->name);
kfree(basechain);
} else {
@@ -1356,7 +1354,7 @@ static int nft_chain_parse_hook(struct net *net,
}

nla_strlcpy(ifname, ha[NFTA_HOOK_DEV], IFNAMSIZ);
dev = dev_get_by_name(net, ifname);
dev = __dev_get_by_name(net, ifname);
if (!dev) {
module_put(type->owner);
return -ENOENT;
@@ -1373,8 +1371,6 @@ static int nft_chain_parse_hook(struct net *net,
static void nft_chain_release_hook(struct nft_chain_hook *hook)
{
module_put(hook->type->owner);
if (hook->dev != NULL)
dev_put(hook->dev);
}

static int nf_tables_addchain(struct nft_ctx *ctx, u8 family, u8 genmask,
@@ -4948,7 +4944,7 @@ static int nf_tables_parse_devices(const struct nft_ctx *ctx,
}

nla_strlcpy(ifname, tmp, IFNAMSIZ);
dev = dev_get_by_name(ctx->net, ifname);
dev = __dev_get_by_name(ctx->net, ifname);
if (!dev) {
err = -ENOENT;
goto err1;
@@ -5007,10 +5003,8 @@ static int nf_tables_flowtable_parse_hook(const struct nft_ctx *ctx,
return err;

ops = kzalloc(sizeof(struct nf_hook_ops) * n, GFP_KERNEL);
if (!ops) {
err = -ENOMEM;
goto err1;
}
if (!ops)
return -ENOMEM;

flowtable->hooknum = hooknum;
flowtable->priority = priority;
@@ -5028,11 +5022,6 @@ static int nf_tables_flowtable_parse_hook(const struct nft_ctx *ctx,
GFP_KERNEL);
}

err = 0;
err1:
for (i = 0; i < n; i++)
dev_put(dev_array[i]);

return err;
}

0 comments on commit 90d2723

Please sign in to comment.