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

Commit 85b6bce3 authored by Pavel Machek's avatar Pavel Machek Committed by Linus Torvalds
Browse files

[PATCH] Fix suspend with traced tasks 



strace /bin/bash misbehaves after resume; this fixes it.

(akpm: it's scary calling refrigerator() in state TASK_TRACED, but it seems to
do the right thing).

Signed-off-by: default avatarPavel Machek <pavel@suse.cz>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 1a75a3f0

kernel/power/process.c

+1 −2
Original line number Diff line number Diff line
@@ -26,8 +26,7 @@ static inline int freezeable(struct task_struct * p) 
	    (p->flags & PF_NOFREEZE) ||

	    (p->exit_state == EXIT_ZOMBIE) ||

	    (p->exit_state == EXIT_DEAD) ||

	    (p->state == TASK_STOPPED) ||

	    (p->state == TASK_TRACED))

	    (p->state == TASK_STOPPED))

		return 0;

	return 1;

}

kernel/signal.c

+1 −0
Original line number Diff line number Diff line
@@ -1560,6 +1560,7 @@ static void ptrace_stop(int exit_code, int nostop_code, siginfo_t *info) 
	/* Let the debugger run.  */

	set_current_state(TASK_TRACED);

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

	try_to_freeze();

	read_lock(&tasklist_lock);

	if (likely(current->ptrace & PT_PTRACED) &&

	    likely(current->parent != current->real_parent ||