aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSerge E. Hallyn <serue@us.ibm.com>2008-02-23 18:23:33 -0500
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2008-02-23 20:12:13 -0500
commit094972840f2e7c1c6fc9e1a97d817cc17085378e (patch)
tree1fa2b8fb54b5d5d60318c8659d4574a81b953f88
parente5df70ab194543522397fa3da8c8f80564a0f7d3 (diff)
file capabilities: simplify signal check
Simplify the uid equivalence check in cap_task_kill(). Anyone can kill a process owned by the same uid. Without this patch wireshark is reported to fail. Signed-off-by: Serge E. Hallyn <serue@us.ibm.com> Signed-off-by: Andrew G. Morgan <morgan@kernel.org> Cc: <stable@kernel.org> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
-rw-r--r--security/commoncap.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/security/commoncap.c b/security/commoncap.c
index 5aba82679a0..bb0c095f576 100644
--- a/security/commoncap.c
+++ b/security/commoncap.c
@@ -552,7 +552,7 @@ int cap_task_kill(struct task_struct *p, struct siginfo *info,
552 * allowed. 552 * allowed.
553 * We must preserve legacy signal behavior in this case. 553 * We must preserve legacy signal behavior in this case.
554 */ 554 */
555 if (p->euid == 0 && p->uid == current->uid) 555 if (p->uid == current->uid)
556 return 0; 556 return 0;
557 557
558 /* sigcont is permitted within same session */ 558 /* sigcont is permitted within same session */