mirror of
https://github.com/adulau/aha.git
synced 2024-12-28 11:46:19 +00:00
[NETFILTER]: nf_conntrack: Fix TCP/UDP HW checksum handling for IPv6 packet
If skb->ip_summed is CHECKSUM_HW here, skb->csum includes checksum of actual IPv6 header and extension headers. Then such excess checksum must be subtruct when nf_conntrack calculates TCP/UDP checksum with pseudo IPv6 header. Spotted by Ben Skeggs. Signed-off-by: Yasuyuki Kozakai <yasuyuki.kozakai@toshiba.co.jp> Signed-off-by: Patrick McHardy <kaber@trash.net> Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
parent
763ecff187
commit
7c6de05884
2 changed files with 6 additions and 2 deletions
|
@ -864,7 +864,9 @@ static int csum6(const struct sk_buff *skb, unsigned int dataoff)
|
|||
{
|
||||
return csum_ipv6_magic(&skb->nh.ipv6h->saddr, &skb->nh.ipv6h->daddr,
|
||||
skb->len - dataoff, IPPROTO_TCP,
|
||||
skb->ip_summed == CHECKSUM_HW ? skb->csum
|
||||
skb->ip_summed == CHECKSUM_HW
|
||||
? csum_sub(skb->csum,
|
||||
skb_checksum(skb, 0, dataoff, 0))
|
||||
: skb_checksum(skb, dataoff, skb->len - dataoff,
|
||||
0));
|
||||
}
|
||||
|
|
|
@ -161,7 +161,9 @@ static int csum6(const struct sk_buff *skb, unsigned int dataoff)
|
|||
{
|
||||
return csum_ipv6_magic(&skb->nh.ipv6h->saddr, &skb->nh.ipv6h->daddr,
|
||||
skb->len - dataoff, IPPROTO_UDP,
|
||||
skb->ip_summed == CHECKSUM_HW ? skb->csum
|
||||
skb->ip_summed == CHECKSUM_HW
|
||||
? csum_sub(skb->csum,
|
||||
skb_checksum(skb, 0, dataoff, 0))
|
||||
: skb_checksum(skb, dataoff, skb->len - dataoff,
|
||||
0));
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue