Merge tag 'for-5.6-rc1-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux

[linux.git] / net / netfilter / nft_set_rbtree.c

diff --git a/net/netfilter/nft_set_rbtree.c b/net/netfilter/nft_set_rbtree.c
index a9f804f7a04ac699fd171b72b64881bba0cd0208..5000b938ab1eaf71af879b81b55ce0d226a3f1dc 100644 (file)
--- a/net/netfilter/nft_set_rbtree.c
+++ b/net/netfilter/nft_set_rbtree.c
@@ -466,6 +466,9 @@ static void nft_rbtree_destroy(const struct nft_set *set)
 static bool nft_rbtree_estimate(const struct nft_set_desc *desc, u32 features,
                                struct nft_set_estimate *est)
 {
+       if (desc->field_count > 1)
+               return false;
+
        if (desc->size)
                est->size = sizeof(struct nft_rbtree) +
                            desc->size * sizeof(struct nft_rbtree_elem);