git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'for-linus' of git://www.jni.nu/cris
[pandora-kernel.git]
/
security
/
keys
/
trusted.c
diff --git
a/security/keys/trusted.c
b/security/keys/trusted.c
index
83fc92e
..
c99b936
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)