From: Oleg Nesterov <oleg@redhat.com>
To: Christian Brauner <brauner@kernel.org>
Cc: Andy Lutomirski <luto@amacapital.net>,
"Eric W. Biederman" <ebiederm@xmission.com>,
Tycho Andersen <tycho@tycho.pizza>,
linux-api@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: [PATCH v2 1/2] signal: add the "int si_code" arg to prepare_kill_siginfo()
Date: Fri, 9 Feb 2024 14:06:20 +0100 [thread overview]
Message-ID: <20240209130620.GA8039@redhat.com> (raw)
So that do_tkill() can use this helper too. This also simplifies
the next patch.
TODO: perhaps we can kill prepare_kill_siginfo() and change the
callers to use SEND_SIG_NOINFO, but this needs some changes in
__send_signal_locked() and TP_STORE_SIGINFO().
Signed-off-by: Oleg Nesterov <oleg@redhat.com>
---
kernel/signal.c | 15 +++++----------
1 file changed, 5 insertions(+), 10 deletions(-)
diff --git a/kernel/signal.c b/kernel/signal.c
index c3fac06937e2..a8199fda0d61 100644
--- a/kernel/signal.c
+++ b/kernel/signal.c
@@ -3793,12 +3793,12 @@ COMPAT_SYSCALL_DEFINE4(rt_sigtimedwait_time32, compat_sigset_t __user *, uthese,
#endif
#endif
-static inline void prepare_kill_siginfo(int sig, struct kernel_siginfo *info)
+static void prepare_kill_siginfo(int sig, struct kernel_siginfo *info, int si_code)
{
clear_siginfo(info);
info->si_signo = sig;
info->si_errno = 0;
- info->si_code = SI_USER;
+ info->si_code = si_code;
info->si_pid = task_tgid_vnr(current);
info->si_uid = from_kuid_munged(current_user_ns(), current_uid());
}
@@ -3812,7 +3812,7 @@ SYSCALL_DEFINE2(kill, pid_t, pid, int, sig)
{
struct kernel_siginfo info;
- prepare_kill_siginfo(sig, &info);
+ prepare_kill_siginfo(sig, &info, SI_USER);
return kill_something_info(sig, &info, pid);
}
@@ -3925,7 +3925,7 @@ SYSCALL_DEFINE4(pidfd_send_signal, int, pidfd, int, sig,
(kinfo.si_code >= 0 || kinfo.si_code == SI_TKILL))
goto err;
} else {
- prepare_kill_siginfo(sig, &kinfo);
+ prepare_kill_siginfo(sig, &kinfo, SI_USER);
}
/* TODO: respect PIDFD_THREAD */
@@ -3970,12 +3970,7 @@ static int do_tkill(pid_t tgid, pid_t pid, int sig)
{
struct kernel_siginfo info;
- clear_siginfo(&info);
- info.si_signo = sig;
- info.si_errno = 0;
- info.si_code = SI_TKILL;
- info.si_pid = task_tgid_vnr(current);
- info.si_uid = from_kuid_munged(current_user_ns(), current_uid());
+ prepare_kill_siginfo(sig, &info, SI_TKILL);
return do_send_specific(tgid, pid, sig, &info);
}
--
2.25.1.362.g51ebf55
next reply other threads:[~2024-02-09 13:07 UTC|newest]
Thread overview: 37+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-02-09 13:06 Oleg Nesterov [this message]
2024-02-09 13:06 ` [PATCH v2 2/2] pidfd: change pidfd_send_signal() to respect PIDFD_THREAD Oleg Nesterov
2024-02-09 15:11 ` Christian Brauner
2024-02-09 15:15 ` Christian Brauner
2024-02-09 15:43 ` Oleg Nesterov
2024-02-09 15:49 ` Christian Brauner
2024-02-09 15:56 ` Oleg Nesterov
2024-02-10 10:23 ` Christian Brauner
2024-02-10 12:30 ` Oleg Nesterov
2024-02-10 12:47 ` Oleg Nesterov
2024-02-10 12:54 ` Christian Brauner
2024-02-10 13:15 ` Oleg Nesterov
2024-02-10 14:26 ` Christian Brauner
2024-02-10 16:51 ` Oleg Nesterov
2024-02-10 17:22 ` Christian Brauner
2024-02-14 12:36 ` Oleg Nesterov
2024-02-16 12:28 ` Christian Brauner
2024-02-16 13:06 ` Oleg Nesterov
2024-02-16 14:46 ` Christian Brauner
2024-02-16 18:12 ` Oleg Nesterov
2024-02-20 8:34 ` Christian Brauner
2024-02-20 9:02 ` Oleg Nesterov
2024-02-20 9:22 ` Christian Brauner
2024-02-20 11:00 ` Oleg Nesterov
2024-02-20 12:59 ` Christian Brauner
2024-02-20 16:22 ` Oleg Nesterov
2024-02-21 7:42 ` Christian Brauner
2024-02-21 12:55 ` Oleg Nesterov
2024-02-21 13:35 ` Christian Brauner
2024-02-09 19:08 ` Tycho Andersen
2024-02-09 15:10 ` [PATCH v2 1/2] signal: add the "int si_code" arg to prepare_kill_siginfo() Christian Brauner
2024-02-09 16:13 ` Christian Brauner
2024-02-09 16:22 ` Eric W. Biederman
2024-02-09 16:39 ` Oleg Nesterov
2024-02-09 19:36 ` Christian Brauner
2024-02-09 19:53 ` Oleg Nesterov
2024-02-09 20:01 ` Tycho Andersen
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=20240209130620.GA8039@redhat.com \
--to=oleg@redhat.com \
--cc=brauner@kernel.org \
--cc=ebiederm@xmission.com \
--cc=linux-api@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=luto@amacapital.net \
--cc=tycho@tycho.pizza \
/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 read-only IMAP folder(s) and NNTP newsgroup(s).