summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@osdl.org>2005-06-18 13:17:49 -0700
committerChris Wright <chrisw@osdl.org>2005-06-22 12:32:50 -0700
commitfe3d5c8793fcaf33c5d3118a7f3ffc135eadaf4d (patch)
tree19fac0a8a24b4c106babdfee1e68b5e794ece216
parent9ee1c939d1cb936b1f98e8d81aeffab57bae46ab (diff)
[PATCH] Clean up subthread exec (CAN-2005-1913)
Make sure we re-parent itimers. If subthread exec's with timer pending, signal is delivered to old group-leader and can panic kernel. Signed-off-by: Linus Torvalds <torvalds@ppc970.osdl.org> Signed-off-by: Chris Wright <chrisw@osdl.org>
-rw-r--r--fs/exec.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/fs/exec.c b/fs/exec.c
index e56ee2437025..422cc0ec5e36 100644
--- a/fs/exec.c
+++ b/fs/exec.c
@@ -649,6 +649,7 @@ static inline int de_thread(struct task_struct *tsk)
}
sig->group_exit_task = NULL;
sig->notify_count = 0;
+ sig->real_timer.data = (unsigned long)current;
spin_unlock_irq(lock);
/*