diff options
| author | Pablo Neira Ayuso <pablo@netfilter.org> | 2015-03-17 13:21:42 +0100 |
|---|---|---|
| committer | Sasha Levin <sasha.levin@oracle.com> | 2015-07-13 08:50:05 -0400 |
| commit | ab297a497046d0726b31316258177f5183c5fbc8 (patch) | |
| tree | 677a473ac62e4cf6775a3d5df4df30bfc348af02 | |
| parent | 70d9847bcbbe12714e9535c2375b03217c711c4d (diff) | |
netfilter: nf_tables: allow to change chain policy without hook if it exists
[ Upstream commit d6b6cb1d3e6f78d55c2d4043d77d0d8def3f3b99 ]
If there's an existing base chain, we have to allow to change the
default policy without indicating the hook information.
However, if the chain doesn't exists, we have to enforce the presence of
the hook attribute.
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
Signed-off-by: Sasha Levin <sasha.levin@oracle.com>
| -rw-r--r-- | net/netfilter/nf_tables_api.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/net/netfilter/nf_tables_api.c b/net/netfilter/nf_tables_api.c index 71b574c7bde9..9fe2baa01fbe 100644 --- a/net/netfilter/nf_tables_api.c +++ b/net/netfilter/nf_tables_api.c @@ -1221,7 +1221,10 @@ static int nf_tables_newchain(struct sock *nlsk, struct sk_buff *skb, if (nla[NFTA_CHAIN_POLICY]) { if ((chain != NULL && - !(chain->flags & NFT_BASE_CHAIN)) || + !(chain->flags & NFT_BASE_CHAIN))) + return -EOPNOTSUPP; + + if (chain == NULL && nla[NFTA_CHAIN_HOOK] == NULL) return -EOPNOTSUPP; |