[kernel/f17] Apply potential fix for bogus WARN_ON in tcp. (rhbz 857324)

[Dave Jones]

commit 1876a310557e0d0fe63e066bc4c880da16c0bcfa
Author: Dave Jones <davej at redhat.com>
Date:   Fri Sep 28 12:33:29 2012 -0400

    Apply potential fix for bogus WARN_ON in tcp. (rhbz 857324)

 kernel.spec            |    9 +++++++++
 net-tcp-bz857324.patch |   16 ++++++++++++++++
 2 files changed, 25 insertions(+), 0 deletions(-)
---
diff --git a/kernel.spec b/kernel.spec
index b35775b..25c0960 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -755,6 +755,9 @@ Patch22060: CPU-hotplug-cpusets-suspend-Dont-modify-cpusets-during.patch
 #rhbz 820039 843554
 Patch22061: rds-set-correct-msg_namelen.patch
 
+#rhbz 857324
+Patch22070: net-tcp-bz857324.patch
+
 Patch23000: fbcon-fix-race-condition-between-console-lock-and-cursor-timer.patch
 
 #rhbz 850350
@@ -1471,6 +1474,9 @@ ApplyPatch CPU-hotplug-cpusets-suspend-Dont-modify-cpusets-during.patch
 #rhbz 820039 843554
 ApplyPatch rds-set-correct-msg_namelen.patch
 
+#rhbz 857324
+ApplyPatch net-tcp-bz857324.patch
+
 ApplyPatch fbcon-fix-race-condition-between-console-lock-and-cursor-timer.patch
 
 #rhbz 850350
@@ -2345,6 +2351,9 @@ fi
 #    '-'      |  |
 #              '-'
 %changelog
+* Fri Sep 28 2012 Dave Jones <davej at redhat.com>
+- Apply potential fix for bogus WARN_ON in tcp. (rhbz 857324)
+
 * Fri Sep 28 2012 Josh Boyer <jwboyer at redhat.com> - 3.5.4-3
 - Split out kernel-tools-libs (rhbz 859943)
 
diff --git a/net-tcp-bz857324.patch b/net-tcp-bz857324.patch
new file mode 100644
index 0000000..4bbe116
--- /dev/null
+++ b/net-tcp-bz857324.patch
@@ -0,0 +1,16 @@
+
+Test patch from https://bugzilla.redhat.com/show_bug.cgi?id=857324
+From: Neil Horman <nhorman at redhat.com>
+
+--- linux-3.5.3-1.fc17.noarch/net/ipv4/tcp.c~	2012-09-28 12:29:00.141480580 -0400
++++ linux-3.5.3-1.fc17.noarch/net/ipv4/tcp.c	2012-09-28 12:29:33.975448093 -0400
+@@ -1298,7 +1298,8 @@ void tcp_cleanup_rbuf(struct sock *sk, i
+ 
+ 	struct sk_buff *skb = skb_peek(&sk->sk_receive_queue);
+ 
+-	WARN(skb && !before(tp->copied_seq, TCP_SKB_CB(skb)->end_seq),
++	WARN(skb && !before(tp->copied_seq, TCP_SKB_CB(skb)->end_seq) &&
++	     tp->copied_seq != TCP_SKB_CB(skb)->end_seq,
+ 	     "cleanup rbuf bug: copied %X seq %X rcvnxt %X\n",
+ 	     tp->copied_seq, TCP_SKB_CB(skb)->end_seq, tp->rcv_nxt);
+