Skip to content

Commit 1ec1021

Browse files
kaberummakynes
kaber
authored and
ummakynes
committed
netfilter: nf_tables: rename nft_validate_data_load()
The existing name is ambiguous, data is loaded as well when we read from a register. Rename to nft_validate_register_store() for clarity and consistency with the upcoming patch to introduce its counterpart, nft_validate_register_load(). Signed-off-by: Patrick McHardy <kaber@trash.net> Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
1 parent 45d9bcd commit 1ec1021

File tree

10 files changed

+33
-30
lines changed

10 files changed

+33
-30
lines changed

‎include/net/netfilter/nf_tables.h‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -114,9 +114,10 @@ static inline enum nft_registers nft_type_to_reg(enum nft_data_types type)
114114

115115
int nft_validate_input_register(enum nft_registers reg);
116116
int nft_validate_output_register(enum nft_registers reg);
117-
int nft_validate_data_load(const struct nft_ctx *ctx, enum nft_registers reg,
118-
const struct nft_data *data,
119-
enum nft_data_types type, unsigned int len);
117+
int nft_validate_register_store(const struct nft_ctx *ctx,
118+
enum nft_registers reg,
119+
const struct nft_data *data,
120+
enum nft_data_types type, unsigned int len);
120121

121122

122123
/**

‎net/bridge/netfilter/nft_meta_bridge.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -71,8 +71,8 @@ static int nft_meta_bridge_get_init(const struct nft_ctx *ctx,
7171
if (err < 0)
7272
return err;
7373

74-
err = nft_validate_data_load(ctx, priv->dreg, NULL,
75-
NFT_DATA_VALUE, len);
74+
err = nft_validate_register_store(ctx, priv->dreg, NULL,
75+
NFT_DATA_VALUE, len);
7676
if (err < 0)
7777
return err;
7878

‎net/netfilter/nf_tables_api.c‎

Lines changed: 13 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -2797,10 +2797,10 @@ static int nf_tables_bind_check_setelem(const struct nft_ctx *ctx,
27972797
enum nft_registers dreg;
27982798

27992799
dreg = nft_type_to_reg(set->dtype);
2800-
return nft_validate_data_load(ctx, dreg, nft_set_ext_data(ext),
2801-
set->dtype == NFT_DATA_VERDICT ?
2802-
NFT_DATA_VERDICT : NFT_DATA_VALUE,
2803-
set->dlen);
2800+
return nft_validate_register_store(ctx, dreg, nft_set_ext_data(ext),
2801+
set->dtype == NFT_DATA_VERDICT ?
2802+
NFT_DATA_VERDICT : NFT_DATA_VALUE,
2803+
set->dlen);
28042804
}
28052805

28062806
int nf_tables_bind_set(const struct nft_ctx *ctx, struct nft_set *set,
@@ -3334,8 +3334,9 @@ static int nft_add_set_elem(struct nft_ctx *ctx, struct nft_set *set,
33343334
if (!(binding->flags & NFT_SET_MAP))
33353335
continue;
33363336

3337-
err = nft_validate_data_load(&bind_ctx, dreg,
3338-
&data, d2.type, d2.len);
3337+
err = nft_validate_register_store(&bind_ctx, dreg,
3338+
&data,
3339+
d2.type, d2.len);
33393340
if (err < 0)
33403341
goto err3;
33413342
}
@@ -4157,7 +4158,7 @@ int nft_validate_output_register(enum nft_registers reg)
41574158
EXPORT_SYMBOL_GPL(nft_validate_output_register);
41584159

41594160
/**
4160-
* nft_validate_data_load - validate an expressions' data load
4161+
* nft_validate_register_store - validate an expressions' register store
41614162
*
41624163
* @ctx: context of the expression performing the load
41634164
* @reg: the destination register number
@@ -4170,9 +4171,10 @@ EXPORT_SYMBOL_GPL(nft_validate_output_register);
41704171
* A value of NULL for the data means that its runtime gathered
41714172
* data, which is always of type NFT_DATA_VALUE.
41724173
*/
4173-
int nft_validate_data_load(const struct nft_ctx *ctx, enum nft_registers reg,
4174-
const struct nft_data *data,
4175-
enum nft_data_types type, unsigned int len)
4174+
int nft_validate_register_store(const struct nft_ctx *ctx,
4175+
enum nft_registers reg,
4176+
const struct nft_data *data,
4177+
enum nft_data_types type, unsigned int len)
41764178
{
41774179
int err;
41784180

@@ -4204,7 +4206,7 @@ int nft_validate_data_load(const struct nft_ctx *ctx, enum nft_registers reg,
42044206
return 0;
42054207
}
42064208
}
4207-
EXPORT_SYMBOL_GPL(nft_validate_data_load);
4209+
EXPORT_SYMBOL_GPL(nft_validate_register_store);
42084210

