From: "Amanieu d'Antras" <amanieu@gmail.com>
To: linux-kernel@vger.kernel.org
Cc: Oleg Nesterov <oleg@redhat.com>,
Andrew Morton <akpm@linux-foundation.org>,
"Paul E. McKenney" <paulmck@linux.vnet.ibm.com>,
"Amanieu d'Antras" <amanieu@gmail.com>
Subject: [PATCH] signal: Make the si_code check in rt_[tg]sigqueueinfo stricter
Date: Mon, 12 Oct 2015 16:33:54 +0100 [thread overview]
Message-ID: <1444664034-22446-1-git-send-email-amanieu@gmail.com> (raw)
rt_sigqueueinfo and rt_tgsigqueueinfo check the value of si_code to
prevent a process from spoofing a kernel-generated signal or one
generated by kill/tgkill.
Unfortunately this check failed to take into account the fact that
the si_code value seen by a user process is only the low 16 bits of
the value in the kernel. It was still possible to spoof any si_code
by ORing 0xffff into the top 16 bits.
The check is tightened by checking the value of si_code that will
be seen by a user program instead of the one in the kernel.
Signed-off-by: Amanieu d'Antras <amanieu@gmail.com>
---
kernel/signal.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/kernel/signal.c b/kernel/signal.c
index 0f6bbbe..f3d4f39 100644
--- a/kernel/signal.c
+++ b/kernel/signal.c
@@ -2989,7 +2989,7 @@ static int do_rt_sigqueueinfo(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) &&
+ if (((short)info->si_code >= 0 || (short)info->si_code == SI_TKILL) &&
(task_pid_vnr(current) != pid))
return -EPERM;
@@ -3037,7 +3037,7 @@ 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) &&
+ if (((short)info->si_code >= 0 || (short)info->si_code == SI_TKILL) &&
(task_pid_vnr(current) != pid))
return -EPERM;
--
2.6.1
next reply other threads:[~2015-10-12 15:34 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-10-12 15:33 Amanieu d'Antras [this message]
2015-10-12 15:54 ` [PATCH] signal: Make the si_code check in rt_[tg]sigqueueinfo stricter Oleg Nesterov
2015-10-12 16:37 ` Amanieu d'Antras
2015-10-13 14:54 ` Oleg Nesterov
2015-10-13 15:40 ` Amanieu d'Antras
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1444664034-22446-1-git-send-email-amanieu@gmail.com \
--to=amanieu@gmail.com \
--cc=akpm@linux-foundation.org \
--cc=linux-kernel@vger.kernel.org \
--cc=oleg@redhat.com \
--cc=paulmck@linux.vnet.ibm.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox