Skip to content

L
linux
Commit fecf70b1 authored by Pablo Neira Ayuso's avatar Pablo Neira Ayuso Committed by Greg Kroah-Hartman
Browse files
Options

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

[ Upstream commit 4269fea7 ]

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>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent 67b261d7
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 129 deletions
include/uapi/linux/netfilter/nf_tables.h
View file @ fecf70b1
...@@ -1581,8 +1581,8 @@ enum nft_ng_attributes { ...@@ -1581,8 +1581,8 @@ enum nft_ng_attributes {
NFTA_NG_MODULUS, NFTA_NG_MODULUS,
NFTA_NG_TYPE, NFTA_NG_TYPE,
NFTA_NG_OFFSET, NFTA_NG_OFFSET,
NFTA_NG_SET_NAME, NFTA_NG_SET_NAME, /* deprecated */
NFTA_NG_SET_ID, NFTA_NG_SET_ID, /* deprecated */
__NFTA_NG_MAX __NFTA_NG_MAX
}; };
#define NFTA_NG_MAX (__NFTA_NG_MAX - 1) #define NFTA_NG_MAX (__NFTA_NG_MAX - 1)
......
net/netfilter/nft_numgen.c
View file @ fecf70b1
...@@ -24,7 +24,6 @@ struct nft_ng_inc { ...@@ -24,7 +24,6 @@ struct nft_ng_inc {
u32 modulus; u32 modulus;
atomic_t counter; atomic_t counter;
u32 offset; u32 offset;
struct nft_set *map;
}; };
static u32 nft_ng_inc_gen(struct nft_ng_inc *priv) 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, ...@@ -48,34 +47,11 @@ static void nft_ng_inc_eval(const struct nft_expr *expr,
regs->data[priv->dreg] = nft_ng_inc_gen(priv); 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] = { static const struct nla_policy nft_ng_policy[NFTA_NG_MAX + 1] = {
[NFTA_NG_DREG] = { .type = NLA_U32 }, [NFTA_NG_DREG] = { .type = NLA_U32 },
[NFTA_NG_MODULUS] = { .type = NLA_U32 }, [NFTA_NG_MODULUS] = { .type = NLA_U32 },
[NFTA_NG_TYPE] = { .type = NLA_U32 }, [NFTA_NG_TYPE] = { .type = NLA_U32 },
[NFTA_NG_OFFSET] = { .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, 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, ...@@ -101,22 +77,6 @@ static int nft_ng_inc_init(const struct nft_ctx *ctx,
NFT_DATA_VALUE, sizeof(u32)); 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, static int nft_ng_dump(struct sk_buff *skb, enum nft_registers dreg,
u32 modulus, enum nft_ng_types type, u32 offset) 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) ...@@ -143,27 +103,10 @@ static int nft_ng_inc_dump(struct sk_buff *skb, const struct nft_expr *expr)
priv->offset); 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 { struct nft_ng_random {
enum nft_registers dreg:8; enum nft_registers dreg:8;
u32 modulus; u32 modulus;
u32 offset; u32 offset;
struct nft_set *map;
}; };
static u32 nft_ng_random_gen(struct nft_ng_random *priv) 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, ...@@ -183,25 +126,6 @@ static void nft_ng_random_eval(const struct nft_expr *expr,
regs->data[priv->dreg] = nft_ng_random_gen(priv); 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, static int nft_ng_random_init(const struct nft_ctx *ctx,
const struct nft_expr *expr, const struct nft_expr *expr,
const struct nlattr * const tb[]) const struct nlattr * const tb[])
...@@ -226,21 +150,6 @@ static int nft_ng_random_init(const struct nft_ctx *ctx, ...@@ -226,21 +150,6 @@ static int nft_ng_random_init(const struct nft_ctx *ctx,
NFT_DATA_VALUE, sizeof(u32)); 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) 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); 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) ...@@ -249,22 +158,6 @@ static int nft_ng_random_dump(struct sk_buff *skb, const struct nft_expr *expr)
priv->offset); 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 struct nft_expr_type nft_ng_type;
static const struct nft_expr_ops nft_ng_inc_ops = { static const struct nft_expr_ops nft_ng_inc_ops = {
.type = &nft_ng_type, .type = &nft_ng_type,
...@@ -274,14 +167,6 @@ static const struct nft_expr_ops nft_ng_inc_ops = { ...@@ -274,14 +167,6 @@ static const struct nft_expr_ops nft_ng_inc_ops = {
.dump = nft_ng_inc_dump, .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 = { static const struct nft_expr_ops nft_ng_random_ops = {
.type = &nft_ng_type, .type = &nft_ng_type,
.size = NFT_EXPR_SIZE(sizeof(struct nft_ng_random)), .size = NFT_EXPR_SIZE(sizeof(struct nft_ng_random)),
...@@ -290,14 +175,6 @@ static const struct nft_expr_ops nft_ng_random_ops = { ...@@ -290,14 +175,6 @@ static const struct nft_expr_ops nft_ng_random_ops = {
.dump = nft_ng_random_dump, .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 * static const struct nft_expr_ops *
nft_ng_select_ops(const struct nft_ctx *ctx, const struct nlattr * const tb[]) 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[]) ...@@ -312,12 +189,8 @@ nft_ng_select_ops(const struct nft_ctx *ctx, const struct nlattr * const tb[])
switch (type) { switch (type) {
case NFT_NG_INCREMENTAL: case NFT_NG_INCREMENTAL:
if (tb[NFTA_NG_SET_NAME])
return &nft_ng_inc_map_ops;
return &nft_ng_inc_ops; return &nft_ng_inc_ops;
case NFT_NG_RANDOM: case NFT_NG_RANDOM:
if (tb[NFTA_NG_SET_NAME])
return &nft_ng_random_map_ops;
return &nft_ng_random_ops; return &nft_ng_random_ops;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7