diff --git a/[refs] b/[refs] index 214fa7037390..133354b28500 100644 --- 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 index 30e242f7bd0e..37a7f3b28852 100644 --- 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);