|
@@ -2992,11 +2992,9 @@ static int do_rt_sigqueueinfo(pid_t pid, int sig, siginfo_t *info)
|
|
|
* Nor can they impersonate a kill()/tgkill(), which adds source info.
|
|
|
*/
|
|
|
if ((info->si_code >= 0 || info->si_code == SI_TKILL) &&
|
|
|
- (task_pid_vnr(current) != pid)) {
|
|
|
- /* We used to allow any < 0 si_code */
|
|
|
- WARN_ON_ONCE(info->si_code < 0);
|
|
|
+ (task_pid_vnr(current) != pid))
|
|
|
return -EPERM;
|
|
|
- }
|
|
|
+
|
|
|
info->si_signo = sig;
|
|
|
|
|
|
/* POSIX.1b doesn't mention process groups. */
|
|
@@ -3041,12 +3039,10 @@ static int do_rt_tgsigqueueinfo(pid_t tgid, pid_t pid, int sig, siginfo_t *info)
|
|
|
/* Not even root can pretend to send signals from the kernel.
|
|
|
* Nor can they impersonate a kill()/tgkill(), which adds source info.
|
|
|
*/
|
|
|
- if (((info->si_code >= 0 || info->si_code == SI_TKILL)) &&
|
|
|
- (task_pid_vnr(current) != pid)) {
|
|
|
- /* We used to allow any < 0 si_code */
|
|
|
- WARN_ON_ONCE(info->si_code < 0);
|
|
|
+ if ((info->si_code >= 0 || info->si_code == SI_TKILL) &&
|
|
|
+ (task_pid_vnr(current) != pid))
|
|
|
return -EPERM;
|
|
|
- }
|
|
|
+
|
|
|
info->si_signo = sig;
|
|
|
|
|
|
return do_send_specific(tgid, pid, sig, info);
|