KEYS: __key_link() should use the RCU deref wrapper for keyring payloads

__key_link() should use the RCU deref wrapper rcu_dereference_locked_keyring() for accessing keyring payloads rather than calling rcu_dereference_protected() directly. Signed-off-by: David Howells <[email protected]> Signed-off-by: James Morris <[email protected]>
cbmeeks · Aug 22, 2011 · 6d528b0 · 6d528b0
1 parent 3ecf1b4
commit 6d528b0
Showing 1 changed file with 1 addition and 2 deletions.
diff --git a/security/keys/keyring.c b/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);