diff options
| author | John Stultz <john.stultz@linaro.org> | 2011-04-18 13:19:07 -0700 |
|---|---|---|
| committer | John Stultz <john.stultz@linaro.org> | 2011-04-18 13:19:07 -0700 |
| commit | 775d71e49c65f1f6aa57776ea1da62988fc9a30a (patch) | |
| tree | ce03cae544bacc8dda67422fd66a543dd1ae3c99 /kernel/signal.c | |
| parent | 18e82d2b952ab57fc1c8a69d4fa14e562f2aecf6 (diff) | |
| parent | c1a952f48517b5545075d8eb1a5d543099bd2ae1 (diff) | |
Merge branch 'upstream/linaro.38' into linaro-android.38KNOWN_GOOD
Diffstat (limited to 'kernel/signal.c')
| -rw-r--r-- | kernel/signal.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/kernel/signal.c b/kernel/signal.c index 31751868de8..bf11d2697e9 100644 --- a/kernel/signal.c +++ b/kernel/signal.c @@ -2423,7 +2423,7 @@ SYSCALL_DEFINE3(rt_sigqueueinfo, pid_t, pid, int, sig, /* 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 != SI_QUEUE) { + if (info.si_code >= 0 || info.si_code == SI_TKILL) { /* We used to allow any < 0 si_code */ WARN_ON_ONCE(info.si_code < 0); return -EPERM; @@ -2443,7 +2443,7 @@ long 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 != SI_QUEUE) { + if (info->si_code >= 0 || info->si_code == SI_TKILL) { /* We used to allow any < 0 si_code */ WARN_ON_ONCE(info->si_code < 0); return -EPERM; |