Skip to content

Commit

Permalink
netfilter: nf_tables: Use nla_put_be32() to dump immediate parameters
Browse files Browse the repository at this point in the history
nft_dump_register() should only be used with registers, not with
immediates.

Fixes: cb1b69b ("netfilter: nf_tables: add hash expression")
Fixes: 91dbc6b("netfilter: nf_tables: add number generator expression")
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
  • Loading branch information
Pablo Neira Ayuso committed Aug 26, 2016
1 parent c016c7e commit 7073b16
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 5 deletions.
6 changes: 3 additions & 3 deletions net/netfilter/nft_hash.c
Original file line number Diff line number Diff line change
Expand Up @@ -88,11 +88,11 @@ static int nft_hash_dump(struct sk_buff *skb,
goto nla_put_failure;
if (nft_dump_register(skb, NFTA_HASH_DREG, priv->dreg))
goto nla_put_failure;
if (nft_dump_register(skb, NFTA_HASH_LEN, priv->len))
if (nla_put_be32(skb, NFTA_HASH_LEN, htonl(priv->len)))
goto nla_put_failure;
if (nft_dump_register(skb, NFTA_HASH_MODULUS, priv->modulus))
if (nla_put_be32(skb, NFTA_HASH_MODULUS, htonl(priv->modulus)))
goto nla_put_failure;
if (nft_dump_register(skb, NFTA_HASH_SEED, priv->seed))
if (nla_put_be32(skb, NFTA_HASH_SEED, htonl(priv->seed)))
goto nla_put_failure;

return 0;
Expand Down
4 changes: 2 additions & 2 deletions net/netfilter/nft_numgen.c
Original file line number Diff line number Diff line change
Expand Up @@ -68,9 +68,9 @@ static int nft_ng_dump(struct sk_buff *skb, enum nft_registers dreg,
{
if (nft_dump_register(skb, NFTA_NG_DREG, dreg))
goto nla_put_failure;
if (nft_dump_register(skb, NFTA_NG_UNTIL, until))
if (nla_put_be32(skb, NFTA_NG_UNTIL, htonl(until)))
goto nla_put_failure;
if (nft_dump_register(skb, NFTA_NG_TYPE, type))
if (nla_put_be32(skb, NFTA_NG_TYPE, htonl(type)))
goto nla_put_failure;

return 0;
Expand Down

0 comments on commit 7073b16

Please sign in to comment.