diff options
| author | David S. Miller <davem@davemloft.net> | 2018-10-01 15:41:01 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2018-10-01 15:41:01 -0700 |
| commit | c8424ddd9715bf1200392a677a8a0e819c99a726 (patch) | |
| tree | fc7d7ed3992b6d21fe27c866baa4cc18b50abb81 /net/netfilter/nft_osf.c | |
| parent | 43955a45dc0b4f3be7f0c3afc0e080ed59bb5280 (diff) | |
| parent | 40e4f26e6a14fc1496eabb8b0004a547303114e6 (diff) | |
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 your net tree:
1) Skip ip_sabotage_in() for packet making into the VRF driver,
otherwise packets are dropped, from David Ahern.
2) Clang compilation warning uncovering typo in the
nft_validate_register_store() call from nft_osf, from Stefan Agner.
3) Double sizeof netlink message length calculations in ctnetlink,
from zhong jiang.
4) Missing rb_erase() on batch full in rbtree garbage collector,
from Taehee Yoo.
5) Calm down compilation warning in nf_hook(), from Florian Westphal.
6) Missing check for non-null sk in xt_socket before validating
netns procedence, from Flavio Leitner.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/netfilter/nft_osf.c')
| -rw-r--r-- | net/netfilter/nft_osf.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/netfilter/nft_osf.c b/net/netfilter/nft_osf.c index 5af74b37f423..a35fb59ace73 100644 --- a/net/netfilter/nft_osf.c +++ b/net/netfilter/nft_osf.c @@ -49,7 +49,7 @@ static int nft_osf_init(const struct nft_ctx *ctx, priv->dreg = nft_parse_register(tb[NFTA_OSF_DREG]); err = nft_validate_register_store(ctx, priv->dreg, NULL, - NFTA_DATA_VALUE, NFT_OSF_MAXGENRELEN); + NFT_DATA_VALUE, NFT_OSF_MAXGENRELEN); if (err < 0) return err; |