---

yaml
---
r: 190563
b: refs/heads/master
c: cf8304e
h: refs/heads/master
i:
  190561: d6e9266
  190559: 3432207
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d9a9b4aeea334e7912ce3d878d7f5cc6fdf1ffe4
+refs/heads/master: cf8304e8f380903de3a15dc6ebd551c9e6cf1a21

trunk/security/keys/gc.c

@@ -77,10 +77,10 @@ static bool key_gc_keyring(struct key *keyring, time_t limit)
 		goto dont_gc;
 
 	/* scan the keyring looking for dead keys */
-	klist = rcu_dereference_check(keyring->payload.subscriptions,
-				      lockdep_is_held(&key_serial_lock));
+	rcu_read_lock();
+	klist = rcu_dereference(keyring->payload.subscriptions);
 	if (!klist)
-		goto dont_gc;
+		goto unlock_dont_gc;
 
 	for (loop = klist->nkeys - 1; loop >= 0; loop--) {
 		key = klist->keys[loop];
@@ -89,11 +89,14 @@ static bool key_gc_keyring(struct key *keyring, time_t limit)
 			goto do_gc;
 	}
 
+unlock_dont_gc:
+	rcu_read_unlock();
 dont_gc:
 	kleave(" = false");
 	return false;
 
 do_gc:
+	rcu_read_unlock();
 	key_gc_cursor = keyring->serial;
 	key_get(keyring);
 	spin_unlock(&key_serial_lock);