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

Maximilian Attems maks at alioth.debian.org
Sat Mar 5 13:02:10 UTC 2011 

Author: maks
Date: Sat Mar  5 13:02:05 2011
New Revision: 16984

Log:
openvz: sync to really latest git

it contains important bugfixes, also use new upstream patch name.

Added:
   dists/squeeze/linux-2.6/debian/patches/features/all/openvz/0003-VE-shutdown-environment-only-if-VE-pid-ns-is-destroy.patch
   dists/squeeze/linux-2.6/debian/patches/features/all/openvz/0004-net-decriment-unix_nr_socks-if-ub_other_sock_charge-.patch
   dists/squeeze/linux-2.6/debian/patches/features/all/openvz/0005-ve-Fix-d_path-return-code-when-no-buffer-given.patch
Modified:
   dists/squeeze/linux-2.6/debian/changelog
   dists/squeeze/linux-2.6/debian/patches/features/all/openvz/openvz.patch
   dists/squeeze/linux-2.6/debian/patches/series/31-extra

Modified: dists/squeeze/linux-2.6/debian/changelog
==============================================================================
--- dists/squeeze/linux-2.6/debian/changelog	Sat Mar  5 13:01:33 2011	(r16983)
+++ dists/squeeze/linux-2.6/debian/changelog	Sat Mar  5 13:02:05 2011	(r16984)
@@ -42,9 +42,8 @@
   * CAN: Use inode instead of kernel address for /proc file (CVE-2010-4565)
 
   [ maximilian attems]
