diff options
author | Florian Westphal | 2017-03-08 16:48:43 +0100 |
---|---|---|
committer | Pablo Neira Ayuso | 2017-03-13 13:42:00 +0100 |
commit | 84fba05511c8e0e1a6e6c8ec2c3c85616c39a8c1 (patch) | |
tree | f466214811e3a0002a7ca3e4b23a8f1d5c43f72f /net/netfilter/nf_tables_api.c | |
parent | netfilter: nf_reject: remove unused variable (diff) | |
download | kernel-qcow2-linux-84fba05511c8e0e1a6e6c8ec2c3c85616c39a8c1.tar.gz kernel-qcow2-linux-84fba05511c8e0e1a6e6c8ec2c3c85616c39a8c1.tar.xz kernel-qcow2-linux-84fba05511c8e0e1a6e6c8ec2c3c85616c39a8c1.zip |
netfilter: provide nft_ctx in object init function
this is needed by the upcoming ct helper object type --
we'd like to be able use the table family (ip, ip6, inet) to figure
out which helper has to be requested.
Signed-off-by: Florian Westphal <fw@strlen.de>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
Diffstat (limited to 'net/netfilter/nf_tables_api.c')
-rw-r--r-- | net/netfilter/nf_tables_api.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/net/netfilter/nf_tables_api.c b/net/netfilter/nf_tables_api.c index 4559f5d66bcc..12cc5218de96 100644 --- a/net/netfilter/nf_tables_api.c +++ b/net/netfilter/nf_tables_api.c @@ -4095,7 +4095,8 @@ static const struct nla_policy nft_obj_policy[NFTA_OBJ_MAX + 1] = { [NFTA_OBJ_DATA] = { .type = NLA_NESTED }, }; -static struct nft_object *nft_obj_init(const struct nft_object_type *type, +static struct nft_object *nft_obj_init(const struct nft_ctx *ctx, + const struct nft_object_type *type, const struct nlattr *attr) { struct nlattr *tb[type->maxattr + 1]; @@ -4115,7 +4116,7 @@ static struct nft_object *nft_obj_init(const struct nft_object_type *type, if (obj == NULL) goto err1; - err = type->init((const struct nlattr * const *)tb, obj); + err = type->init(ctx, (const struct nlattr * const *)tb, obj); if (err < 0) goto err2; @@ -4223,7 +4224,7 @@ static int nf_tables_newobj(struct net *net, struct sock *nlsk, if (IS_ERR(type)) return PTR_ERR(type); - obj = nft_obj_init(type, nla[NFTA_OBJ_DATA]); + obj = nft_obj_init(&ctx, type, nla[NFTA_OBJ_DATA]); if (IS_ERR(obj)) { err = PTR_ERR(obj); goto err1; |