Merge branch 'master' into next

[safe/jmp/linux-2.6] / security / keys / keyring.c

diff --git a/security/keys/keyring.c b/security/keys/keyring.c
index ce7c44b..2fb2bc9 100644 (file)
--- a/security/keys/keyring.c
+++ b/security/keys/keyring.c
@@ -199,7 +199,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 */