Commit 292781c3 authored by Pablo Neira Ayuso's avatar Pablo Neira Ayuso

netfilter: nft_compat: reject unused compat flag

Flag (1 << 0) is ignored is set, never used, reject it it with EINVAL
instead.

Fixes: 0ca743a5 ("netfilter: nf_tables: add compatibility layer for x_tables")
Signed-off-by: default avatarPablo Neira Ayuso <pablo@netfilter.org>
parent 36fa8d69
...@@ -285,9 +285,11 @@ enum nft_rule_attributes { ...@@ -285,9 +285,11 @@ enum nft_rule_attributes {
/** /**
* enum nft_rule_compat_flags - nf_tables rule compat flags * enum nft_rule_compat_flags - nf_tables rule compat flags
* *
* @NFT_RULE_COMPAT_F_UNUSED: unused
* @NFT_RULE_COMPAT_F_INV: invert the check result * @NFT_RULE_COMPAT_F_INV: invert the check result
*/ */
enum nft_rule_compat_flags { enum nft_rule_compat_flags {
NFT_RULE_COMPAT_F_UNUSED = (1 << 0),
NFT_RULE_COMPAT_F_INV = (1 << 1), NFT_RULE_COMPAT_F_INV = (1 << 1),
NFT_RULE_COMPAT_F_MASK = NFT_RULE_COMPAT_F_INV, NFT_RULE_COMPAT_F_MASK = NFT_RULE_COMPAT_F_INV,
}; };
......
...@@ -212,7 +212,8 @@ static int nft_parse_compat(const struct nlattr *attr, u16 *proto, bool *inv) ...@@ -212,7 +212,8 @@ static int nft_parse_compat(const struct nlattr *attr, u16 *proto, bool *inv)
return -EINVAL; return -EINVAL;
flags = ntohl(nla_get_be32(tb[NFTA_RULE_COMPAT_FLAGS])); flags = ntohl(nla_get_be32(tb[NFTA_RULE_COMPAT_FLAGS]));
if (flags & ~NFT_RULE_COMPAT_F_MASK) if (flags & NFT_RULE_COMPAT_F_UNUSED ||
flags & ~NFT_RULE_COMPAT_F_MASK)
return -EINVAL; return -EINVAL;
if (flags & NFT_RULE_COMPAT_F_INV) if (flags & NFT_RULE_COMPAT_F_INV)
*inv = true; *inv = true;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment