Patch "ipv6: gre: support SIT encapsulation" has been added to the 4.2-stable tree

Patch "ipv6: gre: support SIT encapsulation" has been added to the 4.2-stable tree

[gregkh]

This is a note to let you know that I've just added the patch titled

    ipv6: gre: support SIT encapsulation

to the 4.2-stable tree which can be found at:
    http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary

The filename of the patch is:
     ipv6-gre-support-sit-encapsulation.patch
and it can be found in the queue-4.2 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@vger.kernel.org> know about it.


>From foo@baz Tue Nov 17 14:34:38 PST 2015
From: Eric Dumazet <edumazet@google.com>
Date: Sat, 24 Oct 2015 05:47:44 -0700
Subject: ipv6: gre: support SIT encapsulation

From: Eric Dumazet <edumazet@google.com>

[ Upstream commit 7e3b6e7423d5f994257c1de88e06b509673fdbcf ]

gre_gso_segment() chokes if SIT frames were aggregated by GRO engine.

Fixes: 61c1db7fae21e ("ipv6: sit: add GSO/TSO support")
Signed-off-by: Eric Dumazet <edumazet@google.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---
 net/ipv4/gre_offload.c |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

--- a/net/ipv4/gre_offload.c
+++ b/net/ipv4/gre_offload.c
@@ -36,7 +36,8 @@ static struct sk_buff *gre_gso_segment(s
 				  SKB_GSO_TCP_ECN |
 				  SKB_GSO_GRE |
 				  SKB_GSO_GRE_CSUM |
-				  SKB_GSO_IPIP)))
+				  SKB_GSO_IPIP |
+				  SKB_GSO_SIT)))
 		goto out;
 
 	if (!skb->encapsulation)


Patches currently in stable-queue which might be from edumazet@google.com are

queue-4.2/ipv6-gre-support-sit-encapsulation.patch
queue-4.2/ipmr-fix-possible-race-resulting-from-improper-usage-of-ip_inc_stats_bh-in-preemptible-context.patch
queue-4.2/net-avoid-null-deref-in-inet_ctl_sock_destroy.patch
queue-4.2/net-fix-a-race-in-dst_release.patch
queue-4.2/sit-fix-sit0-percpu-double-allocations.patch