netfilter: nf_tables: relax NFTA_SET_ELEM_KEY_END set flags requirements

Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=2134544
Upstream Status: commit 96df836

commit 96df836
Author: Pablo Neira Ayuso <pablo@netfilter.org>
Date:   Mon Oct 17 14:12:58 2022 +0200

    netfilter: nf_tables: relax NFTA_SET_ELEM_KEY_END set flags requirements

    Otherwise EINVAL is bogusly reported to userspace when deleting a set
    element. NFTA_SET_ELEM_KEY_END does not need to be set in case of:

    - insertion: if not present, start key is used as end key.
    - deletion: only start key needs to be specified, end key is ignored.

    Hence, relax the sanity check.

    Fixes: 88cccd9 ("netfilter: nf_tables: NFTA_SET_ELEM_KEY_END requires concat and interval flags")
    Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>

Signed-off-by: Florian Westphal <fwestpha@redhat.com>

Author: fw-strlen

net/netfilter/nf_tables_api.c

@@ -5735,8 +5735,9 @@ static bool nft_setelem_valid_key_end(const struct nft_set *set,
 			  (NFT_SET_CONCAT | NFT_SET_INTERVAL)) {
 		if (flags & NFT_SET_ELEM_INTERVAL_END)
 			return false;
-		if (!nla[NFTA_SET_ELEM_KEY_END] &&
-		    !(flags & NFT_SET_ELEM_CATCHALL))
+
+		if (nla[NFTA_SET_ELEM_KEY_END] &&
+		    flags & NFT_SET_ELEM_CATCHALL)
 			return false;
 	} else {
 		if (nla[NFTA_SET_ELEM_KEY_END])