diff options
| author | Pablo Neira Ayuso <pablo@netfilter.org> | 2019-07-05 23:38:46 +0200 |
|---|---|---|
| committer | Pablo Neira Ayuso <pablo@netfilter.org> | 2019-07-05 23:50:31 +0200 |
| commit | b9c04ae7907f09c5e873e7c9a8feea2ce41e15b3 (patch) | |
| tree | a959786a84577fc5a1f7f7951a12cdf47eb1a7c3 /net | |
| parent | 2a3a93ef0ba5166e8b5766bb232f216fd412d40b (diff) | |
| download | linux-b9c04ae7907f09c5e873e7c9a8feea2ce41e15b3.tar.gz linux-b9c04ae7907f09c5e873e7c9a8feea2ce41e15b3.tar.bz2 linux-b9c04ae7907f09c5e873e7c9a8feea2ce41e15b3.zip | |
netfilter: nf_tables: add nft_expr_type_request_module()
This helper function makes sure the family specific extension is loaded.
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
Diffstat (limited to 'net')
| -rw-r--r-- | net/netfilter/nf_tables_api.c | 17 |
1 files changed, 14 insertions, 3 deletions
diff --git a/net/netfilter/nf_tables_api.c b/net/netfilter/nf_tables_api.c index cae5c46e2dd4..582f4e475d67 100644 --- a/net/netfilter/nf_tables_api.c +++ b/net/netfilter/nf_tables_api.c @@ -2019,6 +2019,19 @@ static const struct nft_expr_type *__nft_expr_type_get(u8 family, return NULL; } +#ifdef CONFIG_MODULES +static int nft_expr_type_request_module(struct net *net, u8 family, + struct nlattr *nla) +{ + nft_request_module(net, "nft-expr-%u-%.*s", family, + nla_len(nla), (char *)nla_data(nla)); + if (__nft_expr_type_get(family, nla)) + return -EAGAIN; + + return 0; +} +#endif + static const struct nft_expr_type *nft_expr_type_get(struct net *net, u8 family, struct nlattr *nla) @@ -2035,9 +2048,7 @@ static const struct nft_expr_type *nft_expr_type_get(struct net *net, lockdep_nfnl_nft_mutex_not_held(); #ifdef CONFIG_MODULES if (type == NULL) { - nft_request_module(net, "nft-expr-%u-%.*s", family, - nla_len(nla), (char *)nla_data(nla)); - if (__nft_expr_type_get(family, nla)) + if (nft_expr_type_request_module(net, family, nla) == -EAGAIN) return ERR_PTR(-EAGAIN); nft_request_module(net, "nft-expr-%.*s", |