From: Eric Dumazet <edumazet@google.com>
Date: Thu, 25 Apr 2013 01:34:55 +0000 (-0700)
Subject: tcp: force a dst refcount when prequeue packet
X-Git-Tag: v3.2.46~15
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=36fced6bf3ea54b198963cac4338d218f3ad0942;p=thirdparty%2Fkernel%2Fstable.git

tcp: force a dst refcount when prequeue packet

[ Upstream commit 093162553c33e9479283e107b4431378271c735d ]

Before escaping RCU protected section and adding packet into
prequeue, make sure the dst is refcounted.

Reported-by: Mike Galbraith <bitbucket@online.de>
Signed-off-by: Eric Dumazet <edumazet@google.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
---

diff --git a/include/net/tcp.h b/include/net/tcp.h
index 0768715ee4dd0..fe46019603440 100644
--- a/include/net/tcp.h
+++ b/include/net/tcp.h
@@ -931,6 +931,7 @@ static inline int tcp_prequeue(struct sock *sk, struct sk_buff *skb)
 	if (sysctl_tcp_low_latency || !tp->ucopy.task)
 		return 0;
 
+	skb_dst_force(skb);
 	__skb_queue_tail(&tp->ucopy.prequeue, skb);
 	tp->ucopy.memory += skb->truesize;
 	if (tp->ucopy.memory > sk->sk_rcvbuf) {