Skip to content

Commit b1c96ed

Browse files
kaberummakynes
kaber
authored and
ummakynes
committed
netfilter: nf_tables: add register parsing/dumping helpers
Add helper functions to parse and dump register values in netlink attributes. These helpers will later be changed to take care of translation between the old 128 bit and the new 32 bit register numbers. Signed-off-by: Patrick McHardy <kaber@trash.net> Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
1 parent 8cd8937 commit b1c96ed

File tree

15 files changed

+68
-53
lines changed

15 files changed

+68
-53
lines changed

‎include/net/netfilter/nf_tables.h‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -128,6 +128,9 @@ static inline enum nft_registers nft_type_to_reg(enum nft_data_types type)
128128
return type == NFT_DATA_VERDICT ? NFT_REG_VERDICT : NFT_REG_1;
129129
}
130130

131+
unsigned int nft_parse_register(const struct nlattr *attr);
132+
int nft_dump_register(struct sk_buff *skb, unsigned int attr, unsigned int reg);
133+
131134
int nft_validate_register_load(enum nft_registers reg, unsigned int len);
132135
int nft_validate_register_store(const struct nft_ctx *ctx,
133136
enum nft_registers reg,

‎net/bridge/netfilter/nft_meta_bridge.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ static int nft_meta_bridge_get_init(const struct nft_ctx *ctx,
6565
return nft_meta_get_init(ctx, expr, tb);
6666
}
6767

68-
priv->dreg = ntohl(nla_get_be32(tb[NFTA_META_DREG]));
68+
priv->dreg = nft_parse_register(tb[NFTA_META_DREG]);
6969
return nft_validate_register_store(ctx, priv->dreg, NULL,
7070
NFT_DATA_VALUE, len);
7171
}

‎net/netfilter/nf_tables_api.c‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4122,6 +4122,18 @@ static int nf_tables_check_loops(const struct nft_ctx *ctx,
41224122
return 0;
41234123
}
41244124

