kernel-vserver-fixes.patch

   1 Missing header for routes patch, caused vs2.3 route.h mixing
   2 --- a/net/ipv4/netfilter/nf_nat_core.c~ 2008-01-24 23:58:37.000000000 +0100
   3 +++ a/net/ipv4/netfilter/nf_nat_core.c  2008-03-30 21:00:19.349593833 +0200
   4 @@ -15,6 +15,7 @@
   5  #include <net/checksum.h>
   6  #include <net/icmp.h>
   7  #include <net/ip.h>
   8 +#include <net/route.h>
   9  #include <net/tcp.h>  /* For tcp_prot in getorigdst */
  10  #include <linux/icmp.h>
  11  #include <linux/udp.h>
  12 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
  13 --- linux-2.6.25/security/selinux/include/av_perm_to_string.h   2008-04-17 02:49:44.000000000 +0000
  14 +++ linux-2.6.25/security/selinux/include/av_perm_to_string.h   2008-05-21 08:48:33.061933886 +0000
  15 @@ -135,6 +135,7 @@
  16     S_(SECCLASS_CAPABILITY, CAPABILITY__SETFCAP, "setfcap")
  17     S_(SECCLASS_CAPABILITY2, CAPABILITY2__MAC_OVERRIDE, "mac_override")
  18     S_(SECCLASS_CAPABILITY2, CAPABILITY2__MAC_ADMIN, "mac_admin")
  19 +   S_(SECCLASS_CAPABILITY2, CAPABILITY2__CONTEXT, "context")
  20     S_(SECCLASS_NETLINK_ROUTE_SOCKET, NETLINK_ROUTE_SOCKET__NLMSG_READ, "nlmsg_read")
  21     S_(SECCLASS_NETLINK_ROUTE_SOCKET, NETLINK_ROUTE_SOCKET__NLMSG_WRITE, "nlmsg_write")
  22     S_(SECCLASS_NETLINK_FIREWALL_SOCKET, NETLINK_FIREWALL_SOCKET__NLMSG_READ, "nlmsg_read")
  23 diff -upr linux-2.6.25/security/selinux/include/av_permissions.h linux-2.6.25/security/selinux/include/av_permissions.h
  24 --- linux-2.6.25/security/selinux/include/av_permissions.h      2008-04-17 02:49:44.000000000 +0000
  25 +++ linux-2.6.25/security/selinux/include/av_permissions.h      2008-05-21 08:49:07.059597304 +0000
  26 @@ -536,6 +536,7 @@
  27  #define CAPABILITY__SETFCAP                       0x80000000UL
  28  #define CAPABILITY2__MAC_OVERRIDE                 0x00000001UL
  29  #define CAPABILITY2__MAC_ADMIN                    0x00000002UL
  30 +#define CAPABILITY2__CONTEXT                      0x00000004UL
  31  #define NETLINK_ROUTE_SOCKET__IOCTL               0x00000001UL
  32  #define NETLINK_ROUTE_SOCKET__READ                0x00000002UL
  33  #define NETLINK_ROUTE_SOCKET__WRITE               0x00000004UL
  34 --- e/arch/sparc64/kernel/ptrace.c~     2008-05-22 14:23:37.000000000 +0200
  35 +++ e/arch/sparc64/kernel/ptrace.c      2008-05-23 15:26:52.918491121 +0200
  36 @@ -223,10 +223,6 @@ static int genregs64_get(struct task_str
  37                                           16 * sizeof(u64),
  38                                           32 * sizeof(u64));
  39         }
  40 -       if (!vx_check(vx_task_xid(child), VS_WATCH_P | VS_IDENT)) {
  41 -               pt_error_return(regs, ESRCH);
  42 -               goto out_tsk;
  43 -       }
  44
  45         if (!ret) {
  46                 /* TSTATE, TPC, TNPC */
  47 --- e/arch/sparc/kernel/ptrace.c~       2008-05-23 21:32:41.000000000 +0200
  48 +++ e/arch/sparc/kernel/ptrace.c        2008-05-23 23:36:54.897759938 +0200
  49 @@ -271,10 +271,6 @@
  50                                          33 * sizeof(u32),
  51                                          34 * sizeof(u32));
  52         }
  53 -       if (!vx_check(vx_task_xid(child), VS_WATCH_P | VS_IDENT)) {
  54 -               pt_error_return(regs, ESRCH);
  55 -               goto out_tsk;
  56 -       }
  57
  58         if (!ret)
  59                 ret = user_regset_copyin_ignore(&pos, &count, &kbuf, &ubuf,