diff options
author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2020-01-21 21:36:59 +0300 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2020-01-21 21:36:59 +0300 |
commit | dd7d99dc688d0fc448976f52f8517fbdeccdccda (patch) | |
tree | 4ad59de5d584cf03e772ee153260c24ba0d717bd /net/netfilter/nf_nat_proto.c | |
parent | 42bbdd99221bac206dde2b5e87098177fcd2a48e (diff) | |
parent | def9d2780727cec3313ed3522d0123158d87224d (diff) | |
download | linux-dd7d99dc688d0fc448976f52f8517fbdeccdccda.tar.xz |
Merge 5.5-rc7 into usb-next
We need the USB fixes in here as well.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'net/netfilter/nf_nat_proto.c')
-rw-r--r-- | net/netfilter/nf_nat_proto.c | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/net/netfilter/nf_nat_proto.c b/net/netfilter/nf_nat_proto.c index 0a59c14b5177..64eedc17037a 100644 --- a/net/netfilter/nf_nat_proto.c +++ b/net/netfilter/nf_nat_proto.c @@ -233,6 +233,19 @@ icmp_manip_pkt(struct sk_buff *skb, return false; hdr = (struct icmphdr *)(skb->data + hdroff); + switch (hdr->type) { + case ICMP_ECHO: + case ICMP_ECHOREPLY: + case ICMP_TIMESTAMP: + case ICMP_TIMESTAMPREPLY: + case ICMP_INFO_REQUEST: + case ICMP_INFO_REPLY: + case ICMP_ADDRESS: + case ICMP_ADDRESSREPLY: + break; + default: + return true; + } inet_proto_csum_replace2(&hdr->checksum, skb, hdr->un.echo.id, tuple->src.u.icmp.id, false); hdr->un.echo.id = tuple->src.u.icmp.id; |