diff options
| author | David S. Miller | 2019-04-23 06:23:55 +0200 |
|---|---|---|
| committer | David S. Miller | 2019-04-23 06:23:55 +0200 |
| commit | acced9d2b4dffaca5ce2228d70e6074965d54a27 (patch) | |
| tree | 77e2671c4719fe92c08149feef314932d72452a7 /net/bridge | |
| parent | Documentation: decnet: remove reference to CONFIG_DECNET_ROUTE_FWMARK (diff) | |
| parent | netfilter: fix nf_l4proto_log_invalid to log invalid packets (diff) | |
| download | kernel-qcow2-linux-acced9d2b4dffaca5ce2228d70e6074965d54a27.tar.gz kernel-qcow2-linux-acced9d2b4dffaca5ce2228d70e6074965d54a27.tar.xz kernel-qcow2-linux-acced9d2b4dffaca5ce2228d70e6074965d54a27.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf
Pablo Neira Ayuso says:
====================
Netfilter/IPVS fixes for net
The following patchset contains Netfilter/IPVS fixes for your net tree:
1) Add a selftest for icmp packet too big errors with conntrack, from
Florian Westphal.
2) Validate inner header in ICMP error message does not lie to us
in conntrack, also from Florian.
3) Initialize ct->timeout to calm down KASAN, from Alexander Potapenko.
4) Skip ICMP error messages from tunnels in IPVS, from Julian Anastasov.
5) Use a hash to expose conntrack and expectation ID, from Florian Westphal.
6) Prevent shift wrap in nft_chain_parse_hook(), from Dan Carpenter.
7) Fix broken ICMP ID randomization with NAT, also from Florian.
8) Remove WARN_ON in ebtables compat that is reached via syzkaller,
from Florian Westphal.
9) Fix broken timestamps since fb420d5d91c1 ("tcp/fq: move back to
CLOCK_MONOTONIC"), from Florian.
10) Fix logging of invalid packets in conntrack, from Andrei Vagin.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/bridge')
| -rw-r--r-- | net/bridge/netfilter/ebtables.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/net/bridge/netfilter/ebtables.c b/net/bridge/netfilter/ebtables.c index eb15891f8b9f..3cad01ac64e4 100644 --- a/net/bridge/netfilter/ebtables.c +++ b/net/bridge/netfilter/ebtables.c @@ -2032,7 +2032,8 @@ static int ebt_size_mwt(struct compat_ebt_entry_mwt *match32, if (match_kern) match_kern->match_size = ret; - if (WARN_ON(type == EBT_COMPAT_TARGET && size_left)) + /* rule should have no remaining data after target */ + if (type == EBT_COMPAT_TARGET && size_left) return -EINVAL; match32 = (struct compat_ebt_entry_mwt *) buf; |