[kernel] r15362 - in dists/lenny/linux-2.6/debian: . patches/features/all/openvz patches/series

[Maximilian Attems]

Author: maks
Date: Fri Mar 12 05:54:57 2010
New Revision: 15362

Log:
add oneliner fix to kenel oops on vzrestore

Added:
   dists/lenny/linux-2.6/debian/patches/features/all/openvz/ub_incorrect_skb_charged_in_tcp_send_synack.patch
Modified:
   dists/lenny/linux-2.6/debian/changelog
   dists/lenny/linux-2.6/debian/patches/series/23-extra

Modified: dists/lenny/linux-2.6/debian/changelog
==============================================================================
--- dists/lenny/linux-2.6/debian/changelog	Fri Mar 12 05:13:45 2010	(r15361)
+++ dists/lenny/linux-2.6/debian/changelog	Fri Mar 12 05:54:57 2010	(r15362)
@@ -8,6 +8,7 @@
     (closes: #573460)
   * openvz: Fix "Bad throughput of TCP connection after live migration"
     (closes: #500145)
+  * ub: incorrect skb is charged in tcp_send_synack.
 
  -- dann frazier <dannf at debian.org>  Wed, 10 Mar 2010 23:42:11 -0700
 

Added: dists/lenny/linux-2.6/debian/patches/features/all/openvz/ub_incorrect_skb_charged_in_tcp_send_synack.patch
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ dists/lenny/linux-2.6/debian/patches/features/all/openvz/ub_incorrect_skb_charged_in_tcp_send_synack.patch	Fri Mar 12 05:54:57 2010	(r15362)
@@ -0,0 +1,29 @@
+From: Denis Lunev <den at openvz.org>
+Date: Fri, 22 Jan 2010 15:48:26 +0000 (+0300)
+Subject: ub: incorrect skb is charged in tcp_send_synack
+X-Git-Tag: spawn-2.6.32~12
+X-Git-Url: http://git.openvz.org/?p=linux-2.6.27-openvz;a=commitdiff_plain;h=e3f2a20e06a08febe660a1991963320b049274a9;hp=9f4210d737d237c08260a9b7e28214064e103b06
+
+ub: incorrect skb is charged in tcp_send_synack
+
+New one should be charged rather than old.
+
+http://bugzilla.openvz.org/show_bug.cgi?id=987
+
+Signed-off-by: Denis V. Lunev <den at openvz.org>
+Signed-off-by: Pavel Emelyanov <xemul at openvz.org>
+---
+
+diff --git a/net/ipv4/tcp_output.c b/net/ipv4/tcp_output.c
+index 6db3e0a..0d642a4 100644
+--- a/net/ipv4/tcp_output.c
++++ b/net/ipv4/tcp_output.c
+@@ -2259,7 +2259,7 @@ int tcp_send_synack(struct sock *sk)
+ 			struct sk_buff *nskb = skb_copy(skb, GFP_ATOMIC);
+ 			if (nskb == NULL)
+ 				return -ENOMEM;
+-			if (ub_tcpsndbuf_charge(sk, skb) < 0) {
++			if (ub_tcpsndbuf_charge(sk, nskb) < 0) {
+ 				kfree_skb(nskb);
+ 				return -ENOMEM;
+ 			}

Modified: dists/lenny/linux-2.6/debian/patches/series/23-extra
==============================================================================
--- dists/lenny/linux-2.6/debian/patches/series/23-extra	Fri Mar 12 05:13:45 2010	(r15361)
+++ dists/lenny/linux-2.6/debian/patches/series/23-extra	Fri Mar 12 05:54:57 2010	(r15362)
@@ -1,2 +1,3 @@
 + features/all/openvz/printk_cpu_clared_vprintk.patch featureset=openvz
 + features/all/openvz/rst-fix-sk-tso.patch featureset=openvz
++ features/all/openvz/ub_incorrect_skb_charged_in_tcp_send_synack.patch featureset=openvz