diff options
| author | Florian Westphal | 2019-07-13 23:59:21 +0200 |
|---|---|---|
| committer | Pablo Neira Ayuso | 2019-07-16 13:17:02 +0200 |
| commit | b717273ddb66a0c576d8c9884a6cfa70a5f49f6b (patch) | |
| tree | beae4de4095ac99f4add679f32e69bb3a130249a /net/netfilter | |
| parent | netfilter: conntrack: always store window size un-scaled (diff) | |
| download | kernel-qcow2-linux-b717273ddb66a0c576d8c9884a6cfa70a5f49f6b.tar.gz kernel-qcow2-linux-b717273ddb66a0c576d8c9884a6cfa70a5f49f6b.tar.xz kernel-qcow2-linux-b717273ddb66a0c576d8c9884a6cfa70a5f49f6b.zip | |
netfilter: nf_tables: don't fail when updating base chain policy
The following nftables test case fails on nf-next:
tests/shell/run-tests.sh tests/shell/testcases/transactions/0011chain_0
The test case contains:
add chain x y { type filter hook input priority 0; }
add chain x y { policy drop; }"
The new test
if (chain->flags ^ flags)
return -EOPNOTSUPP;
triggers here, because chain->flags has NFT_BASE_CHAIN set, but flags
is 0 because no flag attribute was present in the policy update.
Just fetch the current flag settings of a pre-existing chain in case
userspace did not provide any.
Fixes: c9626a2cbdb20 ("netfilter: nf_tables: add hardware offload support")
Signed-off-by: Florian Westphal <fw@strlen.de>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
Diffstat (limited to 'net/netfilter')
| -rw-r--r-- | net/netfilter/nf_tables_api.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/net/netfilter/nf_tables_api.c b/net/netfilter/nf_tables_api.c index ed17a7c29b86..014e06b0b5cf 100644 --- a/net/netfilter/nf_tables_api.c +++ b/net/netfilter/nf_tables_api.c @@ -1900,6 +1900,8 @@ static int nf_tables_newchain(struct net *net, struct sock *nlsk, if (nla[NFTA_CHAIN_FLAGS]) flags = ntohl(nla_get_be32(nla[NFTA_CHAIN_FLAGS])); + else if (chain) + flags = chain->flags; nft_ctx_init(&ctx, net, skb, nlh, family, table, chain, nla); |