Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 84fba055 authored by Florian Westphal's avatar Florian Westphal Committed by Pablo Neira Ayuso
Browse files

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: default avatarFlorian Westphal <fw@strlen.de>
Signed-off-by: default avatarPablo Neira Ayuso <pablo@netfilter.org>
parent c1183db8

include/net/netfilter/nf_tables.h

+2 −1
Original line number Diff line number Diff line
@@ -1017,7 +1017,8 @@ struct nft_object_type { 
	unsigned int			maxattr;

	struct module			*owner;

	const struct nla_policy		*policy;

	int				(*init)(const struct nlattr * const tb[],

	int				(*init)(const struct nft_ctx *ctx,

						const struct nlattr *const tb[],

						struct nft_object *obj);

	void				(*destroy)(struct nft_object *obj);

	int				(*dump)(struct sk_buff *skb,

net/netfilter/nf_tables_api.c

+4 −3
Original line number Diff line number Diff line
@@ -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;

net/netfilter/nft_counter.c

+2 −1
Original line number Diff line number Diff line
@@ -82,7 +82,8 @@ static int nft_counter_do_init(const struct nlattr * const tb[], 
	return 0;

}



static int nft_counter_obj_init(const struct nlattr * const tb[],

static int nft_counter_obj_init(const struct nft_ctx *ctx,

				const struct nlattr * const tb[],

				struct nft_object *obj)

{

	struct nft_counter_percpu_priv *priv = nft_obj_data(obj);

net/netfilter/nft_quota.c

+2 −1
Original line number Diff line number Diff line
@@ -99,7 +99,8 @@ static int nft_quota_do_init(const struct nlattr * const tb[], 
	return 0;

}



static int nft_quota_obj_init(const struct nlattr * const tb[],

static int nft_quota_obj_init(const struct nft_ctx *ctx,

			      const struct nlattr * const tb[],

			      struct nft_object *obj)

{

	struct nft_quota *priv = nft_obj_data(obj);