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

[linux.git] / security / keys / trusted.c

diff --git a/security/keys/trusted.c b/security/keys/trusted.c
index 90d61751ff12f3e9d4015900c39ac7b595411240..2ae31c5a87de9e9084de7e5f9350678da81b49a4 100644 (file)
--- a/security/keys/trusted.c
+++ b/security/keys/trusted.c
@@ -1140,12 +1140,12 @@ static int trusted_update(struct key *key, struct key_preparsed_payload *prep)
 static long trusted_read(const struct key *key, char __user *buffer,
                         size_t buflen)
 {
-       struct trusted_key_payload *p;
+       const struct trusted_key_payload *p;
        char *ascii_buf;
        char *bufp;
        int i;
 
-       p = rcu_dereference_key(key);
+       p = dereference_key_locked(key);
        if (!p)
                return -EINVAL;
        if (!buffer || buflen <= 0)