---

yaml --- r: 190678 b: refs/heads/master c: e35ec2d h: refs/heads/master v: v3
git-mirror · May 4, 2010 · 599f7d2 · 599f7d2
1 parent 830f614
commit 599f7d2
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: bfeb0360de7713de8240cafd7ecf6058b6dbea0b
+refs/heads/master: e35ec2d2c1fc45dd3e46dde74bb0c4c4366125bf
diff --git a/trunk/security/keys/user_defined.c b/trunk/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;
 
-	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 */