42094211
static const struct nla_policy nft_verdict_policy[NFTA_VERDICT_MAX + 1] = {
42104212
[NFTA_VERDICT_CODE] = { .type = NLA_U32 },

‎net/netfilter/nft_bitwise.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -75,8 +75,8 @@ static int nft_bitwise_init(const struct nft_ctx *ctx,
7575
if (err < 0)
7676
return err;
7777

78-
err = nft_validate_data_load(ctx, priv->dreg, NULL,
79-
NFT_DATA_VALUE, priv->len);
78+
err = nft_validate_register_store(ctx, priv->dreg, NULL,
79+
NFT_DATA_VALUE, priv->len);
8080
if (err < 0)
8181
return err;
8282

‎net/netfilter/nft_byteorder.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -118,8 +118,8 @@ static int nft_byteorder_init(const struct nft_ctx *ctx,
118118
err = nft_validate_output_register(priv->dreg);
119119
if (err < 0)
120120
return err;
121-
err = nft_validate_data_load(ctx, priv->dreg, NULL,
122-
NFT_DATA_VALUE, priv->len);
121+
err = nft_validate_register_store(ctx, priv->dreg, NULL,
122+
NFT_DATA_VALUE, priv->len);
123123
if (err < 0)
124124
return err;
125125

‎net/netfilter/nft_ct.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -311,8 +311,8 @@ static int nft_ct_get_init(const struct nft_ctx *ctx,
311311
if (err < 0)
312312
return err;
313313

314-
err = nft_validate_data_load(ctx, priv->dreg, NULL,
315-
NFT_DATA_VALUE, len);
314+
err = nft_validate_register_store(ctx, priv->dreg, NULL,
315+
NFT_DATA_VALUE, len);
316316
if (err < 0)
317317
return err;
318318

‎net/netfilter/nft_exthdr.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -74,8 +74,8 @@ static int nft_exthdr_init(const struct nft_ctx *ctx,
7474
err = nft_validate_output_register(priv->dreg);
7575
if (err < 0)
7676
return err;
77-
return nft_validate_data_load(ctx, priv->dreg, NULL,
78-
NFT_DATA_VALUE, priv->len);
77+
return nft_validate_register_store(ctx, priv->dreg, NULL,
78+
NFT_DATA_VALUE, priv->len);
7979
}
8080

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

‎net/netfilter/nft_immediate.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -59,8 +59,8 @@ static int nft_immediate_init(const struct nft_ctx *ctx,
5959
return err;
6060
priv->dlen = desc.len;
6161

62-
err = nft_validate_data_load(ctx, priv->dreg, &priv->data,
63-
desc.type, desc.len);
62+
err = nft_validate_register_store(ctx, priv->dreg, &priv->data,
63+
desc.type, desc.len);
6464
if (err < 0)
6565
goto err1;
6666

‎net/netfilter/nft_meta.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -262,8 +262,8 @@ int nft_meta_get_init(const struct nft_ctx *ctx,
262262
if (err < 0)
263263
return err;
264264

265-
err = nft_validate_data_load(ctx, priv->dreg, NULL,
266-
NFT_DATA_VALUE, len);
265+
err = nft_validate_register_store(ctx, priv->dreg, NULL,
266+
NFT_DATA_VALUE, len);
267267
if (err < 0)
268268
return err;
269269

‎net/netfilter/nft_payload.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -72,8 +72,8 @@ static int nft_payload_init(const struct nft_ctx *ctx,
7272
err = nft_validate_output_register(priv->dreg);
7373
if (err < 0)
7474
return err;
75-
return nft_validate_data_load(ctx, priv->dreg, NULL,
76-
NFT_DATA_VALUE, priv->len);
75+
return nft_validate_register_store(ctx, priv->dreg, NULL,
76+
NFT_DATA_VALUE, priv->len);
7777
}
7878

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

0 commit comments

Comments
 (0)