1 files changed, 2 insertions, 1 deletions

diff --git a/security/keys/key.c b/security/keys/key.c
index 07a87311055c..09ef276c4bdc 100644
--- a/security/keys/key.c
+++ b/security/keys/key.c
@@ -430,7 +430,8 @@ static int __key_instantiate_and_link(struct key *key,
 
                         /* and link it into the destination keyring */
                         if (keyring) {
-                                set_bit(KEY_FLAG_KEEP, &key->flags);
+                                if (test_bit(KEY_FLAG_KEEP, &keyring->flags))
+                                        set_bit(KEY_FLAG_KEEP, &key->flags);
 
                                 __key_link(key, _edit);
                         }