X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=kernel-vserver-fixes.patch;h=b46a5614512d0d5e0ea1bafe7071f439edbecf85;hb=7b09c3cb555291f277754007cac1f0157e9b6b9d;hp=37037a3518fbd7bdf3e1d91706e34d08643f2b53;hpb=f5b730387f5426743b8803e28bb0dc776c89b660;p=packages%2Fkernel.git

diff --git a/kernel-vserver-fixes.patch b/kernel-vserver-fixes.patch
index 37037a35..b46a5614 100644
--- a/kernel-vserver-fixes.patch
+++ b/kernel-vserver-fixes.patch
@@ -1,84 +1,11 @@
-Missing header for routes patch, caused vs2.3 route.h mixing
---- a/net/ipv4/netfilter/nf_nat_core.c~	2008-01-24 23:58:37.000000000 +0100
-+++ a/net/ipv4/netfilter/nf_nat_core.c	2008-03-30 21:00:19.349593833 +0200
-@@ -15,6 +15,7 @@
- #include <net/checksum.h>
- #include <net/icmp.h>
- #include <net/ip.h>
-+#include <net/route.h>
- #include <net/tcp.h>  /* For tcp_prot in getorigdst */
- #include <linux/icmp.h>
- #include <linux/udp.h>
-diff -upr linux-2.6.25/security/selinux/include/av_perm_to_string.h linux-2.6.25/security/selinux/include/av_perm_to_string.h
---- linux-2.6.25/security/selinux/include/av_perm_to_string.h	2008-04-17 02:49:44.000000000 +0000
-+++ linux-2.6.25/security/selinux/include/av_perm_to_string.h	2008-05-21 08:48:33.061933886 +0000
-@@ -135,6 +135,7 @@
-    S_(SECCLASS_CAPABILITY, CAPABILITY__SETFCAP, "setfcap")
-    S_(SECCLASS_CAPABILITY2, CAPABILITY2__MAC_OVERRIDE, "mac_override")
-    S_(SECCLASS_CAPABILITY2, CAPABILITY2__MAC_ADMIN, "mac_admin")
-+   S_(SECCLASS_CAPABILITY2, CAPABILITY2__CONTEXT, "context")
-    S_(SECCLASS_NETLINK_ROUTE_SOCKET, NETLINK_ROUTE_SOCKET__NLMSG_READ, "nlmsg_read")
-    S_(SECCLASS_NETLINK_ROUTE_SOCKET, NETLINK_ROUTE_SOCKET__NLMSG_WRITE, "nlmsg_write")
-    S_(SECCLASS_NETLINK_FIREWALL_SOCKET, NETLINK_FIREWALL_SOCKET__NLMSG_READ, "nlmsg_read")
-diff -upr linux-2.6.25/security/selinux/include/av_permissions.h linux-2.6.25/security/selinux/include/av_permissions.h
---- linux-2.6.25/security/selinux/include/av_permissions.h	2008-04-17 02:49:44.000000000 +0000
-+++ linux-2.6.25/security/selinux/include/av_permissions.h	2008-05-21 08:49:07.059597304 +0000
-@@ -536,6 +536,7 @@
- #define CAPABILITY__SETFCAP                       0x80000000UL
- #define CAPABILITY2__MAC_OVERRIDE                 0x00000001UL
- #define CAPABILITY2__MAC_ADMIN                    0x00000002UL
-+#define CAPABILITY2__CONTEXT                      0x00000004UL
- #define NETLINK_ROUTE_SOCKET__IOCTL               0x00000001UL
- #define NETLINK_ROUTE_SOCKET__READ                0x00000002UL
- #define NETLINK_ROUTE_SOCKET__WRITE               0x00000004UL
---- linux-2.6.27/arch/powerpc/include/asm/unistd.h.org	2008-11-02 22:23:47.000000000 +0000
-+++ linux-2.6.27/arch/powerpc/include/asm/unistd.h	2008-11-02 22:24:37.000000000 +0000
-@@ -275,7 +275,7 @@
- #endif
- #define __NR_rtas		255
- #define __NR_sys_debug_setcontext 256
--/* Number 257 is reserved for vserver */
-+#define __NR_vserver		257
- #define __NR_migrate_pages	258
- #define __NR_mbind		259
- #define __NR_get_mempolicy	260
-
---- linux-2.6.31/arch/x86/kernel/process_32.c~	2009-09-16 08:32:03.000000000 +0200
-+++ linux-2.6.31/arch/x86/kernel/process_32.c	2009-09-17 21:57:42.546921657 +0200
-@@ -148,8 +148,8 @@
- 	board = dmi_get_system_info(DMI_PRODUCT_NAME);
- 	if (!board)
- 		board = "";
--	printk("Pid: %d, comm: %s %s (%s %.*s) %s\n",
--			task_pid_nr(current), current->comm,
-+	printk("Pid: %d, comm: %s xid: #%u %s (%s %.*s) %s\n",
-+			task_pid_nr(current), current->comm, current->xid,
- 			print_tainted(), init_utsname()->release,
- 			(int)strcspn(init_utsname()->version, " "),
- 			init_utsname()->version, board);
---- linux-2.6.31/arch/x86/kernel/process_64.c~	2009-09-16 08:32:03.000000000 +0200
-+++ linux-2.6.31/arch/x86/kernel/process_64.c	2009-09-17 21:57:55.742127534 +0200
-@@ -172,8 +172,8 @@
- 	board = dmi_get_system_info(DMI_PRODUCT_NAME);
- 	if (!board)
- 		board = "";
--	printk(KERN_INFO "Pid: %d, comm: %.20s %s %s %.*s %s\n",
--		current->pid, current->comm, print_tainted(),
-+	printk(KERN_INFO "Pid: %d, comm: %.20s xid: #%u %s %s %.*s %s\n",
-+		current->pid, current->comm, current->xid, print_tainted(),
- 		init_utsname()->release,
- 		(int)strcspn(init_utsname()->version, " "),
- 		init_utsname()->version, board);
---- linux-2.6.31/arch/x86/kernel/dumpstack.c~	2009-09-16 08:32:02.000000000 +0200
-+++ linux-2.6.31/arch/x86/kernel/dumpstack.c	2009-09-17 21:58:13.778791960 +0200
-@@ -180,8 +180,8 @@
- 		get_bp(bp);
- #endif
- 
--	printk("Pid: %d, comm: %.20s %s %s %.*s\n",
--		current->pid, current->comm, print_tainted(),
-+	printk("Pid: %d, comm: %.20s xid: #%u %s %s %.*s\n",
-+		current->pid, current->comm, current->xid, print_tainted(),
- 		init_utsname()->release,
- 		(int)strcspn(init_utsname()->version, " "),
- 		init_utsname()->version);
+--- linux-3.3/fs/proc/base.c~	2012-03-19 21:44:42.000000000 +0100
++++ linux-3.3/fs/proc/base.c	2012-03-21 12:25:28.051092423 +0100
+@@ -568,6 +568,8 @@
+ 				 struct task_struct *task,
+ 				 int hide_pid_min)
+ {
++	if (vx_check(0, VS_WATCH_P))
++		return true;
+ 	if (pid->hide_pid < hide_pid_min)
+ 		return true;
+ 	if (in_group_p(pid->pid_gid))