mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git
synced 2025-01-06 13:28:18 +00:00
coredump: simplify zap_process()
After commit 0258b5fd7c
("coredump: Limit coredumps to a single thread
group") zap_process() doesn't need the "task_struct *start" arg,
zap_threads() can pass "signal_struct *signal" instead.
This simplifies the code and allows to use __for_each_thread() which
is slightly more efficient.
Link: https://lkml.kernel.org/r/20240625140311.GA20787@redhat.com
Signed-off-by: Oleg Nesterov <oleg@redhat.com>
Cc: Christian Brauner <brauner@kernel.org>
Cc: Eric W. Biederman <ebiederm@xmission.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
This commit is contained in:
parent
2a49c8b6b6
commit
1e3fa25fca
@ -361,17 +361,16 @@ static int format_corename(struct core_name *cn, struct coredump_params *cprm,
|
|||||||
return ispipe;
|
return ispipe;
|
||||||
}
|
}
|
||||||
|
|
||||||
static int zap_process(struct task_struct *start, int exit_code)
|
static int zap_process(struct signal_struct *signal, int exit_code)
|
||||||
{
|
{
|
||||||
struct task_struct *t;
|
struct task_struct *t;
|
||||||
int nr = 0;
|
int nr = 0;
|
||||||
|
|
||||||
/* Allow SIGKILL, see prepare_signal() */
|
signal->flags = SIGNAL_GROUP_EXIT;
|
||||||
start->signal->flags = SIGNAL_GROUP_EXIT;
|
signal->group_exit_code = exit_code;
|
||||||
start->signal->group_exit_code = exit_code;
|
signal->group_stop_count = 0;
|
||||||
start->signal->group_stop_count = 0;
|
|
||||||
|
|
||||||
for_each_thread(start, t) {
|
__for_each_thread(signal, t) {
|
||||||
task_clear_jobctl_pending(t, JOBCTL_PENDING_MASK);
|
task_clear_jobctl_pending(t, JOBCTL_PENDING_MASK);
|
||||||
if (t != current && !(t->flags & PF_POSTCOREDUMP)) {
|
if (t != current && !(t->flags & PF_POSTCOREDUMP)) {
|
||||||
sigaddset(&t->pending.signal, SIGKILL);
|
sigaddset(&t->pending.signal, SIGKILL);
|
||||||
@ -391,8 +390,9 @@ static int zap_threads(struct task_struct *tsk,
|
|||||||
|
|
||||||
spin_lock_irq(&tsk->sighand->siglock);
|
spin_lock_irq(&tsk->sighand->siglock);
|
||||||
if (!(signal->flags & SIGNAL_GROUP_EXIT) && !signal->group_exec_task) {
|
if (!(signal->flags & SIGNAL_GROUP_EXIT) && !signal->group_exec_task) {
|
||||||
|
/* Allow SIGKILL, see prepare_signal() */
|
||||||
signal->core_state = core_state;
|
signal->core_state = core_state;
|
||||||
nr = zap_process(tsk, exit_code);
|
nr = zap_process(signal, exit_code);
|
||||||
clear_tsk_thread_flag(tsk, TIF_SIGPENDING);
|
clear_tsk_thread_flag(tsk, TIF_SIGPENDING);
|
||||||
tsk->flags |= PF_DUMPCORE;
|
tsk->flags |= PF_DUMPCORE;
|
||||||
atomic_set(&core_state->nr_threads, nr);
|
atomic_set(&core_state->nr_threads, nr);
|
||||||
|
Loading…
Reference in New Issue
Block a user