diff options
| author | David S. Miller <davem@davemloft.net> | 2019-09-27 20:15:00 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2019-09-27 20:15:00 +0200 |
| commit | c5f095baa880036702595a09de38e7a0ca420c0b (patch) | |
| tree | 01d704e7f7f6972db774075ee808f7f5a8d03a0d /net/netfilter/nft_lookup.c | |
| parent | 8ce39eb5a67aee25d9f05b40b673c95b23502e3e (diff) | |
| parent | 9b05b6e11d5e93a3a517cadc12b9836e0470c255 (diff) | |
| download | linux-stable-c5f095baa880036702595a09de38e7a0ca420c0b.tar.gz linux-stable-c5f095baa880036702595a09de38e7a0ca420c0b.tar.bz2 linux-stable-c5f095baa880036702595a09de38e7a0ca420c0b.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf
Pablo Neira Ayuso says:
====================
Netfilter fixes for net
The following patchset contains Netfilter fixes for net:
1) Add NFT_CHAIN_POLICY_UNSET to replace hardcoded -1 to
specify that the chain policy is unset. The chain policy
field is actually defined as an 8-bit unsigned integer.
2) Remove always true condition reported by smatch in
chain policy check.
3) Fix element lookup on dynamic sets, from Florian Westphal.
4) Use __u8 in ebtables uapi header, from Masahiro Yamada.
5) Bogus EBUSY when removing flowtable after chain flush,
from Laura Garcia Liebana.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/netfilter/nft_lookup.c')
| -rw-r--r-- | net/netfilter/nft_lookup.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/net/netfilter/nft_lookup.c b/net/netfilter/nft_lookup.c index c0560bf3c31b..660bad688e2b 100644 --- a/net/netfilter/nft_lookup.c +++ b/net/netfilter/nft_lookup.c @@ -73,9 +73,6 @@ static int nft_lookup_init(const struct nft_ctx *ctx, if (IS_ERR(set)) return PTR_ERR(set); - if (set->flags & NFT_SET_EVAL) - return -EOPNOTSUPP; - priv->sreg = nft_parse_register(tb[NFTA_LOOKUP_SREG]); err = nft_validate_register_load(priv->sreg, set->klen); if (err < 0) |