From: Oleg Nesterov <oleg@redhat.com>
To: Andrew Morton <akpm@linux-foundation.org>
Cc: "Eric W. Biederman" <ebiederm@xmission.com>,
Christian Brauner <brauner@kernel.org>,
Peter Collingbourne <pcc@google.com>,
Wen Yang <wenyang.linux@foxmail.com>,
linux-kernel@vger.kernel.org
Subject: [PATCH 2/3] get_signal: hide_si_addr_tag_bits: fix the usage of uninitialized ksig
Date: Mon, 26 Feb 2024 17:56:50 +0100 [thread overview]
Message-ID: <20240226165650.GA20829@redhat.com> (raw)
In-Reply-To: <20240226165612.GA20787@redhat.com>
ksig->ka and ksig->info are not initialized if get_signal() returns 0 or
if the caller is PF_USER_WORKER.
Check signr != 0 before SA_EXPOSE_TAGBITS and move the "out" label down.
The latter means that ksig->sig won't be initialized if a PF_USER_WORKER
thread gets a fatal signal but this is fine, PF_USER_WORKER's don't use
ksig. And there is nothing new, in this case ksig->ka and ksig-info are
not initialized anyway. Add a comment.
Signed-off-by: Oleg Nesterov <oleg@redhat.com>
---
kernel/signal.c | 11 ++++++-----
1 file changed, 6 insertions(+), 5 deletions(-)
diff --git a/kernel/signal.c b/kernel/signal.c
index 09a6dd07cf6b..a69d3069067a 100644
--- a/kernel/signal.c
+++ b/kernel/signal.c
@@ -2881,8 +2881,9 @@ bool get_signal(struct ksignal *ksig)
/*
* PF_USER_WORKER threads will catch and exit on fatal signals
- * themselves. They have cleanup that must be performed, so
- * we cannot call do_exit() on their behalf.
+ * themselves. They have cleanup that must be performed, so we
+ * cannot call do_exit() on their behalf. Note that ksig won't
+ * be properly initialized, PF_USER_WORKER's shouldn't use it.
*/
if (current->flags & PF_USER_WORKER)
goto out;
@@ -2894,12 +2895,12 @@ bool get_signal(struct ksignal *ksig)
/* NOTREACHED */
}
spin_unlock_irq(&sighand->siglock);
-out:
+
ksig->sig = signr;
- if (!(ksig->ka.sa.sa_flags & SA_EXPOSE_TAGBITS))
+ if (signr && !(ksig->ka.sa.sa_flags & SA_EXPOSE_TAGBITS))
hide_si_addr_tag_bits(ksig);
-
+out:
return signr > 0;
}
--
2.25.1.362.g51ebf55
next prev parent reply other threads:[~2024-02-26 16:58 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-02-26 16:56 [PATCH 0/3] get_signal: minor cleanups and fix Oleg Nesterov
2024-02-26 16:56 ` [PATCH 1/3] get_signal: don't abuse ksig->info.si_signo and ksig->sig Oleg Nesterov
2024-02-26 16:56 ` Oleg Nesterov [this message]
2024-02-26 16:56 ` [PATCH 3/3] get_signal: don't initialize ksig->info if SIGNAL_GROUP_EXIT/group_exec_task 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=20240226165650.GA20829@redhat.com \
--to=oleg@redhat.com \
--cc=akpm@linux-foundation.org \
--cc=brauner@kernel.org \
--cc=ebiederm@xmission.com \
--cc=linux-kernel@vger.kernel.org \
--cc=pcc@google.com \
--cc=wenyang.linux@foxmail.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