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

Maximilian Attems maks at alioth.debian.org
Wed Jun 10 13:43:02 UTC 2009 

Author: maks
Date: Wed Jun 10 13:43:01 2009
New Revision: 13771

Log:
openvz add three upstream stable patches

this serie are selected non ABI breaker from 0083-0086:
- 0086 fixes bogus WARN_ON
- 0085 network crash fix
- 0084 oneliner bridge fix

Added:
   dists/lenny/linux-2.6/debian/patches/features/all/openvz/0084-net-bridge-process-skbs-has-been-already-substituted.patch
   dists/lenny/linux-2.6/debian/patches/features/all/openvz/0085-net-avoid-double-free-on-net-gen-pointer-on-error.patch
   dists/lenny/linux-2.6/debian/patches/features/all/openvz/0086-pidns-pi-futex-pid-check-fixup.patch
   dists/lenny/linux-2.6/debian/patches/series/17-extra
Modified:
   dists/lenny/linux-2.6/debian/changelog

Modified: dists/lenny/linux-2.6/debian/changelog
==============================================================================
--- dists/lenny/linux-2.6/debian/changelog	Wed Jun 10 11:47:08 2009	(r13770)
+++ dists/lenny/linux-2.6/debian/changelog	Wed Jun 10 13:43:01 2009	(r13771)
@@ -1,3 +1,12 @@
+linux-2.6 (2.6.26-17) stable; urgency=low
+
+  * [openvz] 19f7f85 net: bridge - process skbs has been already substituted
+    due to via_phys_dev
+  * [openvz] b1f08ed net: avoid double free on net->gen pointer on error
+  * [openvz] bbbad0a pidns: pi-futex pid check fixup
+
+ -- maximilian attems <maks at debian.org>  Wed, 10 Jun 2009 15:34:04 +0200
+
 linux-2.6 (2.6.26-16) stable; urgency=high
 
   [ maximilian attems ]

Added: dists/lenny/linux-2.6/debian/patches/features/all/openvz/0084-net-bridge-process-skbs-has-been-already-substituted.patch
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ dists/lenny/linux-2.6/debian/patches/features/all/openvz/0084-net-bridge-process-skbs-has-been-already-substituted.patch	Wed Jun 10 13:43:01 2009	(r13771)
@@ -0,0 +1,32 @@
+From 19f7f8542891b7138523659e8662e74404c8bab5 Mon Sep 17 00:00:00 2001
+From: Cyrill Gorcunov <gorcunov at openvz.org>
+Date: Tue, 21 Apr 2009 15:58:39 +0400
+Subject: [PATCH 84/86] net: bridge - process skbs has been already substituted due to via_phys_dev
+
+When via_phys_dev is enabled we substitute skb->dev with
+master_dev and pass it back to bridge code. Instead of
+dropping such skb we should pass it up to network stack
+to process.
+
+Signed-off-by: Cyrill Gorcunov <gorcunov at openvz.org>
+Signed-off-by: Pavel Emelyanov <xemul at openvz.org>
+---
+ net/bridge/br_input.c |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/net/bridge/br_input.c b/net/bridge/br_input.c
+index 8809156..77fc3b0 100644
+--- a/net/bridge/br_input.c
++++ b/net/bridge/br_input.c
+@@ -166,7 +166,7 @@ struct sk_buff *br_handle_frame(struct net_bridge_port *p, struct sk_buff *skb)
+ 		/* fall through */
+ 	case BR_STATE_LEARNING:
+ 		if (skb->brmark == BR_ALREADY_SEEN)
+-			return 0;
++			return skb;
+ 
+ 		out = p->br->via_phys_dev ? p->br->master_dev : p->br->dev;
+ 
+-- 
+1.6.3.1
+

Added: dists/lenny/linux-2.6/debian/patches/features/all/openvz/0085-net-avoid-double-free-on-net-gen-pointer-on-error.patch
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ dists/lenny/linux-2.6/debian/patches/features/all/openvz/0085-net-avoid-double-free-on-net-gen-pointer-on-error.patch	Wed Jun 10 13:43:01 2009	(r13771)
@@ -0,0 +1,29 @@
+From b1f08edfb39da75799222c2b76acae30e833067d Mon Sep 17 00:00:00 2001
+From: Pavel Emelyanov <xemul at openvz.org>
+Date: Wed, 22 Apr 2009 19:05:03 +0400
+Subject: [PATCH 85/86] net: avoid double free on net->gen pointer on error
+
+If we failed with netns creation net->gen will be kfree-ed twice.
+
+http://bugzilla.openvz.org/show_bug.cgi?id=1241
+
+Signed-off-by: Pavel Emelyanov <xemul at openvz.org>
+---
+ net/core/net_namespace.c |    1 +
+ 1 files changed, 1 insertions(+), 0 deletions(-)
+
+diff --git a/net/core/net_namespace.c b/net/core/net_namespace.c
+index 523eba0..64b0a40 100644
+--- a/net/core/net_namespace.c
++++ b/net/core/net_namespace.c
+@@ -75,6 +75,7 @@ out_undo:
+ 	}
+ 
+ 	rcu_barrier();
++	net->gen = NULL;
+ 	kfree(ng);
+ 	goto out;
+ }
+-- 
+1.6.3.1
+

Added: dists/lenny/linux-2.6/debian/patches/features/all/openvz/0086-pidns-pi-futex-pid-check-fixup.patch
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ dists/lenny/linux-2.6/debian/patches/features/all/openvz/0086-pidns-pi-futex-pid-check-fixup.patch	Wed Jun 10 13:43:01 2009	(r13771)
@@ -0,0 +1,30 @@
+From bbbad0afef910ba70a56da89389e121fb7cec2e0 Mon Sep 17 00:00:00 2001
+From: Konstantin Khlebnikov <khlebnikov at openvz.org>
+Date: Wed, 3 Jun 2009 16:33:00 +0400
+Subject: [PATCH 86/86] pidns: pi-futex pid check fixup
+
+fix WARN_ON condition
+
+port rh5 patch from Stanichenko Marat <mstanichenko at openvz.org>
+
+http://bugzilla.openvz.org/show_bug.cgi?id=1262
+---
+ kernel/futex.c |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/kernel/futex.c b/kernel/futex.c
+index a02be16..ed2c6ed 100644
+--- a/kernel/futex.c
++++ b/kernel/futex.c
+@@ -534,7 +534,7 @@ lookup_pi_state(u32 uval, struct futex_hash_bucket *hb,
+ 
+ 			WARN_ON(!atomic_read(&pi_state->refcount));
+ 			WARN_ON(pid && pi_state->owner &&
+-				pi_state->owner->pid != pid);
++				task_pid_vnr(pi_state->owner) != pid);
+ 
+ 			atomic_inc(&pi_state->refcount);
+ 			*ps = pi_state;
+-- 
+1.6.3.1
+

Added: dists/lenny/linux-2.6/debian/patches/series/17-extra
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ dists/lenny/linux-2.6/debian/patches/series/17-extra	Wed Jun 10 13:43:01 2009	(r13771)
@@ -0,0 +1,3 @@
++ features/all/openvz/0084-net-bridge-process-skbs-has-been-already-substituted.patch featureset=openvz
++ features/all/openvz/0085-net-avoid-double-free-on-net-gen-pointer-on-error.patch featureset=openvz
++ features/all/openvz/0086-pidns-pi-futex-pid-check-fixup.patch featureset=openvz

More information about the Kernel-svn-changes mailing list