mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: Vladimir Davydov <vdavydov@parallels.com>
To: <linux-kernel@vger.kernel.org>
Cc: Andrew Morton <akpm@linux-foundation.org>,
	Oleg Nesterov <oleg@redhat.com>,
	Richard Weinberger <richard@nod.at>,
	"Paul E. McKenney" <paulmck@linux.vnet.ibm.com>
Subject: [PATCH] signal: improve warning about using SI_TKILL in rt_[tg]sigqueueinfo
Date: Thu, 19 Mar 2015 12:53:01 +0300	[thread overview]
Message-ID: <1426758781-11746-1-git-send-email-vdavydov@parallels.com> (raw)

Sending SI_TKILL from rt_[tg]sigqueueinfo was deprecated, so now we
issue a warning on the first attempt of doing it. We use WARN_ON_ONCE,
which is not informative and, what is worse, taints the kernel, making
the trinity syscall fuzzer complain false-positively from time to time.

This patch therefore substitutes the WARN_ON_ONCE with a pr_warn_once.

Signed-off-by: Vladimir Davydov <vdavydov@parallels.com>
---
 kernel/signal.c |   16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

diff --git a/kernel/signal.c b/kernel/signal.c
index a390499943e4..3cbcd94457af 100644
--- a/kernel/signal.c
+++ b/kernel/signal.c
@@ -2993,8 +2993,11 @@ static int do_rt_sigqueueinfo(pid_t pid, int sig, siginfo_t *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);
+		/* We used to allow SI_TKILL */
+		if (info->si_code == SI_TKILL)
+			pr_warn_once("%s (%d): Sending SI_TKILL from "
+				     "rt_sigqueueinfo is deprecated\n",
+				     current->comm, current->pid);
 		return -EPERM;
 	}
 	info->si_signo = sig;
@@ -3041,10 +3044,13 @@ 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 ((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);
+		/* We used to allow SI_TKILL */
+		if (info->si_code == SI_TKILL)
+			pr_warn_once("%s (%d): Sending SI_TKILL from "
+				     "rt_tgsigqueueinfo is deprecated\n",
+				     current->comm, current->pid);
 		return -EPERM;
 	}
 	info->si_signo = sig;
-- 
1.7.10.4


             reply	other threads:[~2015-03-19  9:53 UTC|newest]

Thread overview: 4+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-03-19  9:53 Vladimir Davydov [this message]
2015-03-19 13:00 ` Oleg Nesterov
2015-03-19 14:33   ` Vladimir Davydov
2015-03-19 15:04     ` Oleg Nesterov

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=1426758781-11746-1-git-send-email-vdavydov@parallels.com \
    --to=vdavydov@parallels.com \
    --cc=akpm@linux-foundation.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=oleg@redhat.com \
    --cc=paulmck@linux.vnet.ibm.com \
    --cc=richard@nod.at \
    /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

all inboxes | Powered by JetHome®