Move source tree closer to the 2.6.32.17 mainline
/security/keys/request_key.c
blob:03fe63ed55bda1a1cfacc95138e409e8ef53f0d2 -> blob:9ac7bfd3bbdd386fedd677077f9ac834fd643c17
--- security/keys/request_key.c
+++ security/keys/request_key.c
@@ -336,8 +336,10 @@ static int construct_alloc_key(struct ke
key_already_present:
mutex_unlock(&key_construction_mutex);
- if (dest_keyring)
+ if (dest_keyring) {
+ __key_link(dest_keyring, key_ref_to_ptr(key_ref));
up_write(&dest_keyring->sem);
+ }
mutex_unlock(&user->cons_lock);
key_put(key);
*_key = key = key_ref_to_ptr(key_ref);
@@ -428,6 +430,11 @@ struct key *request_key_and_link(struct
if (!IS_ERR(key_ref)) {
key = key_ref_to_ptr(key_ref);
+ if (dest_keyring) {
+ construct_get_dest_keyring(&dest_keyring);
+ key_link(dest_keyring, key);
+ key_put(dest_keyring);
+ }
} else if (PTR_ERR(key_ref) != -EAGAIN) {
key = ERR_CAST(key_ref);
} else {