---

yaml --- r: 286079 b: refs/heads/master c: 6ac6172 h: refs/heads/master i: 286077: 7b50713 286075: f75dbe8 286071: 61932c9 286063: 873641b 286047: e576952 286015: 17fe31d 285951: 010a208 v: v3
git-mirror · Jan 17, 2012 · 66f6503 · 66f6503
1 parent 512a128
commit 66f6503
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ee0b31a25a010116f44fca6c96f4516d417793dd
+refs/heads/master: 6ac6172a935d1faf7ef259802267657bc0007a62
diff --git a/trunk/security/keys/encrypted-keys/encrypted.c b/trunk/security/keys/encrypted-keys/encrypted.c
@@ -314,7 +314,7 @@ static struct key *request_user_key(const char *master_desc, u8 **master_key,
 		goto error;
 
 	down_read(&ukey->sem);
-	upayload = rcu_dereference(ukey->payload.data);
+	upayload = ukey->payload.data;
 	*master_key = upayload->data;
 	*master_keylen = upayload->datalen;
 error:

diff --git a/trunk/security/keys/encrypted-keys/masterkey_trusted.c b/trunk/security/keys/encrypted-keys/masterkey_trusted.c
@@ -39,7 +39,7 @@ struct key *request_trusted_key(const char *trusted_desc,
 		goto error;
 
 	down_read(&tkey->sem);
-	tpayload = rcu_dereference(tkey->payload.data);
+	tpayload = tkey->payload.data;
 	*master_key = tpayload->key;
 	*master_keylen = tpayload->key_len;
 error: