Commit 8f674565 authored Sep 18, 2017 by Eric Biggers Committed by David Howells Sep 25, 2017

KEYS: reset parent each time before searching key_user_tree

In key_user_lookup(), if there is no key_user for the given uid, we drop
key_user_lock, allocate a new key_user, and search the tree again. But
we failed to set 'parent' to NULL at the beginning of the second search.
If the tree were to be empty for the second search, the insertion would
be done with an invalid 'parent', scribbling over freed memory.

Fortunately this can't actually happen currently because the tree always
contains at least the root_key_user. But it still should be fixed to
make the code more robust.

Signed-off-by: Eric Biggers <ebiggers@google.com>
Signed-off-by: David Howells <dhowells@redhat.com>

parent 37863c43

security/keys/key.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -54,10 +54,10 @@ void __key_check(const struct key *key)
		struct key_user *key_user_lookup(kuid_t uid)
		{
		struct key_user candidate = NULL, user;
		struct rb_node *parent = NULL;
		struct rb_node **p;
		struct rb_node parent, *p;

		try_again:
		parent = NULL;
		p = &key_user_tree.rb_node;
		spin_lock(&key_user_lock);

Admin message