Merge branch 'davinci-next' of git://gitorious.org/linux-davinci/linux-davinci into...

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

diff --git a/security/keys/trusted.c b/security/keys/trusted.c
index 83fc92e297cd2257a26c6cbeeaca2b0588deac4f..c99b9368368c3d6e2193e81abaf5ab417d34557b 100644 (file)
--- a/security/keys/trusted.c
+++ b/security/keys/trusted.c
@@ -1076,8 +1076,7 @@ static long trusted_read(const struct key *key, char __user *buffer,
        char *bufp;
        int i;
 
-       p = rcu_dereference_protected(key->payload.data,
-                       rwsem_is_locked(&((struct key *)key)->sem));
+       p = rcu_dereference_key(key);
        if (!p)
                return -EINVAL;
        if (!buffer || buflen <= 0)