Commit 1600f9de authored by Linus Torvalds's avatar Linus Torvalds

Merge branch 'for-linus' of...

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
parents 11e39d99 b59ec78c
...@@ -201,7 +201,7 @@ static long keyring_read(const struct key *keyring, ...@@ -201,7 +201,7 @@ static long keyring_read(const struct key *keyring,
int loop, ret; int loop, ret;
ret = 0; ret = 0;
klist = rcu_dereference(keyring->payload.subscriptions); klist = keyring->payload.subscriptions;
if (klist) { if (klist) {
/* calculate how much data we could return */ /* calculate how much data we could return */
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment