Message ID | 1536951225-22858-3-git-send-email-tyhicks@canonical.com |
---|---|
State | New |
Headers | show |
Series | CVE-2015-8539, CVE-2017-15299 - Multiple issues in the kernel keyring | expand |
diff --git a/security/keys/key.c b/security/keys/key.c index 7ee46477082b..d9ed9e493eb1 100644 --- a/security/keys/key.c +++ b/security/keys/key.c @@ -903,6 +903,16 @@ error: */ __key_link_end(keyring, &index_key, edit); + key = key_ref_to_ptr(key_ref); + if (test_bit(KEY_FLAG_USER_CONSTRUCT, &key->flags)) { + ret = wait_for_key_construction(key, true); + if (ret < 0) { + key_ref_put(key_ref); + key_ref = ERR_PTR(ret); + goto error_free_prep; + } + } + key_ref = __key_update(key_ref, &prep); goto error_free_prep; }