-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>
---- 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
+--- 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))
+
+upstream addition of masking all capabilities above CAP_LAST_CAP did not account for linux-vserver CAP_CONTEXT
+
+https://git.kernel.org/cgit/linux/kernel/git/stable/linux-stable.git/commit/?h=linux-3.10.y&id=76f01555c78e496203105bd29b878db3431a2260
+
+diff -urNpd linux-3.10.56-vs2.3.6.9~/include/linux/capability.h linux-3.10.56-vs2.3.6.9/include/linux/capability.h
+--- linux-3.10.56-vs2.3.6.9~/include/linux/capability.h 2014-09-18 12:28:39.000000000 -0500
++++ linux-3.10.56-vs2.3.6.9/include/linux/capability.h 2014-10-05 23:00:59.000000000 -0500
+@@ -79,7 +79,8 @@ extern const kernel_cap_t __cap_init_eff
+ #else /* HAND-CODED capability initializers */
-- 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-2.6.32/drivers/infiniband/hw/ipath/ipath_user_pages.c~ 2009-12-04 23:09:58.438777066 +0100
-+++ linux-2.6.32/drivers/infiniband/hw/ipath/ipath_user_pages.c 2009-12-04 23:12:42.808693591 +0100
-@@ -34,7 +34,7 @@
- #include <linux/mm.h>
- #include <linux/device.h>
- #include <linux/sched.h>
--// #include <linux/vs_memory.h>
-+#include <linux/vs_memory.h>
-
- #include "ipath_kernel.h"
+ #define CAP_LAST_U32 ((_KERNEL_CAPABILITY_U32S) - 1)
+-#define CAP_LAST_U32_VALID_MASK (CAP_TO_MASK(CAP_LAST_CAP + 1) -1)
++#define CAP_LAST_U32_VALID_MASK ((CAP_TO_MASK(CAP_LAST_CAP + 1) -1) \
++ | CAP_TO_MASK(CAP_CONTEXT))
+ # define CAP_EMPTY_SET ((kernel_cap_t){{ 0, 0 }})
+ # define CAP_FULL_SET ((kernel_cap_t){{ ~0, CAP_LAST_U32_VALID_MASK }})
projects / packages / kernel.git / blobdiff