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
This commit is contained in:
commit
1600f9def0
@ -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 */
|
||||
|
Loading…
Reference in New Issue
Block a user