---

yaml --- r: 264506 b: refs/heads/master c: 6d528b0 h: refs/heads/master v: v3
git-mirror · Aug 22, 2011 · 4c7a325 · 4c7a325
1 parent b73a5b7
commit 4c7a325
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3ecf1b4f347210e39b156177e5b8a26ff8d00279
+refs/heads/master: 6d528b082294f0ddabd6368297546a2c0b67d4fe
diff --git a/trunk/security/keys/keyring.c b/trunk/security/keys/keyring.c
@@ -860,8 +860,7 @@ void __key_link(struct key *keyring, struct key *key,
 
 	kenter("%d,%d,%p", keyring->serial, key->serial, nklist);
 
-	klist = rcu_dereference_protected(keyring->payload.subscriptions,
-					  rwsem_is_locked(&keyring->sem));
+	klist = rcu_dereference_locked_keyring(keyring);
 
 	atomic_inc(&key->usage);