KEYS: Fix RCU handling in key_gc_keyring()
Subsystems (2)
David Howells
maintainerPATCH 1/1 KEYS: Fix RCU handling in key_gc_keyring()
key_gc_keyring() needs to either hold the RCU read lock or hold the keyring semaphore if it's going to scan the keyring's list. Given that it only needs to read the key list, and it's doing so under a spinlock, the RCU read lock is the thing to use.
Furthermore, the RCU check added in e7b0a61b7929632d36cf052d9e2820ef0a9c1bfe is incorrect as holding the spinlock on key_serial_lock is not grounds for assuming a keyring's pointer list can be read safely. Instead, a simple rcu_dereference() inside of the previously mentioned RCU read lock is what we want.
---
security/keys/gc.c | 9 ++++++--- 1 files changed, 6 insertions(+), 3 deletions(-)
security/keys/gc.c +6 -3
@@ -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);
Quoted 5 lines · David Howells
key_gc_keyring()needs to either hold the RCU read lock or hold the keyring semaphore if it's going to scan the keyring's list. Given that it only needs to read the key list, and it's doing so under a spinlock, the RCU read lock is the thing to use.
Quoted 7 lines
Furthermore, the RCU check added in
e7b0a61b7929632d36cf052d9e2820ef0a9c1bfeis incorrect as holding the spinlock onkey_serial_lockis not grounds for assuming a keyring's pointer list can be read safely. Instead, a simplercu_dereference()inside of the previously mentioned RCU read lock is what we want.Reported-by Serge E. Hallyn <[email protected]>
You're obviously being far too kind. In apparent trend for last night I missed the lack of locking here.
Quoted 1 line
Signed-off-by David Howells <[email protected]>
thanks,
-serge
David Howells
maintainerQuoted 2 lines · Serge E. Hallyn
You're obviously being far too kind. In apparent trend for last night I missed the lack of locking here.
You pointed out the wrongness of it - it just wasn't in the way you thought.
David
Quoted 10 lines · David Howells
key_gc_keyring()needs to either hold the RCU read lock or hold the keyring semaphore if it's going to scan the keyring's list. Given that it only needs to read the key list, and it's doing so under a spinlock, the RCU read lock is the thing to use.Furthermore, the RCU check added in
e7b0a61b7929632d36cf052d9e2820ef0a9c1bfeis incorrect as holding the spinlock onkey_serial_lockis not grounds for assuming a keyring's pointer list can be read safely. Instead, a simplercu_dereference()inside of the previously mentioned RCU read lock is what we want.
As the guilty party in e7b0a61b7929632d36cf052d9e2820ef0a9c1bfe... ;-)
Quoted 41 lines
Reported-by Serge E. Hallyn <[email protected]>Signed-off-by David Howells <[email protected]>---
security/keys/gc.c | 9 ++++++--- 1 files changed, 6 insertions(+), 3 deletions(-)security/keys/gc.c +6
-3@@ -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);
David Howells
maintainerQuoted 1 line · Paul E. McKenney
As the guilty party in
e7b0a61b7929632d36cf052d9e2820ef0a9c1bfe... ;-)
Only partially guilty;-)
David