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

Commit 4269fea7 authored by Pablo Neira Ayuso's avatar Pablo Neira Ayuso
Browse files

Revert "netfilter: nft_numgen: add map lookups for numgen random operations" 



Laura found a better way to do this from userspace without requiring
kernel infrastructure, revert this.

Fixes: 978d8f90 ("netfilter: nft_numgen: add map lookups for numgen random operations")
Signed-off-by: default avatarLaura Garcia Liebana <nevola@gmail.com>
Signed-off-by: default avatarPablo Neira Ayuso <pablo@netfilter.org>
parent 5a8de47b

include/uapi/linux/netfilter/nf_tables.h

+2 −2
Original line number Diff line number Diff line
@@ -1635,8 +1635,8 @@ enum nft_ng_attributes { 
	NFTA_NG_MODULUS,

	NFTA_NG_TYPE,

	NFTA_NG_OFFSET,

	NFTA_NG_SET_NAME,

	NFTA_NG_SET_ID,

	NFTA_NG_SET_NAME,	/* deprecated */

	NFTA_NG_SET_ID,		/* deprecated */

	__NFTA_NG_MAX

};

#define NFTA_NG_MAX	(__NFTA_NG_MAX - 1)

net/netfilter/nft_numgen.c

+0 −127
Original line number Diff line number Diff line
@@ -24,7 +24,6 @@ struct nft_ng_inc { 
	u32			modulus;

	atomic_t		counter;

	u32			offset;

	struct nft_set		*map;

};



static u32 nft_ng_inc_gen(struct nft_ng_inc *priv)
@@ -48,34 +47,11 @@ static void nft_ng_inc_eval(const struct nft_expr *expr, 
	regs->data[priv->dreg] = nft_ng_inc_gen(priv);

}



static void nft_ng_inc_map_eval(const struct nft_expr *expr,

				struct nft_regs *regs,

				const struct nft_pktinfo *pkt)

{

	struct nft_ng_inc *priv = nft_expr_priv(expr);

	const struct nft_set *map = priv->map;

	const struct nft_set_ext *ext;

	u32 result;

	bool found;



	result = nft_ng_inc_gen(priv);

	found = map->ops->lookup(nft_net(pkt), map, &result, &ext);



	if (!found)

		return;



	nft_data_copy(&regs->data[priv->dreg],

		      nft_set_ext_data(ext), map->dlen);

}



static const struct nla_policy nft_ng_policy[NFTA_NG_MAX + 1] = {

	[NFTA_NG_DREG]		= { .type = NLA_U32 },

	[NFTA_NG_MODULUS]	= { .type = NLA_U32 },

	[NFTA_NG_TYPE]		= { .type = NLA_U32 },

	[NFTA_NG_OFFSET]	= { .type = NLA_U32 },

	[NFTA_NG_SET_NAME]	= { .type = NLA_STRING,

				    .len = NFT_SET_MAXNAMELEN - 1 },

	[NFTA_NG_SET_ID]	= { .type = NLA_U32 },

};



static int nft_ng_inc_init(const struct nft_ctx *ctx,
@@ -101,22 +77,6 @@ static int nft_ng_inc_init(const struct nft_ctx *ctx, 
					   NFT_DATA_VALUE, sizeof(u32));

}



static int nft_ng_inc_map_init(const struct nft_ctx *ctx,

			       const struct nft_expr *expr,

			       const struct nlattr * const tb[])

{

	struct nft_ng_inc *priv = nft_expr_priv(expr);

	u8 genmask = nft_genmask_next(ctx->net);



	nft_ng_inc_init(ctx, expr, tb);



	priv->map = nft_set_lookup_global(ctx->net, ctx->table,

					  tb[NFTA_NG_SET_NAME],

					  tb[NFTA_NG_SET_ID], genmask);



	return PTR_ERR_OR_ZERO(priv->map);

}



static int nft_ng_dump(struct sk_buff *skb, enum nft_registers dreg,

		       u32 modulus, enum nft_ng_types type, u32 offset)

{
@@ -143,27 +103,10 @@ static int nft_ng_inc_dump(struct sk_buff *skb, const struct nft_expr *expr) 
			   priv->offset);

}



static int nft_ng_inc_map_dump(struct sk_buff *skb,

			       const struct nft_expr *expr)

{

	const struct nft_ng_inc *priv = nft_expr_priv(expr);



	if (nft_ng_dump(skb, priv->dreg, priv->modulus,

			NFT_NG_INCREMENTAL, priv->offset) ||

	    nla_put_string(skb, NFTA_NG_SET_NAME, priv->map->name))

		goto nla_put_failure;



	return 0;



nla_put_failure:

	return -1;

}



struct nft_ng_random {

	enum nft_registers      dreg:8;

