Skip to content

Commit

Permalink
netfilter: nft_compat: fix module refcount underflow
Browse files Browse the repository at this point in the history
BugLink: http://bugs.launchpad.net/bugs/1441317

commit 520aa74 upstream.

Feb 12 18:20:42 nfdev kernel: ------------[ cut here ]------------
Feb 12 18:20:42 nfdev kernel: WARNING: CPU: 4 PID: 4359 at kernel/module.c:963 module_put+0x9b/0xba()
Feb 12 18:20:42 nfdev kernel: CPU: 4 PID: 4359 Comm: ebtables-compat Tainted: G        W      3.19.0-rc6+ torvalds#43
[...]
Feb 12 18:20:42 nfdev kernel: Call Trace:
Feb 12 18:20:42 nfdev kernel: [<ffffffff815fd911>] dump_stack+0x4c/0x65
Feb 12 18:20:42 nfdev kernel: [<ffffffff8103e6f7>] warn_slowpath_common+0x9c/0xb6
Feb 12 18:20:42 nfdev kernel: [<ffffffff8109919f>] ? module_put+0x9b/0xba
Feb 12 18:20:42 nfdev kernel: [<ffffffff8103e726>] warn_slowpath_null+0x15/0x17
Feb 12 18:20:42 nfdev kernel: [<ffffffff8109919f>] module_put+0x9b/0xba
Feb 12 18:20:42 nfdev kernel: [<ffffffff813ecf7c>] nft_match_destroy+0x45/0x4c
Feb 12 18:20:42 nfdev kernel: [<ffffffff813e683f>] nf_tables_rule_destroy+0x28/0x70

Reported-by: Arturo Borrero Gonzalez <arturo.borrero.glez@gmail.com>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
Tested-by: Arturo Borrero Gonzalez <arturo.borrero.glez@gmail.com>
Signed-off-by: Luis Henriques <luis.henriques@canonical.com>
Signed-off-by: Brad Figg <brad.figg@canonical.com>
  • Loading branch information
ummakynes authored and bjf committed Apr 7, 2015
1 parent cb4b607 commit 7da58ef
Showing 1 changed file with 10 additions and 2 deletions.
12 changes: 10 additions & 2 deletions net/netfilter/nft_compat.c
Expand Up @@ -629,8 +629,12 @@ nft_match_select_ops(const struct nft_ctx *ctx,
struct xt_match *match = nft_match->ops.data;

if (strcmp(match->name, mt_name) == 0 &&
match->revision == rev && match->family == family)
match->revision == rev && match->family == family) {
if (!try_module_get(match->me))
return ERR_PTR(-ENOENT);

return &nft_match->ops;
}
}

match = xt_request_find_match(family, mt_name, rev);
Expand Down Expand Up @@ -700,8 +704,12 @@ nft_target_select_ops(const struct nft_ctx *ctx,
struct xt_target *target = nft_target->ops.data;

if (strcmp(target->name, tg_name) == 0 &&
target->revision == rev && target->family == family)
target->revision == rev && target->family == family) {
if (!try_module_get(target->me))
return ERR_PTR(-ENOENT);

return &nft_target->ops;
}
}

target = xt_request_find_target(family, tg_name, rev);
Expand Down

0 comments on commit 7da58ef

Please sign in to comment.