releases/3.19.2/ipv6-fix-fragment-id-assignment-on-le-arches.patch

   1 From foo@baz Wed Mar 11 11:44:33 CET 2015
   2 From: Vlad Yasevich <vyasevich@gmail.com>
   3 Date: Mon, 9 Feb 2015 09:38:20 -0500
   4 Subject: ipv6: Fix fragment id assignment on LE arches.
   5
   6 From: Vlad Yasevich <vyasevich@gmail.com>
   7
   8 [ Upstream commit 51f30770e50eb787200f30a79105e2615b379334 ]
   9
  10 Recent commit:
  11 0508c07f5e0c94f38afd5434e8b2a55b84553077
  12 Author: Vlad Yasevich <vyasevich@gmail.com>
  13 Date:   Tue Feb 3 16:36:15 2015 -0500
  14
  15     ipv6: Select fragment id during UFO segmentation if not set.
  16
  17 Introduced a bug on LE in how ipv6 fragment id is assigned.
  18 This was cought by nightly sparce check:
  19
  20 Resolve the following sparce error:
  21  net/ipv6/output_core.c:57:38: sparse: incorrect type in assignment
  22  (different base types)
  23    net/ipv6/output_core.c:57:38:    expected restricted __be32
  24 [usertype] ip6_frag_id
  25    net/ipv6/output_core.c:57:38:    got unsigned int [unsigned]
  26 [assigned] [usertype] id
  27
  28 Fixes: 0508c07f5e0c9 (ipv6: Select fragment id during UFO segmentation if not set.)
  29 Signed-off-by: Vladislav Yasevich <vyasevic@redhat.com>
  30 Signed-off-by: David S. Miller <davem@davemloft.net>
  31 Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  32 ---
  33  net/ipv6/output_core.c |    2 +-
  34  1 file changed, 1 insertion(+), 1 deletion(-)
  35
  36 --- a/net/ipv6/output_core.c
  37 +++ b/net/ipv6/output_core.c
  38 @@ -54,7 +54,7 @@ void ipv6_proxy_select_ident(struct sk_b
  39
  40         id = __ipv6_select_ident(ip6_proxy_idents_hashrnd,
  41                                  &addrs[1], &addrs[0]);
  42 -       skb_shinfo(skb)->ip6_frag_id = id;
  43 +       skb_shinfo(skb)->ip6_frag_id = htonl(id);
  44  }
  45  EXPORT_SYMBOL_GPL(ipv6_proxy_select_ident);
  46