lkml.org 
[lkml]   [2010]   [Aug]   [17]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
SubjectRe: [patch nf-next] IPVS: ICMPv6 checksum calculation

Hello,

On Tue, 17 Aug 2010, Simon Horman wrote:

> From: Xiaoyu Du <tingsrain@gmail.com>
>
> Correct the ICMPv6 checksum calculation when IPv6 is is used
>
> Signed-off-by: Xiaoyu Du <tingsrain@gmail.com>
> Signed-off-by: Simon Horman <horms@verge.net.au>
>
> ---
> net/netfilter/ipvs/ip_vs_core.c | 6 +++++-
> 1 files changed, 5 insertions(+), 1 deletions(-)
>
> I wonder if this is -stable or .35 material.
>
> diff --git a/net/netfilter/ipvs/ip_vs_core.c b/net/netfilter/ipvs/ip_vs_core.c
> index 4f8ddba..124a1ae 100644
> --- a/net/netfilter/ipvs/ip_vs_core.c
> +++ b/net/netfilter/ipvs/ip_vs_core.c
> @@ -638,8 +638,12 @@ void ip_vs_nat_icmp_v6(struct sk_buff *skb,
> struct ip_vs_protocol *pp,
>
> /* And finally the ICMP checksum */
> icmph->icmp6_cksum = 0;
> - /* TODO IPv6: is this correct for ICMPv6? */

May be ip_vs_checksum_complete() is not needed here?
Also, skb->csum is not valid for every ip_summed value.
May be we need to apply CHECKSUM_PARTIAL kind of setup for the IPv6.
Such example is net/ipv6/udp.c:udp6_ufo_send_check().
Later dev_queue_xmit() and skb_checksum_help() should take care
for the next steps. Something like this can be tested:

icmph->icmp6_cksum = csum_ipv6_magic(&iph->saddr,
&iph->daddr,
skb->len - icmp_offset, IPPROTO_ICMPV6,
0);
skb->csum_start = skb_network_header(skb) - skb->head +
icmp_offset;
skb->csum_offset = offsetof(struct icmp6hdr, icmp6_cksum);
skb->ip_summed = CHECKSUM_PARTIAL;

> ip_vs_checksum_complete(skb, icmp_offset);
> + icmph->icmp6_cksum = csum_ipv6_magic(&iph->saddr,
> + &iph->daddr,
> + skb->len - icmp_offset, IPPROTO_ICMPV6,
> + skb->csum);
> +
> skb->ip_summed = CHECKSUM_UNNECESSARY;
>
> if (inout)

Regards

--
Julian Anastasov <ja@ssi.bg>


\
 
 \ /
  Last update: 2010-08-17 11:29    [W:0.075 / U:0.552 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site