Commit 1600f9de authored Apr 27, 2010 by 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

security/keys/keyring.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -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 */