From d40697ef50002c07448c469e09c21fbb535a675f Mon Sep 17 00:00:00 2001 From: David Quigley Date: Fri, 30 Jun 2006 01:55:47 -0700 Subject: [PATCH] --- yaml --- r: 31389 b: refs/heads/master c: 8f95dc58d0505516f5cc212a966aea2f2cdb5e44 h: refs/heads/master i: 31387: 65069fa65304adeb34d113d2521bddc82655d0b2 v: v3 --- [refs] | 2 +- trunk/include/linux/sched.h | 2 +- trunk/kernel/signal.c | 7 +++++-- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index b799824ba03b..36e1d10ac71d 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: f9008e4c5c525941967b67777945aa6266ab6326 +refs/heads/master: 8f95dc58d0505516f5cc212a966aea2f2cdb5e44 diff --git a/trunk/include/linux/sched.h b/trunk/include/linux/sched.h index 821f0481ebe1..aaf723308ed4 100644 --- a/trunk/include/linux/sched.h +++ b/trunk/include/linux/sched.h @@ -1153,7 +1153,7 @@ extern int force_sig_info(int, struct siginfo *, struct task_struct *); extern int __kill_pg_info(int sig, struct siginfo *info, pid_t pgrp); extern int kill_pg_info(int, struct siginfo *, pid_t); extern int kill_proc_info(int, struct siginfo *, pid_t); -extern int kill_proc_info_as_uid(int, struct siginfo *, pid_t, uid_t, uid_t); +extern int kill_proc_info_as_uid(int, struct siginfo *, pid_t, uid_t, uid_t, u32); extern void do_notify_parent(struct task_struct *, int); extern void force_sig(int, struct task_struct *); extern void force_sig_specific(int, struct task_struct *); diff --git a/trunk/kernel/signal.c b/trunk/kernel/signal.c index 52adf53929f6..477d11adf3d1 100644 --- a/trunk/kernel/signal.c +++ b/trunk/kernel/signal.c @@ -584,7 +584,7 @@ static int check_kill_permission(int sig, struct siginfo *info, && !capable(CAP_KILL)) return error; - error = security_task_kill(t, info, sig); + error = security_task_kill(t, info, sig, 0); if (!error) audit_signal_info(sig, t); /* Let audit system see the signal */ return error; @@ -1107,7 +1107,7 @@ kill_proc_info(int sig, struct siginfo *info, pid_t pid) /* like kill_proc_info(), but doesn't use uid/euid of "current" */ int kill_proc_info_as_uid(int sig, struct siginfo *info, pid_t pid, - uid_t uid, uid_t euid) + uid_t uid, uid_t euid, u32 secid) { int ret = -EINVAL; struct task_struct *p; @@ -1127,6 +1127,9 @@ int kill_proc_info_as_uid(int sig, struct siginfo *info, pid_t pid, ret = -EPERM; goto out_unlock; } + ret = security_task_kill(p, info, sig, secid); + if (ret) + goto out_unlock; if (sig && p->sighand) { unsigned long flags; spin_lock_irqsave(&p->sighand->siglock, flags);