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

+1 -1
+1 -1
security/keys/keyring.c
··· 201 201 int loop, ret; 202 202 203 203 ret = 0; 204 - klist = rcu_dereference(keyring->payload.subscriptions); 204 + klist = keyring->payload.subscriptions; 205 205 206 206 if (klist) { 207 207 /* calculate how much data we could return */