summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBenedikt Boehm <hollow@gentoo.org>2007-01-23 15:15:09 +0000
committerBenedikt Boehm <hollow@gentoo.org>2007-01-23 15:15:09 +0000
commit12f56248610a88564a1a4a9d4243a8d9bcca5695 (patch)
tree8cea25aa7f68affa0ec9ba883adbe2f4daabf82b /vserver-sources/2.2.0_rc8/4412_delta-vkill-fix03.patch
parentsome new versions; move old versions (diff)
downloadmisc-12f56248610a88564a1a4a9d4243a8d9bcca5695.tar.gz
misc-12f56248610a88564a1a4a9d4243a8d9bcca5695.tar.bz2
misc-12f56248610a88564a1a4a9d4243a8d9bcca5695.zip
add 2.2.0_rc8
svn path=/; revision=537
Diffstat (limited to 'vserver-sources/2.2.0_rc8/4412_delta-vkill-fix03.patch')
-rw-r--r--vserver-sources/2.2.0_rc8/4412_delta-vkill-fix03.patch27
1 files changed, 27 insertions, 0 deletions
diff --git a/vserver-sources/2.2.0_rc8/4412_delta-vkill-fix03.patch b/vserver-sources/2.2.0_rc8/4412_delta-vkill-fix03.patch
new file mode 100644
index 0000000..8daf15f
--- /dev/null
+++ b/vserver-sources/2.2.0_rc8/4412_delta-vkill-fix03.patch
@@ -0,0 +1,27 @@
+diff -NurpP --minimal linux-2.6.19.2-vs2.2.0-rc8.1/kernel/signal.c linux-2.6.19.2-vs2.2.0-rc8.2/kernel/signal.c
+--- linux-2.6.19.2-vs2.2.0-rc8.1/kernel/signal.c 2006-11-30 19:43:08 +0100
++++ linux-2.6.19.2-vs2.2.0-rc8.2/kernel/signal.c 2007-01-18 21:17:39 +0100
+@@ -586,6 +586,10 @@ static int check_kill_permission(int sig
+ (is_si_special(info) || !SI_FROMUSER(info)))
+ goto skip;
+
++ vxdprintk(VXD_CBIT(misc, 7),
++ "check_kill_permission(%d,%p,%p[#%u,%u])",
++ sig, info, t, vx_task_xid(t), t->pid);
++
+ error = -EPERM;
+ if (((sig != SIGCONT) ||
+ (current->signal->session != t->signal->session))
+@@ -596,9 +600,9 @@ static int check_kill_permission(int sig
+
+ error = -ESRCH;
+ if (!vx_check(vx_task_xid(t), VS_WATCH_P|VS_IDENT)) {
+- vxwprintk(current->xid,
+- "signal xid mismatch %p[#%u,%u] xid=#%u\n",
+- t, vx_task_xid(t), t->pid, current->xid);
++ vxwprintk(current->xid || VXD_CBIT(misc, 7),
++ "signal %d[%p] xid mismatch %p[#%u,%u] xid=#%u",
++ sig, info, t, vx_task_xid(t), t->pid, current->xid);
+ return error;
+ }
+ skip: