diff options
| author | Patrick McHardy | 2015-04-11 11:46:41 +0200 |
|---|---|---|
| committer | Pablo Neira Ayuso | 2015-04-13 20:12:32 +0200 |
| commit | 7c6c6e95a12e46f499749bdd496e53d03950f377 (patch) | |
| tree | 40afe68a6cd068af4e5102ec4989e57dbfe3e762 /net/netfilter/nf_tables_api.c | |
| parent | netfilter: nf_tables: mark stateful expressions (diff) | |
| download | kernel-qcow2-linux-7c6c6e95a12e46f499749bdd496e53d03950f377.tar.gz kernel-qcow2-linux-7c6c6e95a12e46f499749bdd496e53d03950f377.tar.xz kernel-qcow2-linux-7c6c6e95a12e46f499749bdd496e53d03950f377.zip | |
netfilter: nf_tables: add flag to indicate set contains expressions
Add a set flag to indicate that the set is used as a state table and
contains expressions for evaluation. This operation is mutually
exclusive with the mapping operation, so sets specifying both are
rejected. The lookup expression also rejects binding to state tables
since it only deals with loopup and map operations.
Signed-off-by: Patrick McHardy <kaber@trash.net>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
Diffstat (limited to 'net/netfilter/nf_tables_api.c')
| -rw-r--r-- | net/netfilter/nf_tables_api.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/net/netfilter/nf_tables_api.c b/net/netfilter/nf_tables_api.c index 8830811550ec..78af83bc9c8e 100644 --- a/net/netfilter/nf_tables_api.c +++ b/net/netfilter/nf_tables_api.c @@ -2661,9 +2661,13 @@ static int nf_tables_newset(struct sock *nlsk, struct sk_buff *skb, if (nla[NFTA_SET_FLAGS] != NULL) { flags = ntohl(nla_get_be32(nla[NFTA_SET_FLAGS])); if (flags & ~(NFT_SET_ANONYMOUS | NFT_SET_CONSTANT | - NFT_SET_INTERVAL | NFT_SET_MAP | - NFT_SET_TIMEOUT)) + NFT_SET_INTERVAL | NFT_SET_TIMEOUT | + NFT_SET_MAP | NFT_SET_EVAL)) return -EINVAL; + /* Only one of both operations is supported */ + if ((flags & (NFT_SET_MAP | NFT_SET_EVAL)) == + (NFT_SET_MAP | NFT_SET_EVAL)) + return -EOPNOTSUPP; } dtype = 0; |