[kernel] r13190 - in dists/lenny/linux-2.6/debian: . patches/features/all/openvz patches/series
Maximilian Attems
maks at alioth.debian.org
Fri Mar 20 23:03:56 UTC 2009
Author: maks
Date: Fri Mar 20 23:02:54 2009
New Revision: 13190
Log:
openvz add several stable proposed patches
this third serie are selected non-ABI breaker from 0060-0070
Reported-by: Kir Kolyshkin <kir at openvz.org>
Tested-by: Ola Lundqvist <ola at inguza.com>
Added:
dists/lenny/linux-2.6/debian/patches/features/all/openvz/0063-bridge-don-t-leak-master-device-on-brctl-addif.patch
dists/lenny/linux-2.6/debian/patches/features/all/openvz/0064-net-NETIF_F_VIRTUAL-intersects-with-NETIF_F_LRO.patch
dists/lenny/linux-2.6/debian/patches/features/all/openvz/0065-Fix-broken-permissions-for-Unix98-pty.patch
dists/lenny/linux-2.6/debian/patches/features/all/openvz/0066-Free-skb-nf_bridge-in-veth_xmit-and-venet_xmit.patch
dists/lenny/linux-2.6/debian/patches/features/all/openvz/0067-autofs4-fix-ia32-compat-mode.patch
dists/lenny/linux-2.6/debian/patches/features/all/openvz/0070-pidns-update-leader_pid-at-pidns-attach.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 Fri Mar 20 23:02:54 2009
@@ -65,14 +65,20 @@
* [openvz] ff3483a Fix erratum that causes memory corruption.
* [openvz] 5fff3eb conntrack: adjust context during freeing.
* [openvz] 3cb8bc3 netfilter: NAT: assign nf_nat_seq_adjust_hook from VE0
- context only
+ context only.
* [openvz] 4909102 netfilter: call nf_register_hooks from VE0 context only.
* [openvz] ce67d5b iptables: setup init iptables mask before net
- initialization
- * [openvz] 134416f Correct per-process capabilities bounding set in CT
- * [openvz] 029cecb cpt: Make the proper check for sigmask
- * [openvz] 86d7416 ms: fix inotify umount
- * [openvz] c5c1032 Don't dereference NULL tsk->mm in ve_move_task
+ initialization.
+ * [openvz] 134416f Correct per-process capabilities bounding set in CT.
+ * [openvz] 029cecb cpt: Make the proper check for sigmask.
+ * [openvz] 86d7416 ms: fix inotify umount.
+ * [openvz] c5c1032 Don't dereference NULL tsk->mm in ve_move_task.
+ * [openvz] 5c591ae bridge: don't leak master device on brctl addif.
+ * [openvz] c578262 net: NETIF_F_VIRTUAL intersects with NETIF_F_LRO.
+ * [openvz] 8aa7044 Fix broken permissions for Unix98 pty.
+ * [openvz] 09686c1 Free skb->nf_bridge in veth_xmit() and venet_xmit().
+ * [openvz] 397500c autofs4: fix ia32 compat mode.
+ * [openvz] 0328e3d pidns: update leader_pid at pidns attach.
-- dann frazier <dannf at debian.org> Fri, 20 Mar 2009 13:12:12 -0600
Added: dists/lenny/linux-2.6/debian/patches/features/all/openvz/0063-bridge-don-t-leak-master-device-on-brctl-addif.patch
==============================================================================
--- (empty file)
+++ dists/lenny/linux-2.6/debian/patches/features/all/openvz/0063-bridge-don-t-leak-master-device-on-brctl-addif.patch Fri Mar 20 23:02:54 2009
@@ -0,0 +1,30 @@
+From 5c591aeb2a194a9554b0cf0bd3959d8c18fa5129 Mon Sep 17 00:00:00 2001
+From: Pavel Emelyanov <xemul at openvz.org>
+Date: Wed, 14 Jan 2009 18:23:02 +0300
+Subject: [PATCH] bridge: don't leak master device on brctl addif
+
+If we add a second ethernet device to bridge the former one leaks.
+
+http://bugzilla.openvz.org/show_bug.cgi?id=1145
+
+Signed-off-by: Pavel Emelyanov <xemul at openvz.org>
+---
+ net/bridge/br_if.c | 2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/net/bridge/br_if.c b/net/bridge/br_if.c
+index 3dac8fc..4588ddc 100644
+--- a/net/bridge/br_if.c
++++ b/net/bridge/br_if.c
+@@ -406,7 +406,7 @@ int br_add_if(struct net_bridge *br, struct net_device *dev)
+ if ((dev->flags & IFF_UP) && netif_carrier_ok(dev) &&
+ (br->dev->flags & IFF_UP))
+ br_stp_enable_port(p);
+- if (!(dev->features & NETIF_F_VIRTUAL)) {
++ if (!(dev->features & NETIF_F_VIRTUAL) && !br->master_dev) {
+ dev_hold(dev);
+ br->master_dev = dev;
+ }
+--
+1.6.0.6
+
Added: dists/lenny/linux-2.6/debian/patches/features/all/openvz/0064-net-NETIF_F_VIRTUAL-intersects-with-NETIF_F_LRO.patch
==============================================================================
--- (empty file)
+++ dists/lenny/linux-2.6/debian/patches/features/all/openvz/0064-net-NETIF_F_VIRTUAL-intersects-with-NETIF_F_LRO.patch Fri Mar 20 23:02:54 2009
@@ -0,0 +1,32 @@
+From c578262d8816d27ab5530696d7b5f1e102e3b977 Mon Sep 17 00:00:00 2001
+From: Denis V. Lunev <den at openvz.org>
+Date: Wed, 1 Oct 2008 12:06:39 +0400
+Subject: [PATCH] net: NETIF_F_VIRTUAL intersects with NETIF_F_LRO
+
+Fortunately, this is not a part of user/kernel interface
+[xemul picked 2.6.27's 4826fea3]
+
+Signed-off-by: Denis V. Lunev <den at openvz.org>
+Signed-off-by: Pavel Emelyanov <xemul at openvz.org>
+---
+ include/linux/netdevice.h | 4 ++--
+ 1 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/include/linux/netdevice.h b/include/linux/netdevice.h
+index 2e2acdb..0a4fb43 100644
+--- a/include/linux/netdevice.h
++++ b/include/linux/netdevice.h
+@@ -525,8 +525,8 @@ struct net_device
+ #define NETIF_F_LRO 32768 /* large receive offload */
+
+ /* Segmentation offload features */
+-#define NETIF_F_GSO_SHIFT 16
+-#define NETIF_F_GSO_MASK 0xffff0000
++#define NETIF_F_GSO_SHIFT 20
++#define NETIF_F_GSO_MASK 0xfff00000
+ #define NETIF_F_TSO (SKB_GSO_TCPV4 << NETIF_F_GSO_SHIFT)
+ #define NETIF_F_UFO (SKB_GSO_UDP << NETIF_F_GSO_SHIFT)
+ #define NETIF_F_GSO_ROBUST (SKB_GSO_DODGY << NETIF_F_GSO_SHIFT)
+--
+1.6.0.6
+
Added: dists/lenny/linux-2.6/debian/patches/features/all/openvz/0065-Fix-broken-permissions-for-Unix98-pty.patch
==============================================================================
--- (empty file)
+++ dists/lenny/linux-2.6/debian/patches/features/all/openvz/0065-Fix-broken-permissions-for-Unix98-pty.patch Fri Mar 20 23:02:54 2009
@@ -0,0 +1,30 @@
+From 8aa704481f80e55dce430c0c01d276e8ca13018e Mon Sep 17 00:00:00 2001
+From: Konstantin Ozerkov <kozerkov at openvz.org>
+Date: Fri, 23 Jan 2009 17:43:33 +0300
+Subject: [PATCH] Fix broken permissions for Unix98 pty.
+
+This bug is not very critical because modern software can
+automatically choose between legacy pty or Unix98 one.
+
+Signed-off-by: Konstantin Ozerkov <kozerkov at openvz.org>
+Signed-off-by: Pavel Emelyanov <xemul at openvz.org>
+---
+ security/device_cgroup.c | 2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/security/device_cgroup.c b/security/device_cgroup.c
+index d1da90a..ef9fc6b 100644
+--- a/security/device_cgroup.c
++++ b/security/device_cgroup.c
+@@ -88,7 +88,7 @@ static int devcgroup_can_attach(struct cgroup_subsys *ss,
+ #ifdef CONFIG_VE
+ static struct dev_whitelist_item default_whitelist_items[] = {
+ { ~0, ~0, DEV_ALL, ACC_MKNOD },
+- { UNIX98_PTY_SLAVE_MAJOR, ~0, DEV_CHAR, ACC_READ | ACC_WRITE },
++ { UNIX98_PTY_MASTER_MAJOR, ~0, DEV_CHAR, ACC_READ | ACC_WRITE },
+ { UNIX98_PTY_SLAVE_MAJOR, ~0, DEV_CHAR, ACC_READ | ACC_WRITE },
+ { PTY_MASTER_MAJOR, ~0, DEV_CHAR, ACC_READ | ACC_WRITE },
+ { PTY_SLAVE_MAJOR, ~0, DEV_CHAR, ACC_READ | ACC_WRITE },
+--
+1.6.0.6
+
Added: dists/lenny/linux-2.6/debian/patches/features/all/openvz/0066-Free-skb-nf_bridge-in-veth_xmit-and-venet_xmit.patch
==============================================================================
--- (empty file)
+++ dists/lenny/linux-2.6/debian/patches/features/all/openvz/0066-Free-skb-nf_bridge-in-veth_xmit-and-venet_xmit.patch Fri Mar 20 23:02:54 2009
@@ -0,0 +1,60 @@
+From 09686c184a2cb815cbd5af500fe468311887d746 Mon Sep 17 00:00:00 2001
+From: Vitaliy Gusev <vgusev at openvz.org>
+Date: Mon, 26 Jan 2009 15:48:02 +0300
+Subject: [PATCH] Free skb->nf_bridge in veth_xmit() and venet_xmit()
+
+We free skb->nfct in veth_xmit, but also have to free skb->nf_bridge.
+
+Note: Why it works in 2.6.24-ovz but doesn't work in 2.6.26-ovz ?
+
+ 1. It issue is only if BRIDGE_NETFILTER=y
+
+ 2. nf_hook_register() has effect to all VEs in 2.6.26-ovz
+ (in 2.6.24-ovz doesn't).
+ Thus bridge hook ip_sabotage_in is not called for 2.6.24-ovz, but
+ is called for 2.6.26-ovz.
+
+http://bugzilla.openvz.org/show_bug.cgi?id=1146
+
+Signed-off-by: Vitaliy Gusev <vgusev at openvz.org>
+Signed-off-by: Pavel Emelyanov <xemul at openvz.org>
+---
+ drivers/net/venet_core.c | 5 +----
+ drivers/net/vzethdev.c | 5 +----
+ 2 files changed, 2 insertions(+), 8 deletions(-)
+
+diff --git a/drivers/net/venet_core.c b/drivers/net/venet_core.c
+index 6b21630..8770255 100644
+--- a/drivers/net/venet_core.c
++++ b/drivers/net/venet_core.c
+@@ -272,10 +272,7 @@ static int venet_xmit(struct sk_buff *skb, struct net_device *dev)
+
+ dst_release(skb->dst);
+ skb->dst = NULL;
+-#if defined(CONFIG_NF_CONNTRACK) || defined(CONFIG_NF_CONNTRACK_MODULE)
+- nf_conntrack_put(skb->nfct);
+- skb->nfct = NULL;
+-#endif
++ nf_reset(skb);
+ length = skb->len;
+
+ netif_rx(skb);
+diff --git a/drivers/net/vzethdev.c b/drivers/net/vzethdev.c
+index 1414618..dd2b693 100644
+--- a/drivers/net/vzethdev.c
++++ b/drivers/net/vzethdev.c
+@@ -311,10 +311,7 @@ out:
+
+ dst_release(skb->dst);
+ skb->dst = NULL;
+-#if defined(CONFIG_NF_CONNTRACK) || defined(CONFIG_NF_CONNTRACK_MODULE)
+- nf_conntrack_put(skb->nfct);
+- skb->nfct = NULL;
+-#endif
++ nf_reset(skb);
+ length = skb->len;
+
+ netif_rx(skb);
+--
+1.6.0.6
+
Added: dists/lenny/linux-2.6/debian/patches/features/all/openvz/0067-autofs4-fix-ia32-compat-mode.patch
==============================================================================
--- (empty file)
+++ dists/lenny/linux-2.6/debian/patches/features/all/openvz/0067-autofs4-fix-ia32-compat-mode.patch Fri Mar 20 23:02:54 2009
@@ -0,0 +1,60 @@
+From 397500cb89baf75c8035060585c0886b3012708a Mon Sep 17 00:00:00 2001
+From: Konstantin Khlebnikov <khlebnikov at openvz.org>
+Date: Tue, 27 Jan 2009 14:34:57 +0300
+Subject: [PATCH] autofs4: fix ia32 compat mode
+
+autofs4_notify_daemon is called from the context of task accessing
+the autofs, not the daemon one. Thus the bitness check of current is
+wrong for mixed environments.
+
+Signed-off-by: Konstantin Khlebnikov <khlebnikov at openvz.org>
+Signed-off-by: Pavel Emelyanov <xemul at openvz.org>
+---
+ fs/autofs4/autofs_i.h | 1 +
+ fs/autofs4/inode.c | 4 ++++
+ fs/autofs4/waitq.c | 2 +-
+ 3 files changed, 6 insertions(+), 1 deletions(-)
+
+diff --git a/fs/autofs4/autofs_i.h b/fs/autofs4/autofs_i.h
+index 4c8d035..80dc520 100644
+--- a/fs/autofs4/autofs_i.h
++++ b/fs/autofs4/autofs_i.h
+@@ -114,6 +114,7 @@ struct autofs_sb_info {
+ struct autofs_wait_queue *queues; /* Wait queue pointer */
+ spinlock_t rehash_lock;
+ struct list_head rehash_list;
++ unsigned is32bit:1;
+ };
+
+ static inline struct autofs_sb_info *autofs4_sbi(struct super_block *sb)
+diff --git a/fs/autofs4/inode.c b/fs/autofs4/inode.c
+index 2d8dcb2..40b7b90 100644
+--- a/fs/autofs4/inode.c
++++ b/fs/autofs4/inode.c
+@@ -337,6 +337,10 @@ int autofs4_fill_super(struct super_block *s, void *data, int silent)
+ sbi->type = 0;
+ sbi->min_proto = 0;
+ sbi->max_proto = 0;
++#if defined CONFIG_X86_64 && defined CONFIG_IA32_EMULATION
++ if (test_thread_flag(TIF_IA32))
++ sbi->is32bit = 1;
++#endif
+ mutex_init(&sbi->wq_mutex);
+ spin_lock_init(&sbi->fs_lock);
+ sbi->queues = NULL;
+diff --git a/fs/autofs4/waitq.c b/fs/autofs4/waitq.c
+index 67d444c..c6d34ea 100644
+--- a/fs/autofs4/waitq.c
++++ b/fs/autofs4/waitq.c
+@@ -143,7 +143,7 @@ static void autofs4_notify_daemon(struct autofs_sb_info *sbi,
+ *
+ * reduce size if work in 32-bit mode to satisfy userspace hope
+ */
+- if (test_thread_flag(TIF_IA32))
++ if (sbi->is32bit)
+ pktsz -= 4;
+ #endif
+
+--
+1.6.0.6
+
Added: dists/lenny/linux-2.6/debian/patches/features/all/openvz/0070-pidns-update-leader_pid-at-pidns-attach.patch
==============================================================================
--- (empty file)
+++ dists/lenny/linux-2.6/debian/patches/features/all/openvz/0070-pidns-update-leader_pid-at-pidns-attach.patch Fri Mar 20 23:02:54 2009
@@ -0,0 +1,35 @@
+From 0328e3d32c6915650b14dd40fcd7598a420b1364 Mon Sep 17 00:00:00 2001
+From: Konstantin Khlebnikov <khlebnikov at openvz.org>
+Date: Tue, 24 Feb 2009 16:47:23 +0300
+Subject: [PATCH] pidns: update leader_pid at pidns attach
+
+after commit fea9d17 it_real_fn send SIGALRM to task->signal->leader_pid
+(used for sys_alarm(...) and sys_setitimer(ITIMER_REAL,...))
+
+Thus, __pid_ns_attach_task hack-n-dirty cross pid-ns task movement must
+update this pid too
+
+http://bugzilla.openvz.org/show_bug.cgi?id=1160
+127384
+
+Signed-off-by: Konstantin Khlebnikov <khlebnikov at openvz.org>
+Signed-off-by: Pavel Emelyanov <xemul at openvz.org>
+---
+ kernel/pid_namespace.c | 1 +
+ 1 files changed, 1 insertions(+), 0 deletions(-)
+
+diff --git a/kernel/pid_namespace.c b/kernel/pid_namespace.c
+index c478b80..1445b22 100644
+--- a/kernel/pid_namespace.c
++++ b/kernel/pid_namespace.c
+@@ -209,6 +209,7 @@ static int __pid_ns_attach_task(struct pid_namespace *ns,
+ set_task_session(tsk, pid_nr(pid));
+ reattach_pid(tsk, PIDTYPE_PGID, pid);
+ tsk->signal->__pgrp = pid_nr(pid);
++ tsk->signal->leader_pid = pid;
+ current->signal->tty_old_pgrp = NULL;
+
+ reattach_pid(tsk, PIDTYPE_PID, pid);
+--
+1.6.0.6
+
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 Fri Mar 20 23:02:54 2009
@@ -16,3 +16,9 @@
+ features/all/openvz/0049-cpt-Make-the-proper-check-for-sigmask.patch featureset=openvz
+ features/all/openvz/0052-ms-fix-inotify-umount.patch featureset=openvz
+ features/all/openvz/0059-Don-t-dereference-NULL-tsk-mm-in-ve_move_task.patch featureset=openvz
++ features/all/openvz/0063-bridge-don-t-leak-master-device-on-brctl-addif.patch featureset=openvz
++ features/all/openvz/0064-net-NETIF_F_VIRTUAL-intersects-with-NETIF_F_LRO.patch featureset=openvz
++ features/all/openvz/0065-Fix-broken-permissions-for-Unix98-pty.patch featureset=openvz
++ features/all/openvz/0066-Free-skb-nf_bridge-in-veth_xmit-and-venet_xmit.patch featureset=openvz
++ features/all/openvz/0067-autofs4-fix-ia32-compat-mode.patch featureset=openvz
++ features/all/openvz/0070-pidns-update-leader_pid-at-pidns-attach.patch featureset=openvz
More information about the Kernel-svn-changes
mailing list