netfilter: nf_tables: reject NFT_SET_CONCAT with not field length description

[ Upstream commit 113661e07460a6604aacc8ae1b23695a89e7d4b3 ]

It is still possible to set on the NFT_SET_CONCAT flag by specifying a
set size and no field description, report EINVAL in such case.

Fixes: 1b6345d4160e ("netfilter: nf_tables: check NFT_SET_CONCAT flag if field_count is specified")
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/net/netfilter/nf_tables_api.c b/net/netfilter/nf_tables_api.c
index 967ad439e6b34fb98cff82dcd2668596eaea4e26..e2e3ccbb635fa69f2a2056ca1af3cb09d6a0f7c8 100644 (file)
--- a/net/netfilter/nf_tables_api.c
+++ b/net/netfilter/nf_tables_api.c
@@ -4703,8 +4703,12 @@ static int nf_tables_newset(struct sk_buff *skb, const struct nfnl_info *info,
                if (err < 0)
                        return err;
 
-               if (desc.field_count > 1 && !(flags & NFT_SET_CONCAT))
+               if (desc.field_count > 1) {
+                       if (!(flags & NFT_SET_CONCAT))
+                               return -EINVAL;
+               } else if (flags & NFT_SET_CONCAT) {
                        return -EINVAL;
+               }
        } else if (flags & NFT_SET_CONCAT) {
                return -EINVAL;
        }