Revert "keys: Include key domain tag in the iterative search"

hulk inclusion
category: bugfix
bugzilla: https://gitee.com/openeuler/kernel/issues/I4O25G
CVE: NA

--------------------------------

This reverts commit 44313f67.
Signed-off-by: NZhang Tianxing <zhangtianxing3@huawei.com>
Acked-by: NXie XiuQi <xiexiuqi@huawei.com>
Acked-by: Xiu Jianfeng<xiujianfeng@huawei.com>
Signed-off-by: NZheng Zengkai <zhengzengkai@huawei.com>

crypto/asymmetric_keys/asymmetric_type.c

@@ -249,15 +249,9 @@ static bool asymmetric_key_cmp(const struct key *key,
 {
 	const struct asymmetric_key_ids *kids = asymmetric_key_ids(key);
 	const struct asymmetric_key_id *match_id = match_data->preparsed;
-	bool match;
 
-	match = asymmetric_match_key_ids(kids, match_id,
-					 asymmetric_key_id_same);
-
-	if (match_data->domain_tag)
-		match &= key->index_key.domain_tag == match_data->domain_tag;
-
-	return match;
+	return asymmetric_match_key_ids(kids, match_id,
+					asymmetric_key_id_same);
 }
 
 /*
@@ -268,15 +262,9 @@ static bool asymmetric_key_cmp_partial(const struct key *key,
 {
 	const struct asymmetric_key_ids *kids = asymmetric_key_ids(key);
 	const struct asymmetric_key_id *match_id = match_data->preparsed;
-	bool match;
-
-	match = asymmetric_match_key_ids(kids, match_id,
-					 asymmetric_key_id_partial);
-
-	if (match_data->domain_tag)
-		match &= key->index_key.domain_tag == match_data->domain_tag;
 
-	return match;
+	return asymmetric_match_key_ids(kids, match_id,
+					asymmetric_key_id_partial);
 }
 
 /*

include/linux/key-type.h

@@ -55,7 +55,6 @@ struct key_match_data {
 	unsigned	lookup_type;	/* Type of lookup for this search. */
 #define KEYRING_SEARCH_LOOKUP_DIRECT	0x0000	/* Direct lookup by description. */
 #define KEYRING_SEARCH_LOOKUP_ITERATE	0x0001	/* Iterative search. */
-	struct key_tag  *domain_tag;    /* Key domain tag */
 };
 
 /*

security/keys/keyring.c

@@ -565,13 +565,7 @@ int restrict_link_reject(struct key *keyring,
 bool key_default_cmp(const struct key *key,
 		     const struct key_match_data *match_data)
 {
-	bool match;
-
-	match = strcmp(key->description, match_data->raw_data) == 0;
-	if (match_data->domain_tag)
-		match &= key->index_key.domain_tag == match_data->domain_tag;
-
-	return match;
+	return strcmp(key->description, match_data->raw_data) == 0;
 }
 
 /*
@@ -963,8 +957,6 @@ key_ref_t keyring_search_tag(key_ref_t keyring,
 
 	if (recurse)
 		ctx.flags |= KEYRING_SEARCH_RECURSE;
-	if (domain_tag)
-		ctx.match_data.domain_tag = domain_tag;
 	if (type->match_preparse) {
 		ret = type->match_preparse(&ctx.match_data);
 		if (ret < 0)