netfilter: nf_tables: Use nla_put_be32() to dump immediate parameters

nft_dump_register() should only be used with registers, not with
immediates.

Fixes: cb1b69b0b15b ("netfilter: nf_tables: add hash expression")
Fixes: 91dbc6be0a62("netfilter: nf_tables: add number generator expression")
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>

diff --git a/net/netfilter/nft_hash.c b/net/netfilter/nft_hash.c
index e090aeef3a784dad4f823efca09e12bd17274063..764251d31e4653337bb6728f13b51565d9557e3e 100644 (file)
--- a/net/netfilter/nft_hash.c
+++ b/net/netfilter/nft_hash.c
@@ -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;

diff --git a/net/netfilter/nft_numgen.c b/net/netfilter/nft_numgen.c
index 176e26d5bbd032855ea3537282e5d00e3a12688a..294745ecb0fcca6d6738dcf108db6ac82b0073db 100644 (file)
--- a/net/netfilter/nft_numgen.c
+++ b/net/netfilter/nft_numgen.c
@@ -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;