Merge git://git.kernel.org/pub/scm/linux/kernel/git/pkl/squashfs-linus

[~andy/linux] / security / keys / user_defined.c

diff --git a/security/keys/user_defined.c b/security/keys/user_defined.c
index 02807fb163401bcbc9ff5cfc74bd6576b06ec918..c6ca8662a4685bd162205938eafae39bef25fbbf 100644 (file)
--- a/security/keys/user_defined.c
+++ b/security/keys/user_defined.c
@@ -184,8 +184,7 @@ long user_read(const struct key *key, char __user *buffer, size_t buflen)
        struct user_key_payload *upayload;
        long ret;
 
-       upayload = rcu_dereference_protected(
-               key->payload.data, rwsem_is_locked(&((struct key *)key)->sem));
+       upayload = rcu_dereference_key(key);
        ret = upayload->datalen;
 
        /* we can return the data as is */