aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOleg Nesterov <oleg@redhat.com>2009-07-10 03:48:23 +0200
committerJames Morris <jmorris@namei.org>2009-07-17 09:10:42 +1000
commit5bb459bb45d1ad3c177485dcf0af01580aa31125 (patch)
treefd6d11d424d222b97f56d8b870bdecbacaab8a17
parentd2e3ee9b29f5de5b01e611b04e6fb29760589b01 (diff)
kernel: rename is_single_threaded(task) to current_is_single_threaded(void)
- 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. Signed-off-by: Oleg Nesterov <oleg@redhat.com> Acked-by: David Howells <dhowells@redhat.com> Signed-off-by: James Morris <jmorris@namei.org>
-rw-r--r--include/linux/sched.h2
-rw-r--r--lib/is_single_threaded.c3
-rw-r--r--security/keys/process_keys.c2
-rw-r--r--security/selinux/hooks.c2
4 files changed, 5 insertions, 4 deletions
diff --git a/include/linux/sched.h b/include/linux/sched.h
index 16a982e389f..0839a2c9b95 100644
--- a/include/linux/sched.h
+++ b/include/linux/sched.h
@@ -2075,7 +2075,7 @@ static inline unsigned long wait_task_inactive(struct task_struct *p,
#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
diff --git a/lib/is_single_threaded.c b/lib/is_single_threaded.c
index 2762516e0a5..434010980bd 100644
--- a/lib/is_single_threaded.c
+++ b/lib/is_single_threaded.c
@@ -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;
diff --git a/security/keys/process_keys.c b/security/keys/process_keys.c
index 276d27882ce..ed929af466d 100644
--- a/security/keys/process_keys.c
+++ b/security/keys/process_keys.c
@@ -702,7 +702,7 @@ long join_session_keyring(const char *name)
/* 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();
diff --git a/security/selinux/hooks.c b/security/selinux/hooks.c
index 2081055f678..e65677da36b 100644
--- a/security/selinux/hooks.c
+++ b/security/selinux/hooks.c
@@ -5187,7 +5187,7 @@ static int selinux_setprocattr(struct task_struct *p,
/* 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;