-  * Update openvz patch to 07aaa2e9fb25 (ipv6, checkpointing, stability,
-    ipsec, ppp, tc). (closes: #607041, #613501)
-  * Add openvz nfs fixes. (closes: #613170)
+  * Update openvz patch to feoktistov (ipv6, checkpointing, stability,
+    ipsec, nfs, ppp, tc, ve). (closes: #607041, #613501, #613170)
   * HID: add support for Acan FG-8100 barcode reader. (closes: #615888)
   * Add longterm 2.6.32.30:
     - nfsd: Memory corruption due to writing beyond the stat array

Added: dists/squeeze/linux-2.6/debian/patches/features/all/openvz/0003-VE-shutdown-environment-only-if-VE-pid-ns-is-destroy.patch
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ dists/squeeze/linux-2.6/debian/patches/features/all/openvz/0003-VE-shutdown-environment-only-if-VE-pid-ns-is-destroy.patch	Sat Mar  5 13:02:05 2011	(r16984)
@@ -0,0 +1,70 @@
+From 0b3292ec7942e79842955ed1502ec122563cc67c Mon Sep 17 00:00:00 2001
+From: Stanislav Kinsbursky <skinsbursky at parallels.com>
+Date: Tue, 15 Feb 2011 19:38:21 +0300
+Subject: [PATCH 3/6] VE: shutdown environment only if VE pid ns is destroying
+
+We have to make sure that pid namespace child reaper is current execution
+environment init process before calling any virtual hook and marking
+environment as not running. Otherwise any clonned process with CLONE_NEWPID flag
+will shutdown current execution environment on it's exit.
+
+http://bugzilla.openvz.org/show_bug.cgi?id=1773
+
+Signed-off-by: Stanislav Kinsbursky <skinsbursky at parallels.com>
+Signed-off-by: Pavel Emelyanov <xemul at openvz.org>
+---
+ kernel/pid_namespace.c |   29 +++++++++++++++--------------
+ 1 files changed, 15 insertions(+), 14 deletions(-)
+
+diff --git a/kernel/pid_namespace.c b/kernel/pid_namespace.c
+index 19a9c6a..b3a7b50 100644
+--- a/kernel/pid_namespace.c
++++ b/kernel/pid_namespace.c
+@@ -286,20 +286,21 @@ void zap_pid_ns_processes(struct pid_namespace *pid_ns)
+ 	struct task_struct *task;
+ 	struct ve_struct *env = get_exec_env();
+ 
+-	/*
+-	 * Here the VE changes its state into "not running".
+-	 * op_sem taken for write is a barrier to all VE manipulations from
+-	 * ioctl: it waits for operations currently in progress and blocks all
+-	 * subsequent operations until is_running is set to 0 and op_sem is
+-	 * released.
+-	 */
+-
+-	down_write(&env->op_sem);
+-	env->is_running = 0;
+-	up_write(&env->op_sem);
++	if (pid_ns == env->ve_ns->pid_ns) {
++		/*
++		 * Here the VE changes its state into "not running".
++		 * op_sem taken for write is a barrier to all VE manipulations from
++		 * ioctl: it waits for operations currently in progress and blocks all
++		 * subsequent operations until is_running is set to 0 and op_sem is
++		 * released.
++		 */
+ 
+-	ve_hook_iterate_fini(VE_INIT_EXIT_CHAIN, env);
++		down_write(&env->op_sem);
++		env->is_running = 0;
++		up_write(&env->op_sem);
+ 
++		ve_hook_iterate_fini(VE_INIT_EXIT_CHAIN, env);
++	}
+ 	/*
+ 	 * The last thread in the cgroup-init thread group is terminating.
+ 	 * Find remaining pid_ts in the namespace, signal and wait for them
+@@ -341,8 +342,8 @@ void zap_pid_ns_processes(struct pid_namespace *pid_ns)
+ 	acct_exit_ns(pid_ns);
+ 
+ #ifdef CONFIG_VE
+-	if (get_exec_env()->ve_ns->pid_ns == pid_ns)
+-		zap_ve_processes(get_exec_env());
++	if (pid_ns == env->ve_ns->pid_ns)
++		zap_ve_processes(env);
+ #endif
+ 	return;
+ }
+-- 
+1.7.4.1
+

Added: dists/squeeze/linux-2.6/debian/patches/features/all/openvz/0004-net-decriment-unix_nr_socks-if-ub_other_sock_charge-.patch
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ dists/squeeze/linux-2.6/debian/patches/features/all/openvz/0004-net-decriment-unix_nr_socks-if-ub_other_sock_charge-.patch	Sat Mar  5 13:02:05 2011	(r16984)
@@ -0,0 +1,28 @@
+From 84440d83c881ee1c0df48333c31bc131e90c2b8d Mon Sep 17 00:00:00 2001
+From: Andrey Vagin <avagin at openvz.org>
+Date: Wed, 16 Feb 2011 14:56:24 +0300
+Subject: [PATCH 4/6] net: decriment unix_nr_socks if ub_other_sock_charge failed
+
+unix_nr_sock is incremented before allocate new sock.
+
+Signed-off-by: Andrey Vagin <avagin at openvz.org>
+Signed-off-by: Pavel Emelyanov <xemul at openvz.org>
+---
+ net/unix/af_unix.c |    1 +
+ 1 files changed, 1 insertions(+), 0 deletions(-)
+
+diff --git a/net/unix/af_unix.c b/net/unix/af_unix.c
+index db6ef80..80c93ef 100644
+--- a/net/unix/af_unix.c
++++ b/net/unix/af_unix.c
+@@ -623,6 +623,7 @@ out:
+ 	return sk;
+ out_sk_free:
+ 	sk_free(sk);
++	atomic_dec(&unix_nr_socks);
+ 	return NULL;
+ }
+ 
+-- 
+1.7.4.1
+

Added: dists/squeeze/linux-2.6/debian/patches/features/all/openvz/0005-ve-Fix-d_path-return-code-when-no-buffer-given.patch
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ dists/squeeze/linux-2.6/debian/patches/features/all/openvz/0005-ve-Fix-d_path-return-code-when-no-buffer-given.patch	Sat Mar  5 13:02:05 2011	(r16984)
@@ -0,0 +1,41 @@
+From 469571728098c94c937865548df0b049a5395503 Mon Sep 17 00:00:00 2001
+From: Pavel Emelyanov <xemul at parallels.com>
+Date: Thu, 17 Feb 2011 12:12:23 +0300
+Subject: [PATCH 5/6] ve: Fix d_path return code when no buffer given
+
+In case we call d_path with NULL buffer (d_root_check) the
+return is *always* NULL, which is not what we actually want...
+
+Signed-off-by: Pavel Emelyanov <xemul at openvz.org>
+---
+ fs/dcache.c |    7 +++++--
+ 1 files changed, 5 insertions(+), 2 deletions(-)
+
+diff --git a/fs/dcache.c b/fs/dcache.c
+index 7fce87d..dc638a3 100644
+--- a/fs/dcache.c
++++ b/fs/dcache.c
+@@ -2037,7 +2037,7 @@ out:
+ 	if (deleted && buffer &&
+ 			prepend(&end, &buflen, " (deleted)", 10) != 0)
+ 		goto Elong;
+-out_err:
++
+ 	spin_unlock(&vfsmount_lock);
+ 	return buffer ? retval : NULL;
+ 
+@@ -2070,7 +2070,10 @@ global_root:
+ 
+ Elong:
+ 	retval = ERR_PTR(-ENAMETOOLONG);
+-	goto out_err;
++out_err:
++	spin_unlock(&vfsmount_lock);
++	return retval;
++
+ }
+ EXPORT_SYMBOL(__d_path);
+ 
+-- 
+1.7.4.1
+

Modified: dists/squeeze/linux-2.6/debian/patches/features/all/openvz/openvz.patch
==============================================================================
--- dists/squeeze/linux-2.6/debian/patches/features/all/openvz/openvz.patch	Sat Mar  5 13:01:33 2011	(r16983)
+++ dists/squeeze/linux-2.6/debian/patches/features/all/openvz/openvz.patch	Sat Mar  5 13:02:05 2011	(r16984)
@@ -6899,7 +6899,7 @@
  PATCHLEVEL = 6
  SUBLEVEL = 32
  EXTRAVERSION =
-+VZVERSION = dzhanibekov
++VZVERSION = feoktistov
  NAME = Man-Eating Seals of Antiquity
  
  # *DOCUMENTATION*

Modified: dists/squeeze/linux-2.6/debian/patches/series/31-extra
==============================================================================
--- dists/squeeze/linux-2.6/debian/patches/series/31-extra	Sat Mar  5 13:01:33 2011	(r16983)
+++ dists/squeeze/linux-2.6/debian/patches/series/31-extra	Sat Mar  5 13:02:05 2011	(r16984)
@@ -2,6 +2,9 @@
 + features/all/openvz/openvz.patch featureset=openvz
 + features/all/openvz/0001-sunrpc-ve-semaphore-deadlock-fixed.patch featureset=openvz
 + features/all/openvz/0002-venfs-Backport-some-patches-from-rhel6-branch.patch featureset=openvz
++ features/all/openvz/0003-VE-shutdown-environment-only-if-VE-pid-ns-is-destroy.patch featureset=openvz
++ features/all/openvz/0004-net-decriment-unix_nr_socks-if-ub_other_sock_charge-.patch featureset=openvz
++ features/all/openvz/0005-ve-Fix-d_path-return-code-when-no-buffer-given.patch featureset=openvz
 
 + debian/revert-sched-changes-in-2.6.32.29.patch featureset=vserver
 + features/all/vserver/vs2.3.0.36.29.6.patch featureset=vserver

More information about the Kernel-svn-changes mailing list