[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-Id: <25F004CB-8D03-4280-BDBD-48C149E7321F@ipflavors.com>
Date: Fri, 11 Jan 2013 08:27:32 +0100
From: Romain KUNTZ <r.kuntz@...lavors.com>
To: netdev@...r.kernel.org
Cc: yoshfuji@...ux-ipv6.org, davem@...emloft.net,
Steffen Klassert <steffen.klassert@...unet.com>,
Romain KUNTZ <r.kuntz@...lavors.com>
Subject: Re: [PATCH 2/2] ipv6: fix packet corruption when Dest/RT2 options are used
On Jan 5, 2013, at 17:19 , Romain KUNTZ <r.kuntz@...lavors.com> wrote:
> Commit 299b0767 (ipv6: Fix IPsec slowpath fragmentation problem)
> has introduced a bug that provokes corrupted packets when Destination
> Options or Routing Header Type 2 are used (such as with Mobile IPv6):
> rt->rt6i_nfheader_len should be substracted to rt->dst.header_len,
> and not to exthdrlen.
>
> This patch reverts to the original and correct behavior. Successfully
> tested with and without IPsec activated for MH packets.
>
> Signed-off-by: Romain Kuntz <r.kuntz@...lavors.com>
> Acked-by: Steffen Klassert <steffen.klassert@...unet.com>
> ---
> net/ipv6/ip6_output.c | 4 ++--
> 1 files changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/net/ipv6/ip6_output.c b/net/ipv6/ip6_output.c
> index 5552d13..0c7c03d 100644
> --- a/net/ipv6/ip6_output.c
> +++ b/net/ipv6/ip6_output.c
> @@ -1213,10 +1213,10 @@ int ip6_append_data(struct sock *sk, int getfrag(void *from, char *to,
> if (dst_allfrag(rt->dst.path))
> cork->flags |= IPCORK_ALLFRAG;
> cork->length = 0;
> - exthdrlen = (opt ? opt->opt_flen : 0) - rt->rt6i_nfheader_len;
> + exthdrlen = (opt ? opt->opt_flen : 0);
> length += exthdrlen;
> transhdrlen += exthdrlen;
> - dst_exthdrlen = rt->dst.header_len;
> + dst_exthdrlen = rt->dst.header_len - rt->rt6i_nfheader_len;
> } else {
> rt = (struct rt6_info *)cork->dst;
> fl6 = &inet->cork.fl.u.ip6;
> --
> 1.7.2.5
Resending this one adding the 'Acked-by: Steffen Klassert'.
Romain--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Powered by blists - more mailing lists