summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--fs/exec.c12
1 files changed, 8 insertions, 4 deletions
diff --git a/fs/exec.c b/fs/exec.c
index b58ba7d127e0..49fa0127a330 100644
--- a/fs/exec.c
+++ b/fs/exec.c
@@ -1373,7 +1373,11 @@ static void zap_process(struct task_struct *start)
struct task_struct *t;
unsigned long flags;
- spin_lock_irqsave(&start->sighand->siglock, flags);
+ /*
+ * start->sighand can't disappear, but may be
+ * changed by de_thread()
+ */
+ lock_task_sighand(start, &flags);
start->signal->flags = SIGNAL_GROUP_EXIT;
start->signal->group_stop_count = 0;
@@ -1386,7 +1390,7 @@ static void zap_process(struct task_struct *start)
}
} while ((t = next_thread(t)) != start);
- spin_unlock_irqrestore(&start->sighand->siglock, flags);
+ unlock_task_sighand(start, &flags);
}
static void zap_threads(struct mm_struct *mm)
@@ -1404,7 +1408,7 @@ static void zap_threads(struct mm_struct *mm)
complete(vfork_done);
}
- read_lock(&tasklist_lock);
+ rcu_read_lock();
for_each_process(g) {
p = g;
do {
@@ -1415,7 +1419,7 @@ static void zap_threads(struct mm_struct *mm)
}
} while ((p = next_thread(p)) != g);
}
- read_unlock(&tasklist_lock);
+ rcu_read_unlock();
}
static void coredump_wait(struct mm_struct *mm)