- up to 4.9.217

[packages/kernel.git] / kernel-vserver-fixes.patch

diff --git a/kernel-vserver-fixes.patch b/kernel-vserver-fixes.patch
index 938d3a28468c9b8c08aca070259bf81487918406..0eb930e58a1a2a2a0b063a8ae21e887112e5eac4 100644 (file)
--- a/kernel-vserver-fixes.patch
+++ b/kernel-vserver-fixes.patch
@@ -1,48 +1,28 @@
-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.33/arch/x86/kernel/process.c~    2010-02-24 19:52:17.000000000 +0100
-+++ linux-2.6.33/arch/x86/kernel/process.c     2010-02-25 23:44:56.487156216 +0100
-@@ -104,8 +104,8 @@
-               product = "";
- 
-       printk(KERN_CONT "\n");
--      printk(KERN_DEFAULT "Pid: %d, comm: %.20s %s %s %.*s %s/%s\n",
--              current->pid, current->comm, print_tainted(),
-+      printk(KERN_DEFAULT "Pid: %d, xid: #%u, comm: %.20s %s %s %.*s %s/%s\n",
-+              task_pid_nr(current), current->xid, current->comm, print_tainted(),
-               init_utsname()->release,
-               (int)strcspn(init_utsname()->version, " "),
-               init_utsname()->version, board, product);
---- 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))
 
---- linux-2.6.34/drivers/block/vroot.c~        2010-05-23 11:03:28.700872640 +0200
-+++ linux-2.6.34/drivers/block/vroot.c 2010-05-23 11:28:37.980638214 +0200
-@@ -17,6 +17,7 @@
- #include <linux/file.h>
- #include <linux/major.h>
- #include <linux/blkdev.h>
-+#include <linux/slab.h>
+
+diff -NurpP --minimal linux-4.9.207-vs2.3.9.11/net/core/sock.c linux-4.9.207-vs2.3.9.12/net/core/sock.c
+--- linux-4.9.207-vs2.3.9.11/net/core/sock.c   2019-12-25 15:37:52.958413722 +0000
++++ linux-4.9.207-vs2.3.9.12/net/core/sock.c   2020-02-26 14:31:15.988223949 +0000
+@@ -1343,9 +1343,10 @@ static struct sock *sk_prot_alloc(struct
+               if (!try_module_get(prot->owner))
+                       goto out_free_sec;
+               sk_tx_queue_clear(sk);
+-      }
++
+               sock_vx_init(sk);
+               sock_nx_init(sk);
++      }
+ 
+       return sk;
  
- #include <linux/vroot.h>
- #include <linux/vs_context.h>