KEYS: Differentiate uses of rcu_dereference_key() and user_key_payload()

[linux.git] / security / keys / encrypted-keys / encrypted.c

diff --git a/security/keys/encrypted-keys/encrypted.c b/security/keys/encrypted-keys/encrypted.c
index 4fb315cddf5b009672c3aeb31877135551125802..0010955d7876c2302704020af8b2ffb6010f2c0a 100644 (file)
--- a/security/keys/encrypted-keys/encrypted.c
+++ b/security/keys/encrypted-keys/encrypted.c
@@ -314,7 +314,7 @@ static struct key *request_user_key(const char *master_desc, const u8 **master_k
                goto error;
 
        down_read(&ukey->sem);
-       upayload = user_key_payload(ukey);
+       upayload = user_key_payload_locked(ukey);
        *master_key = upayload->data;
        *master_keylen = upayload->datalen;
 error:
@@ -926,7 +926,7 @@ static long encrypted_read(const struct key *key, char __user *buffer,
        size_t asciiblob_len;
        int ret;
 
-       epayload = rcu_dereference_key(key);
+       epayload = dereference_key_locked(key);
 
        /* returns the hex encoded iv, encrypted-data, and hmac as ascii */
        asciiblob_len = epayload->datablob_len + ivsize + 1