	u32			modulus;

	u32			offset;

	struct nft_set		*map;

};



static u32 nft_ng_random_gen(struct nft_ng_random *priv)
@@ -183,25 +126,6 @@ static void nft_ng_random_eval(const struct nft_expr *expr, 
	regs->data[priv->dreg] = nft_ng_random_gen(priv);

}



static void nft_ng_random_map_eval(const struct nft_expr *expr,

				   struct nft_regs *regs,

				   const struct nft_pktinfo *pkt)

{

	struct nft_ng_random *priv = nft_expr_priv(expr);

	const struct nft_set *map = priv->map;

	const struct nft_set_ext *ext;

	u32 result;

	bool found;



	result = nft_ng_random_gen(priv);

	found = map->ops->lookup(nft_net(pkt), map, &result, &ext);

	if (!found)

		return;



	nft_data_copy(&regs->data[priv->dreg],

		      nft_set_ext_data(ext), map->dlen);

}



static int nft_ng_random_init(const struct nft_ctx *ctx,

			      const struct nft_expr *expr,

			      const struct nlattr * const tb[])
@@ -226,21 +150,6 @@ static int nft_ng_random_init(const struct nft_ctx *ctx, 
					   NFT_DATA_VALUE, sizeof(u32));

}



static int nft_ng_random_map_init(const struct nft_ctx *ctx,

				  const struct nft_expr *expr,

				  const struct nlattr * const tb[])

{

	struct nft_ng_random *priv = nft_expr_priv(expr);

	u8 genmask = nft_genmask_next(ctx->net);



	nft_ng_random_init(ctx, expr, tb);

	priv->map = nft_set_lookup_global(ctx->net, ctx->table,

					  tb[NFTA_NG_SET_NAME],

					  tb[NFTA_NG_SET_ID], genmask);



	return PTR_ERR_OR_ZERO(priv->map);

}



static int nft_ng_random_dump(struct sk_buff *skb, const struct nft_expr *expr)

{

	const struct nft_ng_random *priv = nft_expr_priv(expr);
@@ -249,22 +158,6 @@ static int nft_ng_random_dump(struct sk_buff *skb, const struct nft_expr *expr) 
			   priv->offset);

}



static int nft_ng_random_map_dump(struct sk_buff *skb,

				  const struct nft_expr *expr)

{

	const struct nft_ng_random *priv = nft_expr_priv(expr);



	if (nft_ng_dump(skb, priv->dreg, priv->modulus,

			NFT_NG_RANDOM, priv->offset) ||

	    nla_put_string(skb, NFTA_NG_SET_NAME, priv->map->name))

		goto nla_put_failure;



	return 0;



nla_put_failure:

	return -1;

}



static struct nft_expr_type nft_ng_type;

static const struct nft_expr_ops nft_ng_inc_ops = {

	.type		= &nft_ng_type,
@@ -274,14 +167,6 @@ static const struct nft_expr_ops nft_ng_inc_ops = { 
	.dump		= nft_ng_inc_dump,

};



static const struct nft_expr_ops nft_ng_inc_map_ops = {

	.type		= &nft_ng_type,

	.size		= NFT_EXPR_SIZE(sizeof(struct nft_ng_inc)),

	.eval		= nft_ng_inc_map_eval,

	.init		= nft_ng_inc_map_init,

	.dump		= nft_ng_inc_map_dump,

};



static const struct nft_expr_ops nft_ng_random_ops = {

	.type		= &nft_ng_type,

	.size		= NFT_EXPR_SIZE(sizeof(struct nft_ng_random)),
@@ -290,14 +175,6 @@ static const struct nft_expr_ops nft_ng_random_ops = { 
	.dump		= nft_ng_random_dump,

};



static const struct nft_expr_ops nft_ng_random_map_ops = {

	.type		= &nft_ng_type,

	.size		= NFT_EXPR_SIZE(sizeof(struct nft_ng_random)),

	.eval		= nft_ng_random_map_eval,

	.init		= nft_ng_random_map_init,

	.dump		= nft_ng_random_map_dump,

};



static const struct nft_expr_ops *

nft_ng_select_ops(const struct nft_ctx *ctx, const struct nlattr * const tb[])

{
@@ -312,12 +189,8 @@ nft_ng_select_ops(const struct nft_ctx *ctx, const struct nlattr * const tb[]) 


	switch (type) {

	case NFT_NG_INCREMENTAL:

		if (tb[NFTA_NG_SET_NAME])

			return &nft_ng_inc_map_ops;

		return &nft_ng_inc_ops;

	case NFT_NG_RANDOM:

		if (tb[NFTA_NG_SET_NAME])

			return &nft_ng_random_map_ops;

		return &nft_ng_random_ops;

	}