Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 270f722d authored by Eugene Teo's avatar Eugene Teo Committed by Linus Torvalds
Browse files

Fix tsk->exit_state usage 



tsk->exit_state can only be 0, EXIT_ZOMBIE, or EXIT_DEAD.  A non-zero test
is the same as tsk->exit_state & (EXIT_ZOMBIE | EXIT_DEAD), so just testing
tsk->exit_state is sufficient.

Signed-off-by: default avatarEugene Teo <eugeneteo@kernel.sg>
Cc: Roland McGrath <roland@redhat.com>
Cc: Oleg Nesterov <oleg@tv-sign.ru>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent d85f50d5

fs/proc/array.c

+1 −2
Original line number Original line Diff line number Diff line
@@ -146,8 +146,7 @@ static inline const char *get_task_state(struct task_struct *tsk) 
					    TASK_UNINTERRUPTIBLE |

					    TASK_UNINTERRUPTIBLE |

					    TASK_STOPPED |

					    TASK_STOPPED |

					    TASK_TRACED)) |

					    TASK_TRACED)) |

			(tsk->exit_state & (EXIT_ZOMBIE |

					   tsk->exit_state;

					    EXIT_DEAD));

	const char **p = &task_state_array[0];

	const char **p = &task_state_array[0];





	while (state) {

	while (state) {

kernel/fork.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -117,7 +117,7 @@ EXPORT_SYMBOL(free_task); 




void __put_task_struct(struct task_struct *tsk)

void __put_task_struct(struct task_struct *tsk)

{

{

	WARN_ON(!(tsk->exit_state & (EXIT_DEAD | EXIT_ZOMBIE)));

	WARN_ON(!tsk->exit_state);

	WARN_ON(atomic_read(&tsk->usage));

	WARN_ON(atomic_read(&tsk->usage));

	WARN_ON(tsk == current);

	WARN_ON(tsk == current);

kernel/sched.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -5279,7 +5279,7 @@ static void migrate_dead(unsigned int dead_cpu, struct task_struct *p) 
	struct rq *rq = cpu_rq(dead_cpu);

	struct rq *rq = cpu_rq(dead_cpu);





	/* Must be exiting, otherwise would be on tasklist. */

	/* Must be exiting, otherwise would be on tasklist. */

	BUG_ON(p->exit_state != EXIT_ZOMBIE && p->exit_state != EXIT_DEAD);

	BUG_ON(!p->exit_state);





	/* Cannot have done final schedule yet: would have vanished. */

	/* Cannot have done final schedule yet: would have vanished. */

	BUG_ON(p->state == TASK_DEAD);

	BUG_ON(p->state == TASK_DEAD);