From: Kyle Huey <me@kylehuey.com>
To: "Eric W. Biederman" <ebiederm@xmission.com>,
Jens Axboe <axboe@kernel.dk>,
Peter Zijlstra <peterz@infradead.org>,
Marco Elver <elver@google.com>, Oleg Nesterov <oleg@redhat.com>,
Thomas Gleixner <tglx@linutronix.de>,
Peter Collingbourne <pcc@google.com>,
Alexey Gladkov <legion@kernel.org>
Cc: "Robert O'Callahan" <rocallahan@gmail.com>,
"Marko Mäkelä" <marko.makela@mariadb.com>,
linux-kernel@vger.kernel.org
Subject: [PATCH 1/2] signal: factor out SIGKILL generation in get_signal
Date: Sun, 31 Oct 2021 20:41:46 -0700 [thread overview]
Message-ID: <20211101034147.6203-2-khuey@kylehuey.com> (raw)
In-Reply-To: <20211101034147.6203-1-khuey@kylehuey.com>
In preparation for adding a second case that will invoke the same code,
factor out this branch. Fix label formatting while we're nearby too.
Signed-off-by: Kyle Huey <khuey@kylehuey.com>
Reported-by: Marko Mäkelä <marko.makela@mariadb.com>
---
kernel/signal.c | 18 +++++++++++-------
1 file changed, 11 insertions(+), 7 deletions(-)
diff --git a/kernel/signal.c b/kernel/signal.c
index 487bf4f5dadf..4d26ee5c662a 100644
--- a/kernel/signal.c
+++ b/kernel/signal.c
@@ -2690,12 +2690,7 @@ bool get_signal(struct ksignal *ksig)
/* Has this task already been marked for death? */
if (signal_group_exit(signal)) {
- ksig->info.si_signo = signr = SIGKILL;
- sigdelset(¤t->pending.signal, SIGKILL);
- trace_signal_deliver(SIGKILL, SEND_SIG_NOINFO,
- &sighand->action[SIGKILL - 1]);
- recalc_sigpending();
- goto fatal;
+ goto kill;
}
for (;;) {
@@ -2816,7 +2811,16 @@ bool get_signal(struct ksignal *ksig)
continue;
}
- fatal:
+ goto fatal;
+
+kill:
+ ksig->info.si_signo = signr = SIGKILL;
+ sigdelset(¤t->pending.signal, SIGKILL);
+ trace_signal_deliver(SIGKILL, SEND_SIG_NOINFO,
+ &sighand->action[SIGKILL - 1]);
+ recalc_sigpending();
+
+fatal:
spin_unlock_irq(&sighand->siglock);
if (unlikely(cgroup_task_frozen(current)))
cgroup_leave_frozen(true);
--
2.33.1
next prev parent reply other threads:[~2021-11-01 3:42 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-11-01 3:41 [PATCH] signal: SIGKILL can cause signal effects to appear at PTRACE_EVENT_EXIT without tracer notification Kyle Huey
2021-11-01 3:41 ` Kyle Huey [this message]
2021-11-01 3:41 ` [PATCH 2/2] signal: after notifying a ptracer of a signal, recheck for pending SIGKILLs Kyle Huey
2021-11-02 14:08 ` [PATCH] signal: SIGKILL can cause signal effects to appear at PTRACE_EVENT_EXIT without tracer notification Eric W. Biederman
2021-11-02 16:01 ` Kyle Huey
2021-11-02 18:06 ` Eric W. Biederman
2021-11-02 19:09 ` Kyle Huey
2021-11-08 23:58 ` Kyle Huey
2021-11-14 17:19 ` Eric W. Biederman
2021-11-16 5:29 ` [PATCH 0/3] signal: requeuing undeliverable signals Eric W. Biederman
2021-11-16 5:32 ` [PATCH 1/3] signal: In get_signal test for signal_group_exit every time through the loop Eric W. Biederman
2021-11-16 18:23 ` Kees Cook
2021-11-17 16:31 ` Eric W. Biederman
2021-11-16 5:33 ` [PATCH 2/3] signal: Requeue signals in the appropriate queue Eric W. Biederman
2021-11-16 18:30 ` Kees Cook
2021-11-17 16:42 ` Eric W. Biederman
2021-11-16 5:34 ` [PATCH 3/3] signal: Requeue ptrace signals Eric W. Biederman
2021-11-16 18:31 ` Kees Cook
2021-11-17 16:44 ` Eric W. Biederman
2021-11-17 16:24 ` [PATCH 0/3] signal: requeuing undeliverable signals Kyle Huey
2021-11-17 16:51 ` Eric W. Biederman
2021-11-18 6:12 ` Marko Mäkelä
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=20211101034147.6203-2-khuey@kylehuey.com \
--to=me@kylehuey.com \
--cc=axboe@kernel.dk \
--cc=ebiederm@xmission.com \
--cc=elver@google.com \
--cc=legion@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=marko.makela@mariadb.com \
--cc=oleg@redhat.com \
--cc=pcc@google.com \
--cc=peterz@infradead.org \
--cc=rocallahan@gmail.com \
--cc=tglx@linutronix.de \
/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;
as well as URLs for NNTP newsgroup(s).