diff options
| author | David S. Miller <davem@davemloft.net> | 2019-06-28 13:36:43 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2019-06-28 13:36:43 -0700 |
| commit | 7c3d310d8fc44e549f0ac77b2cc4bc796419e38b (patch) | |
| tree | 7b2f8e23ef2376670884e7195bc44b4c440fe442 /net/netfilter/nf_conntrack_proto_icmp.c | |
| parent | 75dad2520fc37345075498e9c5aa1355b4993dbc (diff) | |
| parent | 5d1549847c76b1ffcf8e388ef4d0f229bdd1d7e8 (diff) | |
| download | linux-7c3d310d8fc44e549f0ac77b2cc4bc796419e38b.tar.gz | |
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 fixes for net:
1) Fix memleak reported by syzkaller when registering IPVS hooks,
patch from Julian Anastasov.
2) Fix memory leak in start_sync_thread, also from Julian.
3) Fix conntrack deletion via ctnetlink, from Felix Kaechele.
4) Fix reject for ICMP due to incorrect checksum handling, from
He Zhe.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/netfilter/nf_conntrack_proto_icmp.c')
| -rw-r--r-- | net/netfilter/nf_conntrack_proto_icmp.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/netfilter/nf_conntrack_proto_icmp.c b/net/netfilter/nf_conntrack_proto_icmp.c index a824367ed5187c..dd53e2b20f6b67 100644 --- a/net/netfilter/nf_conntrack_proto_icmp.c +++ b/net/netfilter/nf_conntrack_proto_icmp.c @@ -218,7 +218,7 @@ int nf_conntrack_icmpv4_error(struct nf_conn *tmpl, /* See ip_conntrack_proto_tcp.c */ if (state->net->ct.sysctl_checksum && state->hook == NF_INET_PRE_ROUTING && - nf_ip_checksum(skb, state->hook, dataoff, 0)) { + nf_ip_checksum(skb, state->hook, dataoff, IPPROTO_ICMP)) { icmp_error_log(skb, state, "bad hw icmp checksum"); return -NF_ACCEPT; } |