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

[Dann Frazier]

Author: dannf
Date: Tue Mar 17 08:02:40 2009
New Revision: 13146

Log:
[openvz] CPT: revert check on sk_reuse>1 (Closes: #500645)

Added:
   dists/lenny/linux-2.6/debian/patches/features/all/openvz/cpt-revert-check-on-sk_reuse-gt-one.patch
Modified:
   dists/lenny/linux-2.6/debian/changelog
   dists/lenny/linux-2.6/debian/patches/series/14-extra

Modified: dists/lenny/linux-2.6/debian/changelog
==============================================================================
--- dists/lenny/linux-2.6/debian/changelog	(original)
+++ dists/lenny/linux-2.6/debian/changelog	Tue Mar 17 08:02:40 2009
@@ -24,6 +24,7 @@
   * [openvz] Fix wrong size of ub0_percpu (Closes: #500876)
   * [openvz] Fix oops in netlink conntrack module when loaded after
     a ve start (Closes: #511165)
+  * [openvz] CPT: revert check on sk_reuse>1 (Closes: #500645)
 
   [ Martin Michlmayr ]
   * rt2x00: Fix VGC lower bound initialization. (Closes: #510607)
@@ -42,7 +43,7 @@
   * [nfs] Backport upstream patches to fix NFS "task blocked for more than 120
     seconds" issue (Closes: #518431)
 
- -- dann frazier <dannf at debian.org>  Mon, 09 Mar 2009 08:18:55 -0600
+ -- dann frazier <dannf at debian.org>  Tue, 17 Mar 2009 01:50:17 -0600
 
 linux-2.6 (2.6.26-13) unstable; urgency=high
 

Added: dists/lenny/linux-2.6/debian/patches/features/all/openvz/cpt-revert-check-on-sk_reuse-gt-one.patch
==============================================================================
--- (empty file)
+++ dists/lenny/linux-2.6/debian/patches/features/all/openvz/cpt-revert-check-on-sk_reuse-gt-one.patch	Tue Mar 17 08:02:40 2009
@@ -0,0 +1,38 @@
+From: Vitaliy Gusev <vgusev at openvz.org>
+Date: Tue, 14 Oct 2008 15:10:44 +0000 (+0400)
+Subject: CPT: revert check on sk_reuse>1
+X-Git-Tag: sync-2.6.27-15.10.08~4
+X-Git-Url: http://git.openvz.org/?p=linux-2.6.26-openvz;a=commitdiff_plain;h=6d18ba377cfa3e86ee830fe6a5fce52b8fd51039
+
+CPT: revert check on sk_reuse>1
+
+Revert commit ac6f78192054784f02dd47f8e6d7d1c8d75ab173
+("[INET]: sk_reuse is valbool", Author: Gerrit Renker <gerrit at erg.abdn.ac.uk>)
+
+Check on sk_reuse>1 is needed as during restore "bind" fails
+for sockets that was bound to the same port for same sk_family and also
+fails for sockets that are bound to the same port for other sk_family
+(Example: sshd that listen to port 22 IPv4 and IPv6 any address).
+
+For additional information see open_listening_sockets() and open_socket().
+
+Related to the bug#1034
+http://bugzilla.openvz.org/show_bug.cgi?id=1034
+
+Signed-off-by: Vitaliy Gusev <vgusev at openvz.org>
+Signed-off-by: Pavel Emelyanov <xemul at openvz.org>
+---
+
+diff --git a/net/ipv4/inet_connection_sock.c b/net/ipv4/inet_connection_sock.c
+index 5bfa408..2fbce13 100644
+--- a/net/ipv4/inet_connection_sock.c
++++ b/net/ipv4/inet_connection_sock.c
+@@ -146,6 +146,8 @@ int inet_csk_get_port(struct sock *sk, unsigned short snum)
+ 	goto tb_not_found;
+ tb_found:
+ 	if (!hlist_empty(&tb->owners)) {
++		if (sk->sk_reuse > 1)
++			goto success;
+ 		if (tb->fastreuse > 0 &&
+ 		    sk->sk_reuse && sk->sk_state != TCP_LISTEN) {
+ 			goto success;

Modified: dists/lenny/linux-2.6/debian/patches/series/14-extra
==============================================================================
--- dists/lenny/linux-2.6/debian/patches/series/14-extra	(original)
+++ dists/lenny/linux-2.6/debian/patches/series/14-extra	Tue Mar 17 08:02:40 2009
@@ -1,2 +1,3 @@
 + features/all/openvz/fix-wrong-size-of-ub0_percpu.patch featureset=openvz
 + features/all/openvz/netlink-fix-conntrack-oops.patch featureset=openvz
++ features/all/openvz/cpt-revert-check-on-sk_reuse-gt-one.patch