Commit 2f824d4d authored by Eric W. Biederman's avatar Eric W. Biederman
Browse files

signal: Remove SIGNAL_GROUP_COREDUMP 

After the previous cleanups "signal->core_state" is set whenever
SIGNAL_GROUP_COREDUMP is set and "signal->core_state" is tested
whenver the code wants to know if a coredump is in progress.  The
remaining tests of SIGNAL_GROUP_COREDUMP also test to see if
SIGNAL_GROUP_EXIT is set.  Similarly the only place that sets
SIGNAL_GROUP_COREDUMP also sets SIGNAL_GROUP_EXIT.

Which makes SIGNAL_GROUP_COREDUMP unecessary and redundant. So stop
setting SIGNAL_GROUP_COREDUMP, stop testing SIGNAL_GROUP_COREDUMP, and
remove it's definition.

With the setting of SIGNAL_GROUP_COREDUMP gone, coredump_finish no
longer needs to clear SIGNAL_GROUP_COREDUMP out of signal->flags
by setting SIGNAL_GROUP_EXIT.

Link: https://lkml.kernel.org/r/20211213225350.27481-5-ebiederm@xmission.com


Signed-off-by: default avatar"Eric W. Biederman" <ebiederm@xmission.com>
parent 752dc970

fs/coredump.c

+1 −2
Original line number Diff line number Diff line
@@ -353,7 +353,7 @@ static int zap_process(struct task_struct *start, int exit_code) 
	int nr = 0;



	/* ignore all signals except SIGKILL, see prepare_signal() */

	start->signal->flags = SIGNAL_GROUP_EXIT | SIGNAL_GROUP_COREDUMP;

	start->signal->flags = SIGNAL_GROUP_EXIT;

	start->signal->group_exit_code = exit_code;

	start->signal->group_stop_count = 0;
@@ -427,7 +427,6 @@ static void coredump_finish(bool core_dumped) 
	if (core_dumped && !__fatal_signal_pending(current))

		current->signal->group_exit_code |= 0x80;

	current->signal->group_exit_task = NULL;

	current->signal->flags = SIGNAL_GROUP_EXIT;

	next = current->signal->core_state->dumper.next;

	current->signal->core_state = NULL;

	spin_unlock_irq(&current->sighand->siglock);

include/linux/sched/signal.h

+1 −2
Original line number Diff line number Diff line
@@ -256,7 +256,6 @@ struct signal_struct { 
#define SIGNAL_STOP_STOPPED	0x00000001 /* job control stop in effect */

#define SIGNAL_STOP_CONTINUED	0x00000002 /* SIGCONT since WCONTINUED reap */

#define SIGNAL_GROUP_EXIT	0x00000004 /* group exit in progress */

#define SIGNAL_GROUP_COREDUMP	0x00000008 /* coredump in progress */

/*

 * Pending notifications to parent.

 */
@@ -272,7 +271,7 @@ struct signal_struct { 
static inline void signal_set_stop_flags(struct signal_struct *sig,

					 unsigned int flags)

{

	WARN_ON(sig->flags & (SIGNAL_GROUP_EXIT|SIGNAL_GROUP_COREDUMP));

	WARN_ON(sig->flags & SIGNAL_GROUP_EXIT);

	sig->flags = (sig->flags & ~SIGNAL_STOP_MASK) | flags;

}

kernel/signal.c

+1 −1
Original line number Diff line number Diff line
@@ -906,7 +906,7 @@ static bool prepare_signal(int sig, struct task_struct *p, bool force) 
	struct task_struct *t;

	sigset_t flush;



	if ((signal->flags & SIGNAL_GROUP_EXIT) || signal->core_state) {

	if (signal->flags & SIGNAL_GROUP_EXIT) {

		if (signal->core_state)

			return sig == SIGKILL;

		/*