Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus

[deliverable/linux.git] / security / keys / key.c

diff --git a/security/keys/key.c b/security/keys/key.c
index ab7997ded7255258365169abaf820e811e0a7768..07a87311055c5b50916c87f2117f4c70b0321cfd 100644 (file)
--- a/security/keys/key.c
+++ b/security/keys/key.c
@@ -429,8 +429,11 @@ static int __key_instantiate_and_link(struct key *key,
                                awaken = 1;
 
                        /* and link it into the destination keyring */
-                       if (keyring)
+                       if (keyring) {
+                               set_bit(KEY_FLAG_KEEP, &key->flags);
+
                                __key_link(key, _edit);
+                       }
 
                        /* disable the authorisation key */
                        if (authkey)