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 'omap-boards' into omap-for-linus
[pandora-kernel.git]
/
security
/
keys
/
user_defined.c
diff --git
a/security/keys/user_defined.c
b/security/keys/user_defined.c
index
7c687d5
..
e9aa079
100644
(file)
--- a/
security/keys/user_defined.c
+++ b/
security/keys/user_defined.c
@@
-199,7
+199,8
@@
long user_read(const struct key *key, char __user *buffer, size_t buflen)
struct user_key_payload *upayload;
long ret;
struct user_key_payload *upayload;
long ret;
- upayload = rcu_dereference(key->payload.data);
+ upayload = rcu_dereference_protected(
+ key->payload.data, rwsem_is_locked(&((struct key *)key)->sem));
ret = upayload->datalen;
/* we can return the data as is */
ret = upayload->datalen;
/* we can return the data as is */