diff options
Diffstat (limited to 'security')
-rw-r--r-- | security/keys/gc.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/security/keys/gc.c b/security/keys/gc.c index 19902319d097..a46e825cbf02 100644 --- a/security/keys/gc.c +++ b/security/keys/gc.c | |||
@@ -77,10 +77,10 @@ static bool key_gc_keyring(struct key *keyring, time_t limit) | |||
77 | goto dont_gc; | 77 | goto dont_gc; |
78 | 78 | ||
79 | /* scan the keyring looking for dead keys */ | 79 | /* scan the keyring looking for dead keys */ |
80 | klist = rcu_dereference_check(keyring->payload.subscriptions, | 80 | rcu_read_lock(); |
81 | lockdep_is_held(&key_serial_lock)); | 81 | klist = rcu_dereference(keyring->payload.subscriptions); |
82 | if (!klist) | 82 | if (!klist) |
83 | goto dont_gc; | 83 | goto unlock_dont_gc; |
84 | 84 | ||
85 | for (loop = klist->nkeys - 1; loop >= 0; loop--) { | 85 | for (loop = klist->nkeys - 1; loop >= 0; loop--) { |
86 | key = klist->keys[loop]; | 86 | key = klist->keys[loop]; |
@@ -89,11 +89,14 @@ static bool key_gc_keyring(struct key *keyring, time_t limit) | |||
89 | goto do_gc; | 89 | goto do_gc; |
90 | } | 90 | } |
91 | 91 | ||
92 | unlock_dont_gc: | ||
93 | rcu_read_unlock(); | ||
92 | dont_gc: | 94 | dont_gc: |
93 | kleave(" = false"); | 95 | kleave(" = false"); |
94 | return false; | 96 | return false; |
95 | 97 | ||
96 | do_gc: | 98 | do_gc: |
99 | rcu_read_unlock(); | ||
97 | key_gc_cursor = keyring->serial; | 100 | key_gc_cursor = keyring->serial; |
98 | key_get(keyring); | 101 | key_get(keyring); |
99 | spin_unlock(&key_serial_lock); | 102 | spin_unlock(&key_serial_lock); |