netfilter: nft_hash: fix hash overflow validation

The overflow validation in the init() function establishes that the
maximum value that the hash could reach is less than U32_MAX, which is
likely to be true.

The fix detects the overflow when the maximum hash value is less than
the offset itself.

Fixes: 70ca767ea1b2 ("netfilter: nft_hash: Add hash offset value")
Reported-by: Liping Zhang <liping.zhang@spreadtrum.com>
Signed-off-by: Laura Garcia Liebana <nevola@gmail.com>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>

diff --git a/net/netfilter/nft_hash.c b/net/netfilter/nft_hash.c
index bd12f7a801c2e7ed3271fff92256145a7beae84c..09473b415b95b281c3264cda23d446dd5a3d56ab 100644 (file)
--- a/net/netfilter/nft_hash.c
+++ b/net/netfilter/nft_hash.c
@@ -76,7 +76,7 @@ static int nft_hash_init(const struct nft_ctx *ctx,
        if (priv->modulus <= 1)
                return -ERANGE;
 
-       if (priv->offset + priv->modulus - 1 < U32_MAX)
+       if (priv->offset + priv->modulus - 1 < priv->offset)
                return -EOVERFLOW;
 
        priv->seed = ntohl(nla_get_be32(tb[NFTA_HASH_SEED]));