ptrace && SIGKILL fixes
cover ptrace && SIGKILL fixes
These 2 patches don't depend on each other. Each change is user visible, and I am not really sure it can't confuse debuggers/etc. The explicit ack/nack from maintainers is wanted.
If the first patch won't get Roland's ack, the nasty TASK_TRACED check in signal_pending_state() should die anyway. Something like the (incomplete) patch below.
Oleg.
linux/sched.h +2 -7
@@ -173,8 +173,8 @@ extern unsigned long long time_sync_thre#define TASK_RUNNING 0#define TASK_INTERRUPTIBLE 1#define TASK_UNINTERRUPTIBLE 2 -#define __TASK_STOPPED 4 -#define __TASK_TRACED 8 +#define TASK_STOPPED 4 +#define TASK_TRACED 8/* in tsk->exit_state */ #define EXIT_ZOMBIE 16#define EXIT_DEAD 32
@@ -184,8 +184,6 @@ extern unsigned long long time_sync_thre/* Convenience macros for the sake of set_task_state */ #define TASK_KILLABLE (TASK_WAKEKILL | TASK_UNINTERRUPTIBLE) -#define TASK_STOPPED (TASK_WAKEKILL | __TASK_STOPPED) -#define TASK_TRACED (TASK_WAKEKILL | __TASK_TRACED)/* Convenience macros for the sake of wake_up */ #define TASK_NORMAL (TASK_INTERRUPTIBLE | TASK_UNINTERRUPTIBLE)
@@ -2034,9 +2032,6 @@ static inline int signal_pending_state(lif (!signal_pending (p))return 0 ; -if (state & (__TASK_STOPPED | __TASK_TRACED)) -return 0 ; -return (state &TASK_INTERRUPTIBLE ) ||__fatal_signal_pending (p); }
signal.c +1 -1
@@ -496,7 +496,7 @@ void signal_wake_up(struct task_struct **/ mask =TASK_INTERRUPTIBLE ;if (resume) - mask |=TASK_WAKEKILL ; + mask |= (TASK_WAKEKILL |TASK_STOPPED |TASK_TRACED );if (!wake_up_state (t, mask))kick_process (t); }