Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 309771
b: refs/heads/master
c: 3208450
h: refs/heads/master
i:
  309769: 9789e98
  309767: ae2963e
v: v3
  • Loading branch information
Eric W. Biederman authored and Linus Torvalds committed Jun 1, 2012
1 parent 6fcba39 commit 2070135
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 7 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 9eaa3d9bb2c4da99b1161cfcc63f3e77d9d3d156
refs/heads/master: 3208450488ae724196f1efffc457e4265957c04e
11 changes: 5 additions & 6 deletions trunk/kernel/signal.c
Original file line number Diff line number Diff line change
Expand Up @@ -1656,19 +1656,18 @@ bool do_notify_parent(struct task_struct *tsk, int sig)
info.si_signo = sig;
info.si_errno = 0;
/*
* we are under tasklist_lock here so our parent is tied to
* us and cannot exit and release its namespace.
* We are under tasklist_lock here so our parent is tied to
* us and cannot change.
*
* the only it can is to switch its nsproxy with sys_unshare,
* bu uncharing pid namespaces is not allowed, so we'll always
* see relevant namespace
* task_active_pid_ns will always return the same pid namespace
* until a task passes through release_task.
*
* write_lock() currently calls preempt_disable() which is the
* same as rcu_read_lock(), but according to Oleg, this is not
* correct to rely on this
*/
rcu_read_lock();
info.si_pid = task_pid_nr_ns(tsk, tsk->parent->nsproxy->pid_ns);
info.si_pid = task_pid_nr_ns(tsk, task_active_pid_ns(tsk->parent));
info.si_uid = from_kuid_munged(task_cred_xxx(tsk->parent, user_ns),
task_uid(tsk));
rcu_read_unlock();
Expand Down

0 comments on commit 2070135

Please sign in to comment.