diff options
| author | David S. Miller | 2019-06-28 22:36:43 +0200 |
|---|---|---|
| committer | David S. Miller | 2019-06-28 22:36:43 +0200 |
| commit | 7c3d310d8fc44e549f0ac77b2cc4bc796419e38b (patch) | |
| tree | 7b2f8e23ef2376670884e7195bc44b4c440fe442 /net/netfilter/nf_nat_proto.c | |
| parent | net: dsa: b53: Disable all ports on setup (diff) | |
| parent | netfilter: Fix remainder of pseudo-header protocol 0 (diff) | |
| download | kernel-qcow2-linux-7c3d310d8fc44e549f0ac77b2cc4bc796419e38b.tar.gz kernel-qcow2-linux-7c3d310d8fc44e549f0ac77b2cc4bc796419e38b.tar.xz kernel-qcow2-linux-7c3d310d8fc44e549f0ac77b2cc4bc796419e38b.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 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_nat_proto.c')
| -rw-r--r-- | net/netfilter/nf_nat_proto.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/netfilter/nf_nat_proto.c b/net/netfilter/nf_nat_proto.c index 07da07788f6b..83a24cc5753b 100644 --- a/net/netfilter/nf_nat_proto.c +++ b/net/netfilter/nf_nat_proto.c @@ -564,7 +564,7 @@ int nf_nat_icmp_reply_translation(struct sk_buff *skb, if (!skb_make_writable(skb, hdrlen + sizeof(*inside))) return 0; - if (nf_ip_checksum(skb, hooknum, hdrlen, 0)) + if (nf_ip_checksum(skb, hooknum, hdrlen, IPPROTO_ICMP)) return 0; inside = (void *)skb->data + hdrlen; |