KEYS: Remove key_type::match in favour of overriding default by match_preparse

A previous patch added a ->match_preparse() method to the key type.  This is
allowed to override the function called by the iteration algorithm.
Therefore, we can just set a default that simply checks for an exact match of
the key description with the original criterion data and allow match_preparse
to override it as needed.

The key_type::match op is then redundant and can be removed, as can the
user_match() function.

Signed-off-by: David Howells <dhowells@redhat.com>
Acked-by: Vivek Goyal <vgoyal@redhat.com>

3 files changed, 13 insertions, 7 deletions

diff --git a/net/ceph/crypto.c b/net/ceph/crypto.c
index ffeba8f9dda9..62fc5e7a9acf 100644
--- a/net/ceph/crypto.c
+++ b/net/ceph/crypto.c
@@ -476,7 +476,6 @@ struct key_type key_type_ceph = {
         .preparse       = ceph_key_preparse,
         .free_preparse  = ceph_key_free_preparse,
         .instantiate    = generic_key_instantiate,
-        .match          = user_match,
         .destroy        = ceph_key_destroy,
 };
 
diff --git a/net/dns_resolver/dns_key.c b/net/dns_resolver/dns_key.c
index 92df6e508ae7..a07b9ba7e0b7 100644
--- a/net/dns_resolver/dns_key.c
+++ b/net/dns_resolver/dns_key.c
@@ -176,9 +176,8 @@ static void dns_resolver_free_preparse(struct key_preparsed_payload *prep)
  * The domain name may be a simple name or an absolute domain name (which
  * should end with a period).  The domain name is case-independent.
  */
-static int
-dns_resolver_match(const struct key *key,
-                   const struct key_match_data *match_data)
+static int dns_resolver_cmp(const struct key *key,
+                            const struct key_match_data *match_data)
 {
         int slen, dlen, ret = 0;
         const char *src = key->description, *dsp = match_data->raw_data;
@@ -210,6 +209,16 @@ no_match:
 }
 
 /*
+ * Preparse the match criterion.
+ */
+static int dns_resolver_match_preparse(struct key_match_data *match_data)
+{
+        match_data->lookup_type = KEYRING_SEARCH_LOOKUP_ITERATE;
+        match_data->cmp = dns_resolver_cmp;
+        return 0;
+}
+
+/*
  * Describe a DNS key
  */
 static void dns_resolver_describe(const struct key *key, struct seq_file *m)
@@ -243,7 +252,7 @@ struct key_type key_type_dns_resolver = {
         .preparse       = dns_resolver_preparse,
         .free_preparse  = dns_resolver_free_preparse,
         .instantiate    = generic_key_instantiate,
-        .match          = dns_resolver_match,
+        .match_preparse = dns_resolver_match_preparse,
         .revoke         = user_revoke,
         .destroy        = user_destroy,
         .describe       = dns_resolver_describe,
diff --git a/net/rxrpc/ar-key.c b/net/rxrpc/ar-key.c
index 3907add75932..10c6cb694b43 100644
--- a/net/rxrpc/ar-key.c
+++ b/net/rxrpc/ar-key.c
@@ -44,7 +44,6 @@ struct key_type key_type_rxrpc = {
         .preparse       = rxrpc_preparse,
         .free_preparse  = rxrpc_free_preparse,
         .instantiate    = generic_key_instantiate,
-        .match          = user_match,
         .destroy        = rxrpc_destroy,
         .describe       = rxrpc_describe,
         .read           = rxrpc_read,
@@ -61,7 +60,6 @@ struct key_type key_type_rxrpc_s = {
         .preparse       = rxrpc_preparse_s,
         .free_preparse  = rxrpc_free_preparse_s,
         .instantiate    = generic_key_instantiate,
-        .match          = user_match,
         .destroy        = rxrpc_destroy_s,
         .describe       = rxrpc_describe,
 };