Skip to contentSkip to conversation

Don't leak a key reference if request_key() tries to use a revoked keyring

PATCH In review Eric Biggers 2 participants 2 messages Dec 15, 2017 – Dec 18, 2017 Stable branch

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 Don't leak a key reference if request_key() tries to use a revoked keyring

From: David Jeffery <[email protected]>

commit d0709f1e66e8066c4ac6a54620ec116aa41937c0 upstream. [Please apply to 3.18-stable.]

If a request_key() call to allocate and fill out a key attempts to insert the key structure into a revoked keyring, the key will leak, using memory and part of the user's key quota until the system reboots. This is from a failure of construct_alloc_key() to decrement the key's reference count after the attempt to insert into the requested keyring is rejected.

key_put() needs to be called in the link_prealloc_failed callpath to ensure the unused key is released.

---
 security/keys/request_key.c | 1 +
 1 file changed, 1 insertion(+)
security/keys/request_key.c +1 -0
index 8117a774ee5d..edc367ef0bd6 100644
@@ -437,6 +437,7 @@ link_check_failed:
 
 link_prealloc_failed:
 	mutex_unlock(&user->cons_lock);
+	key_put(key);
 	kleave(" = %d [prelink]", ret);
 	return ret;
 
Signature · 1 line
2.15.1.504.g5279b80103-goog
maintainer
#1 lore raw
Quoted 4 lines · Eric Biggers

From: David Jeffery <[email protected]>

commit d0709f1e66e8066c4ac6a54620ec116aa41937c0 upstream. [Please apply to 3.18-stable.]

Now applied, thanks!

greg k-h