diff options
| author | David S. Miller <davem@davemloft.net> | 2015-03-23 22:22:43 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2015-03-23 22:22:43 -0400 |
| commit | d5c1d8c567781932e3ab2c62e8fcfee0283d9580 (patch) | |
| tree | c04fca1719409426b42af6a7caa75cc26ba940a9 /net/netfilter/nf_tables_api.c | |
| parent | ba7c95ea3870fe7b847466d39a049ab6f156aa2c (diff) | |
| parent | 90a5a895cc8b284ac522757a01de15e36710c2b9 (diff) | |
| download | op-kernel-dev-d5c1d8c567781932e3ab2c62e8fcfee0283d9580.zip op-kernel-dev-d5c1d8c567781932e3ab2c62e8fcfee0283d9580.tar.gz | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Conflicts:
net/netfilter/nf_tables_core.c
The nf_tables_core.c conflict was resolved using a conflict resolution
from Stephen Rothwell as a guide.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/netfilter/nf_tables_api.c')
| -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 f7e3371..363a39a 100644 --- a/net/netfilter/nf_tables_api.c +++ b/net/netfilter/nf_tables_api.c @@ -1228,7 +1228,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; |
