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 1/3] get_signal: don't abuse ksig->info.si_signo and ksig->sig
Date: Mon, 26 Feb 2024 17:56:47 +0100 [thread overview]
Message-ID: <20240226165647.GA20826@redhat.com> (raw)
In-Reply-To: <20240226165612.GA20787@redhat.com>
Cleanup and preparation for the next changes.
get_signal() uses signr or ksig->info.si_signo or ksig->sig in a chaotic
way, this looks confusing. Change it to always use signr.
Signed-off-by: Oleg Nesterov <oleg@redhat.com>
---
kernel/signal.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/kernel/signal.c b/kernel/signal.c
index c9c57d053ce4..09a6dd07cf6b 100644
--- a/kernel/signal.c
+++ b/kernel/signal.c
@@ -2842,7 +2842,7 @@ bool get_signal(struct ksignal *ksig)
spin_lock_irq(&sighand->siglock);
}
- if (likely(do_signal_stop(ksig->info.si_signo))) {
+ if (likely(do_signal_stop(signr))) {
/* It released the siglock. */
goto relock;
}
@@ -2866,7 +2866,7 @@ bool get_signal(struct ksignal *ksig)
if (sig_kernel_coredump(signr)) {
if (print_fatal_signals)
- print_fatal_signal(ksig->info.si_signo);
+ print_fatal_signal(signr);
proc_coredump_connector(current);
/*
* If it was able to dump core, this kills all
@@ -2890,7 +2890,7 @@ bool get_signal(struct ksignal *ksig)
/*
* Death signals, no core dump.
*/
- do_group_exit(ksig->info.si_signo);
+ do_group_exit(signr);
/* NOTREACHED */
}
spin_unlock_irq(&sighand->siglock);
@@ -2900,7 +2900,7 @@ bool get_signal(struct ksignal *ksig)
if (!(ksig->ka.sa.sa_flags & SA_EXPOSE_TAGBITS))
hide_si_addr_tag_bits(ksig);
- return ksig->sig > 0;
+ 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 ` Oleg Nesterov [this message]
2024-02-26 16:56 ` [PATCH 2/3] get_signal: hide_si_addr_tag_bits: fix the usage of uninitialized ksig Oleg Nesterov
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=20240226165647.GA20826@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