1 files changed, 9 insertions, 5 deletions

diff --git a/security/keys/key.c b/security/keys/key.c
index 627697181e6a..a057e3311aad 100644
--- a/security/keys/key.c
+++ b/security/keys/key.c
@@ -795,12 +795,16 @@ key_ref_t key_create_or_update(key_ref_t keyring_ref,
                 goto error_3;
         }
 
-        /* search for an existing key of the same type and description in the
-         * destination keyring
+        /* if it's possible to update this type of key, search for an existing
+         * key of the same type and description in the destination keyring and
+         * update that instead if possible
          */
-        key_ref = __keyring_search_one(keyring_ref, ktype, description, 0);
-        if (!IS_ERR(key_ref))
-                goto found_matching_key;
+        if (ktype->update) {
+                key_ref = __keyring_search_one(keyring_ref, ktype, description,
+                                               0);
+                if (!IS_ERR(key_ref))
+                        goto found_matching_key;
+        }
 
         /* decide on the permissions we want */
         perm = KEY_POS_VIEW | KEY_POS_SEARCH | KEY_POS_LINK | KEY_POS_SETATTR;