diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-04-27 19:26:46 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-04-27 19:26:46 -0400 |
| commit | 1600f9def09de07c5dbeb539e978fa73880690dd (patch) | |
| tree | a8fa5c0891c68740543425d139414fec3d38b26e /security | |
| parent | 11e39d993dc693e0bfc5521d367b2494cb3bcd38 (diff) | |
| parent | b59ec78cdcc57e02bc3dddfa7134a2f0fd15c34d (diff) | |
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.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/security/keys/keyring.c b/security/keys/keyring.c index e814d2109f8e..dd7cd0f8e13c 100644 --- a/security/keys/keyring.c +++ b/security/keys/keyring.c | |||
| @@ -201,7 +201,7 @@ static long keyring_read(const struct key *keyring, | |||
| 201 | int loop, ret; | 201 | int loop, ret; |
| 202 | 202 | ||
| 203 | ret = 0; | 203 | ret = 0; |
| 204 | klist = rcu_dereference(keyring->payload.subscriptions); | 204 | klist = keyring->payload.subscriptions; |
| 205 | 205 | ||
| 206 | if (klist) { | 206 | if (klist) { |
| 207 | /* calculate how much data we could return */ | 207 | /* calculate how much data we could return */ |