[PATCH 2/4] [IPV6]: Fix oops during flushing corked datagrams.

[PATCH 2/4] [IPV6]: Fix oops during flushing corked datagrams.

[YOSHIFUJI Hideaki / 吉藤英明]

When we corking sub-datagrams, we do not clone skb->dst for sub-datagrams
other than the first one, so we get oops if we have multiple sub-datagrams
here.

One possible way to fix this is to clone skb->dst for all sub-datagrams,
but we do not take this approach because skb->dst is not used in other
places and it is more natural to increment statistics once per a datagram.

Also applicable for stable releases.

Signed-off-by: YOSHIFUJI Hideaki <yoshfuji@linux-ipv6.org>

diff --git a/net/ipv6/ip6_output.c b/net/ipv6/ip6_output.c
index 4704b5f..6530044 100644
--- a/net/ipv6/ip6_output.c
+++ b/net/ipv6/ip6_output.c
@@ -1423,8 +1423,15 @@ void ip6_flush_pending_frames(struct sock *sk)
 	struct sk_buff *skb;
 
 	while ((skb = __skb_dequeue_tail(&sk->sk_write_queue)) != NULL) {
-		IP6_INC_STATS(ip6_dst_idev(skb->dst),
-			      IPSTATS_MIB_OUTDISCARDS);
+		if (skb->dst) {
+			/*
+			 * Note: we count standard stats once per "datagram"
+			 * and skb->dst is set only for the first 
+			 * sub-datagram of the datagram.
+			 */
+			IP6_INC_STATS(ip6_dst_idev(skb->dst),
+				      IPSTATS_MIB_OUTDISCARDS);
+		}
 		kfree_skb(skb);
 	}
 

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

Re: [PATCH 2/4] [IPV6]: Fix oops during flushing corked datagrams.

[David Miller]

From: YOSHIFUJI Hideaki / 吉藤英明 <yoshfuji@linux-ipv6.org>
Date: Thu, 13 Sep 2007 09:30:51 +0900 (JST)

> When we corking sub-datagrams, we do not clone skb->dst for sub-datagrams
> other than the first one, so we get oops if we have multiple sub-datagrams
> here.
> 
> One possible way to fix this is to clone skb->dst for all sub-datagrams,
> but we do not take this approach because skb->dst is not used in other
> places and it is more natural to increment statistics once per a datagram.
> 
> Also applicable for stable releases.
> 
> Signed-off-by: YOSHIFUJI Hideaki <yoshfuji@linux-ipv6.org>

This is already fixed (by you) in Linus's tree, and I already
plan to submit this to -stable.