Merge branch 'audit.b38' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/audit-current
* 'audit.b38' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/audit-current: [PATCH] Abnormal End of Processes [PATCH] match audit name data [PATCH] complete message queue auditing [PATCH] audit inode for all xattr syscalls [PATCH] initialize name osid [PATCH] audit signal recipients [PATCH] add SIGNAL syscall class (v3) [PATCH] auditing ptrace
This commit is contained in:
@@ -497,6 +497,11 @@ static int check_kill_permission(int sig, struct siginfo *info,
|
||||
int error = -EINVAL;
|
||||
if (!valid_signal(sig))
|
||||
return error;
|
||||
|
||||
error = audit_signal_info(sig, t); /* Let audit system see the signal */
|
||||
if (error)
|
||||
return error;
|
||||
|
||||
error = -EPERM;
|
||||
if ((info == SEND_SIG_NOINFO || (!is_si_special(info) && SI_FROMUSER(info)))
|
||||
&& ((sig != SIGCONT) ||
|
||||
@@ -506,10 +511,7 @@ static int check_kill_permission(int sig, struct siginfo *info,
|
||||
&& !capable(CAP_KILL))
|
||||
return error;
|
||||
|
||||
error = security_task_kill(t, info, sig, 0);
|
||||
if (!error)
|
||||
audit_signal_info(sig, t); /* Let audit system see the signal */
|
||||
return error;
|
||||
return security_task_kill(t, info, sig, 0);
|
||||
}
|
||||
|
||||
/* forward decl */
|
||||
|
Reference in New Issue
Block a user