rename is_single_threaded(task) to is_current_single_threaded(void)
Subsystems (5)
PATCH 1/2 rename is_single_threaded(task) to is_current_single_threaded(void)
(on top of rework-fix-is_single_threaded.patch)
- is_single_threaded(task) is not safe unless task == current, we can't use task->signal or task->mm.
- it doesn't make sense unless task == current, the task can fork right after the check.
Rename it to is_current_single_threaded() and kill the argument.
---
include/linux/sched.h | 2 +- lib/is_single_threaded.c | 3 ++- security/selinux/hooks.c | 2 +- security/keys/process_keys.c | 2 +- 4 files changed, 5 insertions(+), 4 deletions(-)
include/linux/sched.h renamed from include/linux/sched.h~ISS_1_RENAME +1 -1
@@ -2055,7 +2055,7 @@ static inline unsigned long wait_task_in#define for_each_process (p) \ for (p = &init_task ; (p = next_task(p)) != &init_task ; ) -extern bool is_single_threaded (struct task_struct *); +extern bool is_current_single_threaded (void );/* * Careful: do_each_thread/while_each_thread is a double loop so
lib/is_single_threaded.c renamed from lib/is_single_threaded.c~ISS_1_RENAME +2 -1
@@ -15,8 +15,9 @@/* * Returns true if the task does not share ->mm with another thread/process. */ -bool is_single_threaded (struct task_struct *task) +bool is_current_single_threaded (void ) { +struct task_struct *task = current;struct mm_struct *mm = task->mm;struct task_struct *p, *t;bool ret;
security/selinux/hooks.c renamed from security/selinux/hooks.c~ISS_1_RENAME +1 -1
@@ -5182,7 +5182,7 @@ static int selinux_setprocattr(struct ta/* Only allow single threaded processes to change context */ error = -EPERM ; -if (!is_single_threaded (p)) { +if (!is_current_single_threaded ()) { error =security_bounded_transition (tsec->sid, sid);if (error) goto abort_change;
security/keys/process_keys.c renamed from security/keys/process_keys.c~ISS_1_RENAME +1 -1
@@ -702,7 +702,7 @@ long join_session_keyring(const char *na/* only permit this if there's a single thread in the thread group - * this avoids us having to adjust the creds on all threads and risking * ENOMEM */ -if (!is_single_threaded (current)) +if (!is_current_single_threaded ())return -EMLINK ; new =prepare_creds ();
Quoted 11 lines · Oleg Nesterov
(on top of rework-fix-is_single_threaded.patch)
-
is_single_threaded(task)is not safe unless task == current, we can't usetask->signalortask->mm.- it doesn't make sense unless task == current, the task can fork right after the check.
Rename it to
is_current_single_threaded()and kill the argument.Signed-off-by Oleg Nesterov <[email protected]>
Signature · 2 lines
James Morris <[email protected]>
Quoted 9 lines · Oleg Nesterov
(on top of rework-fix-is_single_threaded.patch)
-
is_single_threaded(task)is not safe unless task == current, we can't usetask->signalortask->mm.- it doesn't make sense unless task == current, the task can fork right after the check.
Rename it to
is_current_single_threaded()and kill the argument.
It would be more natural to put the current first, as in current_is_single_threaded(). That would also fit with the various other current_* helpers we have.
Quoted 7 lines · Christoph Hellwig
Quoted 5 lines · Oleg Nesterov
(on top of rework-fix-is_single_threaded.patch)
-
is_single_threaded(task)is not safe unless task == current, we can't usetask->signalortask->mm.
Quoted 8 lines
Quoted 4 lines
- it doesn't make sense unless task == current, the task can fork right after the check.
Rename it to
is_current_single_threaded()and kill the argument.It would be more natural to put the current first, as in
current_is_single_threaded(). That would also fit with the various other current_* helpers we have.
Agreed, re-sending.
Oleg.
PATCH v2 1/2 rename is_single_threaded(task) to current_is_single_threaded(void)
In reply to Christoph Hellwig(on top of rework-fix-is_single_threaded.patch)
- is_single_threaded(task) is not safe unless task == current, we can't use task->signal or task->mm.
- it doesn't make sense unless task == current, the task can fork right after the check.
Rename it to current_is_single_threaded() and kill the argument.
---
include/linux/sched.h | 2 +- lib/is_single_threaded.c | 3 ++- security/selinux/hooks.c | 2 +- security/keys/process_keys.c | 2 +- 4 files changed, 5 insertions(+), 4 deletions(-)
include/linux/sched.h renamed from include/linux/sched.h~ISS_1_RENAME +1 -1
@@ -2055,7 +2055,7 @@ static inline unsigned long wait_task_in#define for_each_process (p) \ for (p = &init_task ; (p = next_task(p)) != &init_task ; ) -extern bool is_single_threaded (struct task_struct *); +extern bool current_is_single_threaded (void );/* * Careful: do_each_thread/while_each_thread is a double loop so
lib/is_single_threaded.c renamed from lib/is_single_threaded.c~ISS_1_RENAME +2 -1
@@ -15,8 +15,9 @@/* * Returns true if the task does not share ->mm with another thread/process. */ -bool is_single_threaded (struct task_struct *task) +bool current_is_single_threaded (void ) { +struct task_struct *task = current;struct mm_struct *mm = task->mm;struct task_struct *p, *t;bool ret;
security/selinux/hooks.c renamed from security/selinux/hooks.c~ISS_1_RENAME +1 -1
@@ -5182,7 +5182,7 @@ static int selinux_setprocattr(struct ta/* Only allow single threaded processes to change context */ error = -EPERM ; -if (!is_single_threaded (p)) { +if (!current_is_single_threaded ()) { error =security_bounded_transition (tsec->sid, sid);if (error) goto abort_change;
security/keys/process_keys.c renamed from security/keys/process_keys.c~ISS_1_RENAME +1 -1
@@ -702,7 +702,7 @@ long join_session_keyring(const char *na/* only permit this if there's a single thread in the thread group - * this avoids us having to adjust the creds on all threads and risking * ENOMEM */ -if (!is_single_threaded (current)) +if (!current_is_single_threaded ())return -EMLINK ; new =prepare_creds ();
PATCH v2 2/2 current_is_single_threaded: don't use ->mmap_sem
In reply to Christoph Hellwigcurrent_is_single_threaded() can safely miss a freshly forked CLONE_VM task, but in this case it must not miss its parent. That is why we take mm->mmap_sem for writing to make sure a thread/task with the same ->mm can't pass exit_mm() and disappear.
However we can avoid ->mmap_sem and rely on rcu/barriers:
- if we do not see the exiting parent on thread/process list we see the result of list_del_rcu(), in this case we must also see the result of list_add_rcu() which does wmb().
- if we do see the parent but its ->mm == NULL, we need rmb() to make sure we can't miss the child.
---
lib/is_single_threaded.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-)
lib/is_single_threaded.c renamed from lib/is_single_threaded.c~ISS_2_RCU +6 -4
@@ -22,8 +22,6 @@ bool current_is_single_threaded(void)struct task_struct *p, *t;bool ret; -might_sleep (); -if (atomic_read (&task->signal->live) !=1 )return false;
@@ -31,7 +29,6 @@ bool current_is_single_threaded(void)return true; ret = false; -down_write (&mm->mmap_sem);rcu_read_lock ();for_each_process (p) {if (unlikely (p->flags &PF_KTHREAD ))
@@ -45,12 +42,17 @@ bool current_is_single_threaded(void) goto found;if (likely (t->mm))break ; +/* +* t->mm == NULL. Make sure next_thread/next_task +* will see other CLONE_VM tasks which might be +* forked before exiting. +*/ +smp_rmb (); }while_each_thread (p, t); } ret = true; found:rcu_read_unlock (); -up_write (&mm->mmap_sem);return ret; }
Re: [PATCH v2 -mm 2/2] current_is_single_threaded: don't use ->mmap_sem
Quoted 7 lines · Oleg Nesterov
current_is_single_threaded()can safely miss a freshly forkedCLONE_VMtask, but in this case it must not miss its parent. That is why we takemm->mmap_semfor writing to make sure a thread/task with the same ->mm can't passexit_mm()and disappear.However we can avoid ->mmap_sem and rely on rcu/barriers:
Quoted 8 lines
- if we do not see the exiting parent on thread/process list we see the result of
list_del_rcu(), in this case we must also see the result oflist_add_rcu()which doeswmb().- if we do see the parent but its ->mm == NULL, we need
rmb()to make sure we can't miss the child.Signed-off-by Oleg Nesterov <[email protected]>
Re: [PATCH v2 -mm 1/2] rename is_single_threaded(task) to current_is_single_threaded(void)
In reply to Oleg NesterovQuoted 10 lines · Oleg Nesterov
-
is_single_threaded(task)is not safe unless task == current, we can't usetask->signalortask->mm.- it doesn't make sense unless task == current, the task can fork right after the check.
Rename it to
current_is_single_threaded()and kill the argument.Signed-off-by Oleg Nesterov <[email protected]>Acked-by James Morris <[email protected]>
James Morris
maintainerRe: [PATCH v2 -mm 2/2] current_is_single_threaded: don't use ->mmap_sem
In reply to David HowellsQuoted 6 lines · David Howells
Quoted 6 lines
However we can avoid ->mmap_sem and rely on rcu/barriers:
- if we do not see the exiting parent on thread/process list we see the result of
list_del_rcu(), in this case we must also see the result oflist_add_rcu()which doeswmb().
Quoted 6 lines
Quoted 4 lines
- if we do see the parent but its ->mm == NULL, we need
rmb()to make sure we can't miss the child.Signed-off-by Oleg Nesterov <[email protected]>Acked-by David Howells <[email protected]>
I gather this stuff is going into -mm ?
Can it be merged via security-testing#next?
Signature · 2 lines
James Morris <[email protected]>
Re: [PATCH v2 -mm 2/2] current_is_single_threaded: don't use ->mmap_sem
Quoted 9 lines · James Morris
Quoted 6 lines · David Howells
Quoted 6 lines
However we can avoid ->mmap_sem and rely on rcu/barriers:
- if we do not see the exiting parent on thread/process list we see the result of
list_del_rcu(), in this case we must also see the result oflist_add_rcu()which doeswmb().
Quoted 8 lines
Quoted 6 lines
Quoted 4 lines
- if we do see the parent but its ->mm == NULL, we need
rmb()to make sure we can't miss the child.Signed-off-by Oleg Nesterov <[email protected]>Acked-by David Howells <[email protected]>I gather this stuff is going into -mm ?
Yes, this is on top of rework-fix-is_single_threaded.patch
Given that David acked these changes, I guess they will go to -mm soon.
Quoted 1 line
Can it be merged via security-testing#next?
Please do what you think right, I don't know what will be more convenient to you and Andrew.
Oleg.
James Morris
maintainerRe: [PATCH v2 -mm 2/2] current_is_single_threaded: don't use ->mmap_sem
Quoted 11 lines · Oleg Nesterov
Quoted 1 line
I gather this stuff is going into -mm ?
Yes, this is on top of rework-fix-is_single_threaded.patch
Given that David acked these changes, I guess they will go to -mm soon.
Quoted 1 line
Can it be merged via security-testing#next?
Please do what you think right, I don't know what will be more convenient to you and Andrew.
I've applied all three patches to
Applied togit://git.kernel.org/pub/scm/linux/kernel/git/jmorris/security-testing-2.6#next
Oleg, please verify that they're the correct versions.
Signature · 2 lines
James Morris <[email protected]>