|
@@ -736,7 +736,7 @@ static void flush_sigqueue_mask(sigset_t *mask, struct sigpending *s)
|
|
|
|
|
|
static inline int is_si_special(const struct siginfo *info)
|
|
|
{
|
|
|
- return info <= SEND_SIG_FORCED;
|
|
|
+ return info <= SEND_SIG_PRIV;
|
|
|
}
|
|
|
|
|
|
static inline bool si_fromuser(const struct siginfo *info)
|
|
@@ -1039,7 +1039,7 @@ static int __send_signal(int sig, struct siginfo *info, struct task_struct *t,
|
|
|
|
|
|
result = TRACE_SIGNAL_IGNORED;
|
|
|
if (!prepare_signal(sig, t,
|
|
|
- from_ancestor_ns || (info == SEND_SIG_PRIV) || (info == SEND_SIG_FORCED)))
|
|
|
+ from_ancestor_ns || (info == SEND_SIG_PRIV)))
|
|
|
goto ret;
|
|
|
|
|
|
pending = (type != PIDTYPE_PID) ? &t->signal->shared_pending : &t->pending;
|
|
@@ -1057,8 +1057,7 @@ static int __send_signal(int sig, struct siginfo *info, struct task_struct *t,
|
|
|
* Skip useless siginfo allocation for SIGKILL SIGSTOP,
|
|
|
* and kernel threads.
|
|
|
*/
|
|
|
- if ((info == SEND_SIG_FORCED) ||
|
|
|
- sig_kernel_only(sig) || (t->flags & PF_KTHREAD))
|
|
|
+ if (sig_kernel_only(sig) || (t->flags & PF_KTHREAD))
|
|
|
goto out_set;
|
|
|
|
|
|
/*
|