- xid fixes

Changed files:
    kernel-grsec_full.patch -> 1.15
    kernel-vserver-fixes.patch -> 1.5

diff --git a/kernel-grsec_full.patch b/kernel-grsec_full.patch
index 4939da571f21667d508bebe84cd63361995a238b..5bdc521d02d8ab529afb40b3137d905528aba087 100644 (file)
--- a/kernel-grsec_full.patch
+++ b/kernel-grsec_full.patch
@@ -8639,9 +8639,9 @@ diff -urNp linux-2.6.31/arch/x86/kernel/dumpstack.c linux-2.6.31/arch/x86/kernel
 @@ -181,7 +181,7 @@ void dump_stack(void)
  #endif
  
-       printk("Pid: %d, comm: %.20s %s %s %.*s\n",
--              current->pid, current->comm, print_tainted(),
-+              task_pid_nr(current), current->comm, print_tainted(),
+       printk("Pid: %d, comm: %.20s xid: #%u %s %s %.*s\n",
+-              current->pid, current->comm, current->xid, print_tainted(),
++              task_pid_nr(current), current->comm, current->xid, print_tainted(),
                init_utsname()->release,
                (int)strcspn(init_utsname()->version, " "),
                init_utsname()->version);
@@ -10599,9 +10599,9 @@ diff -urNp linux-2.6.31/arch/x86/kernel/process_64.c linux-2.6.31/arch/x86/kerne
 @@ -173,7 +173,7 @@ void __show_regs(struct pt_regs *regs, i
        if (!board)
                board = "";
-       printk(KERN_INFO "Pid: %d, comm: %.20s %s %s %.*s %s\n",
--              current->pid, current->comm, print_tainted(),
-+              task_pid_nr(current), 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(),
++              task_pid_nr(current), current->comm, current->xid, print_tainted(),
                init_utsname()->release,
                (int)strcspn(init_utsname()->version, " "),
                init_utsname()->version, board);

diff --git a/kernel-vserver-fixes.patch b/kernel-vserver-fixes.patch
index d239d8d7824af5c40b6c79755101093c06c4544c..37037a3518fbd7bdf3e1d91706e34d08643f2b53 100644 (file)
--- a/kernel-vserver-fixes.patch
+++ b/kernel-vserver-fixes.patch
@@ -63,9 +63,9 @@ diff -upr linux-2.6.25/security/selinux/include/av_permissions.h linux-2.6.25/se
        if (!board)
                board = "";
 -      printk(KERN_INFO "Pid: %d, comm: %.20s %s %s %.*s %s\n",
--              task_pid_nr(current), current->comm, print_tainted(),
+-              current->pid, current->comm, print_tainted(),
 +      printk(KERN_INFO "Pid: %d, comm: %.20s xid: #%u %s %s %.*s %s\n",
-+              task_pid_nr(current), current->comm, current->xid, print_tainted(),
++              current->pid, current->comm, current->xid, print_tainted(),
                init_utsname()->release,
                (int)strcspn(init_utsname()->version, " "),
                init_utsname()->version, board);
@@ -76,9 +76,9 @@ diff -upr linux-2.6.25/security/selinux/include/av_permissions.h linux-2.6.25/se
  #endif
  
 -      printk("Pid: %d, comm: %.20s %s %s %.*s\n",
--              task_pid_nr(current), current->comm, print_tainted(),
+-              current->pid, current->comm, print_tainted(),
 +      printk("Pid: %d, comm: %.20s xid: #%u %s %s %.*s\n",
-+              task_pid_nr(current), current->comm, current->xid, print_tainted(),
++              current->pid, current->comm, current->xid, print_tainted(),
                init_utsname()->release,
                (int)strcspn(init_utsname()->version, " "),
                init_utsname()->version);