summaryrefslogtreecommitdiff
path: root/security
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2010-04-27 16:26:46 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2010-04-27 16:26:46 -0700
commit1600f9def09de07c5dbeb539e978fa73880690dd (patch)
treea8fa5c0891c68740543425d139414fec3d38b26e /security
parent11e39d993dc693e0bfc5521d367b2494cb3bcd38 (diff)
parentb59ec78cdcc57e02bc3dddfa7134a2f0fd15c34d (diff)
downloadlinux-3.10-1600f9def09de07c5dbeb539e978fa73880690dd.tar.gz
linux-3.10-1600f9def09de07c5dbeb539e978fa73880690dd.tar.bz2
linux-3.10-1600f9def09de07c5dbeb539e978fa73880690dd.zip
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/security-testing-2.6
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/security-testing-2.6: keys: don't need to use RCU in keyring_read() as semaphore is held
Diffstat (limited to 'security')
-rw-r--r--security/keys/keyring.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/security/keys/keyring.c b/security/keys/keyring.c
index e814d2109f8..dd7cd0f8e13 100644
--- a/security/keys/keyring.c
+++ b/security/keys/keyring.c
@@ -201,7 +201,7 @@ static long keyring_read(const struct key *keyring,
int loop, ret;
ret = 0;
- klist = rcu_dereference(keyring->payload.subscriptions);
+ klist = keyring->payload.subscriptions;
if (klist) {
/* calculate how much data we could return */