4125+
unsigned int nft_parse_register(const struct nlattr *attr)
4126+
{
4127+
return ntohl(nla_get_be32(attr));
4128+
}
4129+
EXPORT_SYMBOL_GPL(nft_parse_register);
4130+
4131+
int nft_dump_register(struct sk_buff *skb, unsigned int attr, unsigned int reg)
4132+
{
4133+
return nla_put_be32(skb, attr, htonl(reg));
4134+
}
4135+
EXPORT_SYMBOL_GPL(nft_dump_register);
4136+
41254137
/**
41264138
* nft_validate_register_load - validate a load from a register
41274139
*

‎net/netfilter/nft_bitwise.c‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -62,12 +62,12 @@ static int nft_bitwise_init(const struct nft_ctx *ctx,
6262
return -EINVAL;
6363

6464
priv->len = ntohl(nla_get_be32(tb[NFTA_BITWISE_LEN]));
65-
priv->sreg = ntohl(nla_get_be32(tb[NFTA_BITWISE_SREG]));
65+
priv->sreg = nft_parse_register(tb[NFTA_BITWISE_SREG]);
6666
err = nft_validate_register_load(priv->sreg, priv->len);
6767
if (err < 0)
6868
return err;
6969

70-
priv->dreg = ntohl(nla_get_be32(tb[NFTA_BITWISE_DREG]));
70+
priv->dreg = nft_parse_register(tb[NFTA_BITWISE_DREG]);
7171
err = nft_validate_register_store(ctx, priv->dreg, NULL,
7272
NFT_DATA_VALUE, priv->len);
7373
if (err < 0)
@@ -92,9 +92,9 @@ static int nft_bitwise_dump(struct sk_buff *skb, const struct nft_expr *expr)
9292
{
9393
const struct nft_bitwise *priv = nft_expr_priv(expr);
9494

95-
if (nla_put_be32(skb, NFTA_BITWISE_SREG, htonl(priv->sreg)))
95+
if (nft_dump_register(skb, NFTA_BITWISE_SREG, priv->sreg))
9696
goto nla_put_failure;
97-
if (nla_put_be32(skb, NFTA_BITWISE_DREG, htonl(priv->dreg)))
97+
if (nft_dump_register(skb, NFTA_BITWISE_DREG, priv->dreg))
9898
goto nla_put_failure;
9999
if (nla_put_be32(skb, NFTA_BITWISE_LEN, htonl(priv->len)))
100100
goto nla_put_failure;

‎net/netfilter/nft_byteorder.c‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -106,13 +106,13 @@ static int nft_byteorder_init(const struct nft_ctx *ctx,
106106
return -EINVAL;
107107
}
108108

109-
priv->sreg = ntohl(nla_get_be32(tb[NFTA_BYTEORDER_SREG]));
109+
priv->sreg = nft_parse_register(tb[NFTA_BYTEORDER_SREG]);
110110
priv->len = ntohl(nla_get_be32(tb[NFTA_BYTEORDER_LEN]));
111111
err = nft_validate_register_load(priv->sreg, priv->len);
112112
if (err < 0)
113113
return err;
114114

115-
priv->dreg = ntohl(nla_get_be32(tb[NFTA_BYTEORDER_DREG]));
115+
priv->dreg = nft_parse_register(tb[NFTA_BYTEORDER_DREG]);
116116
return nft_validate_register_store(ctx, priv->dreg, NULL,
117117
NFT_DATA_VALUE, priv->len);
118118
}
@@ -121,9 +121,9 @@ static int nft_byteorder_dump(struct sk_buff *skb, const struct nft_expr *expr)
121121
{
122122
const struct nft_byteorder *priv = nft_expr_priv(expr);
123123

124-
if (nla_put_be32(skb, NFTA_BYTEORDER_SREG, htonl(priv->sreg)))
124+
if (nft_dump_register(skb, NFTA_BYTEORDER_SREG, priv->sreg))
125125
goto nla_put_failure;
126-
if (nla_put_be32(skb, NFTA_BYTEORDER_DREG, htonl(priv->dreg)))
126+
if (nft_dump_register(skb, NFTA_BYTEORDER_DREG, priv->dreg))
127127
goto nla_put_failure;
128128
if (nla_put_be32(skb, NFTA_BYTEORDER_OP, htonl(priv->op)))
129129
goto nla_put_failure;

‎net/netfilter/nft_cmp.c‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ static int nft_cmp_init(const struct nft_ctx *ctx, const struct nft_expr *expr,
7878
err = nft_data_init(NULL, &priv->data, &desc, tb[NFTA_CMP_DATA]);
7979
BUG_ON(err < 0);
8080

81-
priv->sreg = ntohl(nla_get_be32(tb[NFTA_CMP_SREG]));
81+
priv->sreg = nft_parse_register(tb[NFTA_CMP_SREG]);
8282
err = nft_validate_register_load(priv->sreg, desc.len);
8383
if (err < 0)
8484
return err;
@@ -92,7 +92,7 @@ static int nft_cmp_dump(struct sk_buff *skb, const struct nft_expr *expr)
9292
{
9393
const struct nft_cmp_expr *priv = nft_expr_priv(expr);
9494

95-
if (nla_put_be32(skb, NFTA_CMP_SREG, htonl(priv->sreg)))
95+
if (nft_dump_register(skb, NFTA_CMP_SREG, priv->sreg))
9696
goto nla_put_failure;
9797
if (nla_put_be32(skb, NFTA_CMP_OP, htonl(priv->op)))
9898
goto nla_put_failure;
@@ -128,7 +128,7 @@ static int nft_cmp_fast_init(const struct nft_ctx *ctx,
128128
err = nft_data_init(NULL, &data, &desc, tb[NFTA_CMP_DATA]);
129129
BUG_ON(err < 0);
130130

131-
priv->sreg = ntohl(nla_get_be32(tb[NFTA_CMP_SREG]));
131+
priv->sreg = nft_parse_register(tb[NFTA_CMP_SREG]);
132132
err = nft_validate_register_load(priv->sreg, desc.len);
133133
if (err < 0)
134134
return err;
@@ -146,7 +146,7 @@ static int nft_cmp_fast_dump(struct sk_buff *skb, const struct nft_expr *expr)
146146
const struct nft_cmp_fast_expr *priv = nft_expr_priv(expr);
147147
struct nft_data data;
148148

149-
if (nla_put_be32(skb, NFTA_CMP_SREG, htonl(priv->sreg)))
149+
if (nft_dump_register(skb, NFTA_CMP_SREG, priv->sreg))
150150
goto nla_put_failure;
151151
if (nla_put_be32(skb, NFTA_CMP_OP, htonl(NFT_CMP_EQ)))
152152
goto nla_put_failure;

‎net/netfilter/nft_ct.c‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -306,7 +306,7 @@ static int nft_ct_get_init(const struct nft_ctx *ctx,
306306
}
307307
}
308308

309-
priv->dreg = ntohl(nla_get_be32(tb[NFTA_CT_DREG]));
309+
priv->dreg = nft_parse_register(tb[NFTA_CT_DREG]);
310310
err = nft_validate_register_store(ctx, priv->dreg, NULL,
311311
NFT_DATA_VALUE, len);
312312
if (err < 0)
@@ -338,7 +338,7 @@ static int nft_ct_set_init(const struct nft_ctx *ctx,
338338
return -EOPNOTSUPP;
339339
}
340340

341-
priv->sreg = ntohl(nla_get_be32(tb[NFTA_CT_SREG]));
341+
priv->sreg = nft_parse_register(tb[NFTA_CT_SREG]);
342342
err = nft_validate_register_load(priv->sreg, len);
343343
if (err < 0)
344344
return err;
@@ -360,7 +360,7 @@ static int nft_ct_get_dump(struct sk_buff *skb, const struct nft_expr *expr)
360360
{
361361
const struct nft_ct *priv = nft_expr_priv(expr);
362362

363-
if (nla_put_be32(skb, NFTA_CT_DREG, htonl(priv->dreg)))
363+
if (nft_dump_register(skb, NFTA_CT_DREG, priv->dreg))
364364
goto nla_put_failure;
365365
if (nla_put_be32(skb, NFTA_CT_KEY, htonl(priv->key)))
366366
goto nla_put_failure;
@@ -387,7 +387,7 @@ static int nft_ct_set_dump(struct sk_buff *skb, const struct nft_expr *expr)
387387
{
388388
const struct nft_ct *priv = nft_expr_priv(expr);
389389

390-
if (nla_put_be32(skb, NFTA_CT_SREG, htonl(priv->sreg)))
390+
if (nft_dump_register(skb, NFTA_CT_SREG, priv->sreg))
391391
goto nla_put_failure;
392392
if (nla_put_be32(skb, NFTA_CT_KEY, htonl(priv->key)))
393393
goto nla_put_failure;

‎net/netfilter/nft_dynset.c‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,7 @@ static int nft_dynset_init(const struct nft_ctx *ctx,
124124
timeout = be64_to_cpu(nla_get_be64(tb[NFTA_DYNSET_TIMEOUT]));
125125
}
126126

127-
priv->sreg_key = ntohl(nla_get_be32(tb[NFTA_DYNSET_SREG_KEY]));
127+
priv->sreg_key = nft_parse_register(tb[NFTA_DYNSET_SREG_KEY]);
128128
err = nft_validate_register_load(priv->sreg_key, set->klen);;
129129
if (err < 0)
130130
return err;
@@ -135,7 +135,7 @@ static int nft_dynset_init(const struct nft_ctx *ctx,
135135
if (set->dtype == NFT_DATA_VERDICT)
136136
return -EOPNOTSUPP;
137137

138-
priv->sreg_data = ntohl(nla_get_be32(tb[NFTA_DYNSET_SREG_DATA]));
138+
priv->sreg_data = nft_parse_register(tb[NFTA_DYNSET_SREG_DATA]);
139139
err = nft_validate_register_load(priv->sreg_data, set->dlen);
140140
if (err < 0)
141141
return err;
@@ -173,10 +173,10 @@ static int nft_dynset_dump(struct sk_buff *skb, const struct nft_expr *expr)
173173
{
174174
const struct nft_dynset *priv = nft_expr_priv(expr);
175175

176-
if (nla_put_be32(skb, NFTA_DYNSET_SREG_KEY, htonl(priv->sreg_key)))
176+
if (nft_dump_register(skb, NFTA_DYNSET_SREG_KEY, priv->sreg_key))
177177
goto nla_put_failure;
178178
if (priv->set->flags & NFT_SET_MAP &&
179-
nla_put_be32(skb, NFTA_DYNSET_SREG_DATA, htonl(priv->sreg_data)))
179+
nft_dump_register(skb, NFTA_DYNSET_SREG_DATA, priv->sreg_data))
180180
goto nla_put_failure;
181181
if (nla_put_be32(skb, NFTA_DYNSET_OP, htonl(priv->op)))
182182
goto nla_put_failure;

‎net/netfilter/nft_exthdr.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ static int nft_exthdr_init(const struct nft_ctx *ctx,
6868
priv->type = nla_get_u8(tb[NFTA_EXTHDR_TYPE]);
6969
priv->offset = ntohl(nla_get_be32(tb[NFTA_EXTHDR_OFFSET]));
7070
priv->len = ntohl(nla_get_be32(tb[NFTA_EXTHDR_LEN]));
71-
priv->dreg = ntohl(nla_get_be32(tb[NFTA_EXTHDR_DREG]));
71+
priv->dreg = nft_parse_register(tb[NFTA_EXTHDR_DREG]);
7272

7373
return nft_validate_register_store(ctx, priv->dreg, NULL,
7474
NFT_DATA_VALUE, priv->len);
@@ -78,7 +78,7 @@ static int nft_exthdr_dump(struct sk_buff *skb, const struct nft_expr *expr)
7878
{
7979
const struct nft_exthdr *priv = nft_expr_priv(expr);
8080

81-
if (nla_put_be32(skb, NFTA_EXTHDR_DREG, htonl(priv->dreg)))
81+
if (nft_dump_register(skb, NFTA_EXTHDR_DREG, priv->dreg))
8282
goto nla_put_failure;
8383
if (nla_put_u8(skb, NFTA_EXTHDR_TYPE, priv->type))
8484
goto nla_put_failure;

‎net/netfilter/nft_immediate.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ static int nft_immediate_init(const struct nft_ctx *ctx,
5454
return err;
5555
priv->dlen = desc.len;
5656

57-
priv->dreg = ntohl(nla_get_be32(tb[NFTA_IMMEDIATE_DREG]));
57+
priv->dreg = nft_parse_register(tb[NFTA_IMMEDIATE_DREG]);
5858
err = nft_validate_register_store(ctx, priv->dreg, &priv->data,
5959
desc.type, desc.len);
6060
if (err < 0)
@@ -78,7 +78,7 @@ static int nft_immediate_dump(struct sk_buff *skb, const struct nft_expr *expr)
7878
{
7979
const struct nft_immediate_expr *priv = nft_expr_priv(expr);
8080

81-
if (nla_put_be32(skb, NFTA_IMMEDIATE_DREG, htonl(priv->dreg)))
81+
if (nft_dump_register(skb, NFTA_IMMEDIATE_DREG, priv->dreg))
8282
goto nla_put_failure;
8383

8484
return nft_data_dump(skb, NFTA_IMMEDIATE_DATA, &priv->data,

0 commit comments

Comments
 (0)