diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-06-08 19:40:08 +0100 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-06-08 19:40:08 +0100 |
| commit | 76962be8491b18ae7ff4fd6a4accd398bdb402a2 (patch) | |
| tree | 976958bf8e4989a69901bfbb25dd6463728c6cb5 /security/keys/keyctl.c | |
| parent | 5e27fb78df95e027723af2c90ecc9b4527ae59e9 (diff) | |
| parent | d30e5d897c3da7c2d17c8112331b66ed953eec78 (diff) | |
| download | kernel_goldelico_gta04-76962be8491b18ae7ff4fd6a4accd398bdb402a2.zip kernel_goldelico_gta04-76962be8491b18ae7ff4fd6a4accd398bdb402a2.tar.gz kernel_goldelico_gta04-76962be8491b18ae7ff4fd6a4accd398bdb402a2.tar.bz2 | |
Merge branch 'fix' of git://git.kernel.org/pub/scm/linux/kernel/git/ycmiao/pxa-linux-2.6
Diffstat (limited to 'security/keys/keyctl.c')
| -rw-r--r-- | security/keys/keyctl.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/security/keys/keyctl.c b/security/keys/keyctl.c index 8f4dce1..13074b4 100644 --- a/security/keys/keyctl.c +++ b/security/keys/keyctl.c @@ -1269,7 +1269,7 @@ long keyctl_session_to_parent(void) goto not_permitted; /* the parent must be single threaded */ - if (atomic_read(&parent->signal->count) != 1) + if (!thread_group_empty(parent)) goto not_permitted; /* the parent and the child must have different session keyrings or |