7 files changed, 84 insertions, 14 deletions

diff --git a/net/ipv4/ipip.c b/net/ipv4/ipip.c
index 475bcd1e4181..9b561e633b00 100644
--- a/net/ipv4/ipip.c
+++ b/net/ipv4/ipip.c
@@ -871,7 +871,7 @@ static int __init ipip_init(void)
 
         printk(banner);
 
-        if (xfrm4_tunnel_register(&ipip_handler)) {
+        if (xfrm4_tunnel_register(&ipip_handler, AF_INET)) {
                 printk(KERN_INFO "ipip init: can't register tunnel\n");
                 return -EAGAIN;
         }
@@ -893,7 +893,7 @@ static int __init ipip_init(void)
  err2:
         free_netdev(ipip_fb_tunnel_dev);
  err1:
-        xfrm4_tunnel_deregister(&ipip_handler);
+        xfrm4_tunnel_deregister(&ipip_handler, AF_INET);
         goto out;
 }
 
@@ -913,7 +913,7 @@ static void __exit ipip_destroy_tunnels(void)
 
 static void __exit ipip_fini(void)
 {
-        if (xfrm4_tunnel_deregister(&ipip_handler))
+        if (xfrm4_tunnel_deregister(&ipip_handler, AF_INET))
                 printk(KERN_INFO "ipip close: can't deregister tunnel\n");
 
         rtnl_lock();
diff --git a/net/ipv4/netfilter/ipt_REJECT.c b/net/ipv4/netfilter/ipt_REJECT.c
index a9eb3635fff2..80f739e21824 100644
--- a/net/ipv4/netfilter/ipt_REJECT.c
+++ b/net/ipv4/netfilter/ipt_REJECT.c
@@ -80,6 +80,10 @@ static void send_reset(struct sk_buff *oldskb, int hook)
         nskb->mark = 0;
         skb_init_secmark(nskb);
 
+        skb_shinfo(nskb)->gso_size = 0;
+        skb_shinfo(nskb)->gso_segs = 0;
+        skb_shinfo(nskb)->gso_type = 0;
+
         tcph = (struct tcphdr *)((u_int32_t*)nskb->nh.iph + nskb->nh.iph->ihl);
 
         /* Swap source and dest */
diff --git a/net/ipv4/tcp_output.c b/net/ipv4/tcp_output.c
index cebe9aa918a3..dc151139b5af 100644
--- a/net/ipv4/tcp_output.c
+++ b/net/ipv4/tcp_output.c
@@ -481,7 +481,7 @@ static int tcp_transmit_skb(struct sock *sk, struct sk_buff *skb, int clone_it,
                 /* RFC1323: The window in SYN & SYN/ACK segments
                  * is never scaled.
                  */
-                th->window      = htons(tp->rcv_wnd);
+                th->window      = htons(min(tp->rcv_wnd, 65535U));
         } else {
                 th->window      = htons(tcp_select_window(sk));
         }
@@ -2160,7 +2160,7 @@ struct sk_buff * tcp_make_synack(struct sock *sk, struct dst_entry *dst,
         }
 
         /* RFC1323: The window in SYN & SYN/ACK segments is never scaled. */
-        th->window = htons(req->rcv_wnd);
+        th->window = htons(min(req->rcv_wnd, 65535U));
 
         TCP_SKB_CB(skb)->when = tcp_time_stamp;
         tcp_syn_build_options((__be32 *)(th + 1), dst_metric(dst, RTAX_ADVMSS), ireq->tstamp_ok,
diff --git a/net/ipv4/tunnel4.c b/net/ipv4/tunnel4.c
index 8d30c48f090e..a794a8ca8b4f 100644
--- a/net/ipv4/tunnel4.c
+++ b/net/ipv4/tunnel4.c
@@ -14,9 +14,10 @@
 #include <net/xfrm.h>
 
 static struct xfrm_tunnel *tunnel4_handlers;
+static struct xfrm_tunnel *tunnel64_handlers;
 static DEFINE_MUTEX(tunnel4_mutex);
 
-int xfrm4_tunnel_register(struct xfrm_tunnel *handler)
+int xfrm4_tunnel_register(struct xfrm_tunnel *handler, unsigned short family)
 {
         struct xfrm_tunnel **pprev;
         int ret = -EEXIST;
@@ -24,7 +25,8 @@ int xfrm4_tunnel_register(struct xfrm_tunnel *handler)
 
         mutex_lock(&tunnel4_mutex);
 
-        for (pprev = &tunnel4_handlers; *pprev; pprev = &(*pprev)->next) {
+        for (pprev = (family == AF_INET) ? &tunnel4_handlers : &tunnel64_handlers;
+             *pprev; pprev = &(*pprev)->next) {
                 if ((*pprev)->priority > priority)
                         break;
                 if ((*pprev)->priority == priority)
@@ -44,14 +46,15 @@ err:
 
 EXPORT_SYMBOL(xfrm4_tunnel_register);
 
-int xfrm4_tunnel_deregister(struct xfrm_tunnel *handler)
+int xfrm4_tunnel_deregister(struct xfrm_tunnel *handler, unsigned short family)
 {
         struct xfrm_tunnel **pprev;
         int ret = -ENOENT;
 
         mutex_lock(&tunnel4_mutex);
 
-        for (pprev = &tunnel4_handlers; *pprev; pprev = &(*pprev)->next) {
+        for (pprev = (family == AF_INET) ? &tunnel4_handlers : &tunnel64_handlers;
+             *pprev; pprev = &(*pprev)->next) {
                 if (*pprev == handler) {
                         *pprev = handler->next;
                         ret = 0;
@@ -86,6 +89,26 @@ drop:
         return 0;
 }
 
+#if defined(CONFIG_IPV6) || defined(CONFIG_IPV6_MODULE)
+static int tunnel64_rcv(struct sk_buff *skb)
+{
+        struct xfrm_tunnel *handler;
+
+        if (!pskb_may_pull(skb, sizeof(struct iphdr)))
+                goto drop;
+
+        for (handler = tunnel64_handlers; handler; handler = handler->next)
+                if (!handler->handler(skb))
+                        return 0;
+
+        icmp_send(skb, ICMP_DEST_UNREACH, ICMP_PORT_UNREACH, 0);
+
+drop:
+        kfree_skb(skb);
+        return 0;
+}
+#endif
+
 static void tunnel4_err(struct sk_buff *skb, u32 info)
 {
         struct xfrm_tunnel *handler;
@@ -101,17 +124,36 @@ static struct net_protocol tunnel4_protocol = {
         .no_policy      =       1,
 };
 
+#if defined(CONFIG_IPV6) || defined(CONFIG_IPV6_MODULE)
+static struct net_protocol tunnel64_protocol = {
+        .handler        =       tunnel64_rcv,
+        .err_handler    =       tunnel4_err,
+        .no_policy      =       1,
+};
+#endif
+
 static int __init tunnel4_init(void)
 {
         if (inet_add_protocol(&tunnel4_protocol, IPPROTO_IPIP)) {
                 printk(KERN_ERR "tunnel4 init: can't add protocol\n");
                 return -EAGAIN;
         }
+#if defined(CONFIG_IPV6) || defined(CONFIG_IPV6_MODULE)
+        if (inet_add_protocol(&tunnel64_protocol, IPPROTO_IPV6)) {
+                printk(KERN_ERR "tunnel64 init: can't add protocol\n");
+                inet_del_protocol(&tunnel4_protocol, IPPROTO_IPIP);
+                return -EAGAIN;
+        }
+#endif
         return 0;
 }
 
 static void __exit tunnel4_fini(void)
 {
+#if defined(CONFIG_IPV6) || defined(CONFIG_IPV6_MODULE)
+        if (inet_del_protocol(&tunnel64_protocol, IPPROTO_IPV6))
+                printk(KERN_ERR "tunnel64 close: can't remove protocol\n");
+#endif
         if (inet_del_protocol(&tunnel4_protocol, IPPROTO_IPIP))
                 printk(KERN_ERR "tunnel4 close: can't remove protocol\n");
 }
diff --git a/net/ipv4/xfrm4_input.c b/net/ipv4/xfrm4_input.c
index 289146bdb8b0..78e80deb7e89 100644
--- a/net/ipv4/xfrm4_input.c
+++ b/net/ipv4/xfrm4_input.c
@@ -27,6 +27,7 @@ static int xfrm4_parse_spi(struct sk_buff *skb, u8 nexthdr, __be32 *spi, __be32
 {
         switch (nexthdr) {
         case IPPROTO_IPIP:
+        case IPPROTO_IPV6:
                 *spi = skb->nh.iph->saddr;
                 *seq = 0;
                 return 0;
@@ -70,7 +71,8 @@ int xfrm4_rcv_encap(struct sk_buff *skb, __u16 encap_type)
                 if (xfrm_nr == XFRM_MAX_DEPTH)
                         goto drop;
 
-                x = xfrm_state_lookup((xfrm_address_t *)&iph->daddr, spi, iph->protocol, AF_INET);
+                x = xfrm_state_lookup((xfrm_address_t *)&iph->daddr, spi,
+                                iph->protocol != IPPROTO_IPV6 ? iph->protocol : IPPROTO_IPIP, AF_INET);
                 if (x == NULL)
                         goto drop;
 
diff --git a/net/ipv4/xfrm4_mode_tunnel.c b/net/ipv4/xfrm4_mode_tunnel.c
index e54c5494c88f..e1cab33fdad1 100644
--- a/net/ipv4/xfrm4_mode_tunnel.c
+++ b/net/ipv4/xfrm4_mode_tunnel.c
@@ -95,6 +95,7 @@ static int xfrm4_tunnel_input(struct xfrm_state *x, struct sk_buff *skb)
 
         switch(iph->protocol){
                 case IPPROTO_IPIP:
+                        break;
 #if defined(CONFIG_IPV6) || defined (CONFIG_IPV6_MODULE)
                 case IPPROTO_IPV6:
                         break;
diff --git a/net/ipv4/xfrm4_tunnel.c b/net/ipv4/xfrm4_tunnel.c
index 1be6762b2d47..3eef06454da9 100644
--- a/net/ipv4/xfrm4_tunnel.c
+++ b/net/ipv4/xfrm4_tunnel.c
@@ -64,24 +64,45 @@ static struct xfrm_tunnel xfrm_tunnel_handler = {
         .priority       =       2,
 };
 
+#if defined(CONFIG_IPV6) || defined(CONFIG_IPV6_MODULE)
+static struct xfrm_tunnel xfrm64_tunnel_handler = {
+        .handler        =       xfrm4_rcv,
+        .err_handler    =       xfrm_tunnel_err,
+        .priority       =       2,
+};
+#endif
+
 static int __init ipip_init(void)
 {
         if (xfrm_register_type(&ipip_type, AF_INET) < 0) {
                 printk(KERN_INFO "ipip init: can't add xfrm type\n");
                 return -EAGAIN;
         }
-        if (xfrm4_tunnel_register(&xfrm_tunnel_handler)) {
-                printk(KERN_INFO "ipip init: can't add xfrm handler\n");
+
+        if (xfrm4_tunnel_register(&xfrm_tunnel_handler, AF_INET)) {
+                printk(KERN_INFO "ipip init: can't add xfrm handler for AF_INET\n");
+                xfrm_unregister_type(&ipip_type, AF_INET);
+                return -EAGAIN;
+        }
+#if defined(CONFIG_IPV6) || defined(CONFIG_IPV6_MODULE)
+        if (xfrm4_tunnel_register(&xfrm64_tunnel_handler, AF_INET6)) {
+                printk(KERN_INFO "ipip init: can't add xfrm handler for AF_INET6\n");
+                xfrm4_tunnel_deregister(&xfrm_tunnel_handler, AF_INET);
                 xfrm_unregister_type(&ipip_type, AF_INET);
                 return -EAGAIN;
         }
+#endif
         return 0;
 }
 
 static void __exit ipip_fini(void)
 {
-        if (xfrm4_tunnel_deregister(&xfrm_tunnel_handler))
-                printk(KERN_INFO "ipip close: can't remove xfrm handler\n");
+#if defined(CONFIG_IPV6) || defined(CONFIG_IPV6_MODULE)
+        if (xfrm4_tunnel_deregister(&xfrm64_tunnel_handler, AF_INET6))
+                printk(KERN_INFO "ipip close: can't remove xfrm handler for AF_INET6\n");
+#endif
+        if (xfrm4_tunnel_deregister(&xfrm_tunnel_handler, AF_INET))
+                printk(KERN_INFO "ipip close: can't remove xfrm handler for AF_INET\n");
         if (xfrm_unregister_type(&ipip_type, AF_INET) < 0)
                 printk(KERN_INFO "ipip close: can't remove xfrm type\n");
 }