---

yaml --- r: 23517 b: refs/heads/master c: 1d9b7d9 h: refs/heads/master i: 23515: 8ed639c v: v3
git-mirror · Mar 25, 2006 · 9ab9353 · 9ab9353
1 parent 2c8eb39
commit 9ab9353
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 6 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3dccff8dc00994428777f483922058c554db85bd
+refs/heads/master: 1d9b7d97d6661edb44ce08f17e47c66d4ac20e34
diff --git a/trunk/security/keys/key.c b/trunk/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;