|
@@ -607,6 +607,17 @@ static int rm_from_queue(unsigned long mask, struct sigpending *s)
|
|
|
return 1;
|
|
|
}
|
|
|
|
|
|
+static inline int is_si_special(const struct siginfo *info)
|
|
|
+{
|
|
|
+ return info <= SEND_SIG_FORCED;
|
|
|
+}
|
|
|
+
|
|
|
+static inline bool si_fromuser(const struct siginfo *info)
|
|
|
+{
|
|
|
+ return info == SEND_SIG_NOINFO ||
|
|
|
+ (!is_si_special(info) && SI_FROMUSER(info));
|
|
|
+}
|
|
|
+
|
|
|
/*
|
|
|
* Bad permissions for sending the signal
|
|
|
* - the caller must hold at least the RCU read lock
|
|
@@ -621,7 +632,7 @@ static int check_kill_permission(int sig, struct siginfo *info,
|
|
|
if (!valid_signal(sig))
|
|
|
return -EINVAL;
|
|
|
|
|
|
- if (info != SEND_SIG_NOINFO && (is_si_special(info) || SI_FROMKERNEL(info)))
|
|
|
+ if (!si_fromuser(info))
|
|
|
return 0;
|
|
|
|
|
|
error = audit_signal_info(sig, t); /* Let audit system see the signal */
|
|
@@ -1186,8 +1197,7 @@ int kill_pid_info_as_uid(int sig, struct siginfo *info, struct pid *pid,
|
|
|
goto out_unlock;
|
|
|
}
|
|
|
pcred = __task_cred(p);
|
|
|
- if ((info == SEND_SIG_NOINFO ||
|
|
|
- (!is_si_special(info) && SI_FROMUSER(info))) &&
|
|
|
+ if (si_fromuser(info) &&
|
|
|
euid != pcred->suid && euid != pcred->uid &&
|
|
|
uid != pcred->suid && uid != pcred->uid) {
|
|
|
ret = -EPERM;
|