[BK PATCH 2.6] IPV6 Fixes

[YOSHIFUJI Hideaki / 吉藤英明 <yoshfuji@xxxxxxxxxxxxxx>]

Hello.

Please pull following changesets from
<bk://bk.skbuff.net:20609/linux-2.6-inet6-20040928/>

Thanks.

HEADLINES
---------
ChangeSet@xxxxxx, 2004-09-28 11:25:48+09:00, yoshfuji@xxxxxxxxxxxxxx
 [IPV6] Fix routing header handling.
ChangeSet@xxxxxx, 2004-09-28 13:55:20+09:00, yoshfuji@xxxxxxxxxxxxxx
 [IPV6] Fix skb allocation size for RST and ACK.


CHANGESETS
----------
ChangeSet@xxxxxx, 2004-09-28 11:25:48+09:00, yoshfuji@xxxxxxxxxxxxxx
 [IPV6] Fix routing header handling.
 
 We need to rewind skb pointers when we forward a packet to other host
 because dst_input() assumes that skb->data points head of ipv6 protocol header.
 
 Signed-off-by: Hideaki YOSHIFUJI <yoshfuji@xxxxxxxxxxxxxx>

diff -Nru a/net/ipv6/exthdrs.c b/net/ipv6/exthdrs.c
--- a/net/ipv6/exthdrs.c        2004-09-28 14:28:37 +09:00
+++ b/net/ipv6/exthdrs.c        2004-09-28 14:28:37 +09:00
@@ -314,9 +314,11 @@
        dst_release(xchg(&skb->dst, NULL));
        ip6_route_input(skb);
        if (skb->dst->error) {
+               skb_push(skb, skb->data - skb->nh.raw);
                dst_input(skb);
                return -1;
        }
+
        if (skb->dst->dev->flags&IFF_LOOPBACK) {
                if (skb->nh.ipv6h->hop_limit <= 1) {
                        IP6_INC_STATS_BH(IPSTATS_MIB_INHDRERRORS);
@@ -329,6 +331,7 @@
                goto looped_back;
        }
 
+       skb_push(skb, skb->data - skb->nh.raw);
        dst_input(skb);
        return -1;
 }

ChangeSet@xxxxxx, 2004-09-28 13:55:20+09:00, yoshfuji@xxxxxxxxxxxxxx
 [IPV6] Fix skb allocation size for RST and ACK.
 
 Signed-off-by: Hideaki YOSHIFUJI <yoshfuji@xxxxxxxxxxxxxx>

diff -Nru a/net/ipv6/tcp_ipv6.c b/net/ipv6/tcp_ipv6.c
--- a/net/ipv6/tcp_ipv6.c       2004-09-28 14:28:41 +09:00
+++ b/net/ipv6/tcp_ipv6.c       2004-09-28 14:28:41 +09:00
@@ -1003,11 +1003,12 @@
         * and then put it into the queue to be sent.
         */
 
-       buff = alloc_skb(MAX_HEADER + sizeof(struct ipv6hdr), GFP_ATOMIC);
+       buff = alloc_skb(MAX_HEADER + sizeof(struct ipv6hdr) + sizeof(struct 
tcphdr),
+                        GFP_ATOMIC);
        if (buff == NULL) 
                return;
 
-       skb_reserve(buff, MAX_HEADER + sizeof(struct ipv6hdr));
+       skb_reserve(buff, MAX_HEADER + sizeof(struct ipv6hdr) + sizeof(struct 
tcphdr));
 
        t1 = (struct tcphdr *) skb_push(buff,sizeof(struct tcphdr));
 
@@ -1065,14 +1066,15 @@
        struct flowi fl;
        int tot_len = sizeof(struct tcphdr);
 
-       buff = alloc_skb(MAX_HEADER + sizeof(struct ipv6hdr), GFP_ATOMIC);
+       if (ts)
+               tot_len += 3*4;
+
+       buff = alloc_skb(MAX_HEADER + sizeof(struct ipv6hdr) + tot_len,
+                        GFP_ATOMIC);
        if (buff == NULL)
                return;
 
-       skb_reserve(buff, MAX_HEADER + sizeof(struct ipv6hdr));
-
-       if (ts)
-               tot_len += 3*4;
+       skb_reserve(buff, MAX_HEADER + sizeof(struct ipv6hdr) + tot_len);
 
        t1 = (struct tcphdr *) skb_push(buff,tot_len);
 

-- 
Hideaki YOSHIFUJI @ USAGI Project <yoshfuji@xxxxxxxxxxxxxx>
GPG FP: 9022 65EB 1ECF 3AD1 0BDF  80D8 4807 F894 E062 0EEA