| commit | 5f233706592fcce7df57e12674461c349b8f591d | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Wed May 05 09:06:24 2010 -0700 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Wed May 05 09:06:24 2010 -0700 |
| tree | 386c1817cb1be85e532e034a9b1cb98776c35c81 | |
| parent | 8777c793d6a24c7f3adf52b1b1086e9706de4589 [diff] | |
| parent | 896903c2f5f79f029388f033a00c3b813bc91201 [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: call_sbin_request_key() must write lock keyrings before modifying them KEYS: Use RCU dereference wrappers in keyring key type code KEYS: find_keyring_by_name() can gain access to a freed keyring