|
@@ -531,18 +531,18 @@ static int check_kill_permission(int sig, struct siginfo *info,
|
|
if (!valid_signal(sig))
|
|
if (!valid_signal(sig))
|
|
return error;
|
|
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) ||
|
|
|
|
- (process_session(current) != process_session(t)))
|
|
|
|
- && (current->euid ^ t->suid) && (current->euid ^ t->uid)
|
|
|
|
- && (current->uid ^ t->suid) && (current->uid ^ t->uid)
|
|
|
|
- && !capable(CAP_KILL))
|
|
|
|
|
|
+ if (info == SEND_SIG_NOINFO || (!is_si_special(info) && SI_FROMUSER(info))) {
|
|
|
|
+ error = audit_signal_info(sig, t); /* Let audit system see the signal */
|
|
|
|
+ if (error)
|
|
|
|
+ return error;
|
|
|
|
+ error = -EPERM;
|
|
|
|
+ if (((sig != SIGCONT) ||
|
|
|
|
+ (process_session(current) != process_session(t)))
|
|
|
|
+ && (current->euid ^ t->suid) && (current->euid ^ t->uid)
|
|
|
|
+ && (current->uid ^ t->suid) && (current->uid ^ t->uid)
|
|
|
|
+ && !capable(CAP_KILL))
|
|
return error;
|
|
return error;
|
|
|
|
+ }
|
|
|
|
|
|
return security_task_kill(t, info, sig, 0);
|
|
return security_task_kill(t, info, sig, 0);
|
|
}
|
|
}
|