security: don't use RCU accessors for cred->session_keyring

[linux-2.6-microblaze.git] / security / keys / request_key.c

diff --git a/security/keys/request_key.c b/security/keys/request_key.c
index 2f17d84..db72dc4 100644 (file)
--- a/security/keys/request_key.c
+++ b/security/keys/request_key.c
@@ -142,12 +142,10 @@ static int call_sbin_request_key(struct key *authkey, void *aux)
                prkey = cred->process_keyring->serial;
        sprintf(keyring_str[1], "%d", prkey);
 
-       rcu_read_lock();
-       session = rcu_dereference(cred->session_keyring);
+       session = cred->session_keyring;
        if (!session)
                session = cred->user->session_keyring;
        sskey = session->serial;
-       rcu_read_unlock();
 
        sprintf(keyring_str[2], "%d", sskey);
 
@@ -287,10 +285,7 @@ static int construct_get_dest_keyring(struct key **_dest_keyring)
 
                        /* fall through */
                case KEY_REQKEY_DEFL_SESSION_KEYRING:
-                       rcu_read_lock();
-                       dest_keyring = key_get(
-                               rcu_dereference(cred->session_keyring));
-                       rcu_read_unlock();
+                       dest_keyring = key_get(cred->session_keyring);
 
                        if (dest_keyring)
                                break;