public inbox for linux-kernel@vger.kernel.org
 help / color / mirror / Atom feed
From: Roland Dreier <roland@kernel.org>
To: Linus Torvalds <torvalds@linux-foundation.org>
Cc: linux-kernel@vger.kernel.org, Oleg Nesterov <oleg@redhat.com>,
	Julien Tinnes <jln@google.com>, Klaus Dittrich <kladit@arcor.de>
Subject: [PATCH] Allow rt_sigqueueinfo and rt_tgsigqueueinfo to use si_code == SI_ASYNCIO
Date: Mon, 28 Mar 2011 11:24:00 -0700	[thread overview]
Message-ID: <1301336640-16348-1-git-send-email-roland@kernel.org> (raw)

From: Roland Dreier <roland@purestorage.com>

Commit da48524eb206 ("Prevent rt_sigqueueinfo and rt_tgsigqueueinfo
from spoofing the signal code") made the check on si_code too strict:
glibc's aio implementation wants to queue signals with SI_ASYNCIO, and
indeed glibc's tst-aio4 fails with the patched kernel.

Fix this by loosening the new check to allow SI_ASYNCIO as well.

Reported-by: Klaus Dittrich <kladit@arcor.de>
Signed-off-by: Roland Dreier <roland@purestorage.com>
---
 kernel/signal.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/kernel/signal.c b/kernel/signal.c
index 324eff5..b2bfa3a 100644
--- a/kernel/signal.c
+++ b/kernel/signal.c
@@ -2437,7 +2437,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 != SI_QUEUE && info.si_code != SI_ASYNCIO) {
 		/* We used to allow any < 0 si_code */
 		WARN_ON_ONCE(info.si_code < 0);
 		return -EPERM;
@@ -2457,7 +2457,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 != SI_QUEUE && info->si_code != SI_ASYNCIO) {
 		/* We used to allow any < 0 si_code */
 		WARN_ON_ONCE(info->si_code < 0);
 		return -EPERM;

             reply	other threads:[~2011-03-28 18:24 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2011-03-28 18:24 Roland Dreier [this message]
2011-03-28 17:42 ` [PATCH] Allow rt_sigqueueinfo and rt_tgsigqueueinfo to use si_code == SI_ASYNCIO Oleg Nesterov
2011-03-28 20:27   ` Roland Dreier

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=1301336640-16348-1-git-send-email-roland@kernel.org \
    --to=roland@kernel.org \
    --cc=jln@google.com \
    --cc=kladit@arcor.de \
    --cc=linux-kernel@vger.kernel.org \
    --cc=oleg@redhat.com \
    --cc=torvalds@linux-foundation.org \
    /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