KEYS: Preparse match data

Preparse the match data.  This provides several advantages:

 (1) The preparser can reject invalid criteria up front.

 (2) The preparser can convert the criteria to binary data if necessary (the
     asymmetric key type really wants to do binary comparison of the key IDs).

 (3) The preparser can set the type of search to be performed.  This means
     that it's not then a one-off setting in the key type.

 (4) The preparser can set an appropriate comparator function.

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

1 files changed, 16 insertions, 5 deletions

diff --git a/security/keys/request_key.c b/security/keys/request_key.c
index 381411941cc1..408523e5e2e2 100644
--- a/security/keys/request_key.c
+++ b/security/keys/request_key.c
@@ -531,9 +531,9 @@ struct key *request_key_and_link(struct key_type *type,
                 .index_key.type         = type,
                 .index_key.description  = description,
                 .cred                   = current_cred(),
-                .match                  = type->match,
-                .match_data             = description,
-                .flags                  = KEYRING_SEARCH_LOOKUP_DIRECT,
+                .match_data.cmp         = type->match,
+                .match_data.raw_data    = description,
+                .match_data.lookup_type = KEYRING_SEARCH_LOOKUP_DIRECT,
         };
         struct key *key;
         key_ref_t key_ref;
@@ -543,6 +543,14 @@ struct key *request_key_and_link(struct key_type *type,
                ctx.index_key.type->name, ctx.index_key.description,
                callout_info, callout_len, aux, dest_keyring, flags);
 
+        if (type->match_preparse) {
+                ret = type->match_preparse(&ctx.match_data);
+                if (ret < 0) {
+                        key = ERR_PTR(ret);
+                        goto error;
+                }
+        }
+
         /* search all the process keyrings for a key */
         key_ref = search_process_keyrings(&ctx);
 
@@ -555,7 +563,7 @@ struct key *request_key_and_link(struct key_type *type,
                         if (ret < 0) {
                                 key_put(key);
                                 key = ERR_PTR(ret);
-                                goto error;
+                                goto error_free;
                         }
                 }
         } else if (PTR_ERR(key_ref) != -EAGAIN) {
@@ -565,12 +573,15 @@ struct key *request_key_and_link(struct key_type *type,
                  * should consult userspace if we can */
                 key = ERR_PTR(-ENOKEY);
                 if (!callout_info)
-                        goto error;
+                        goto error_free;
 
                 key = construct_key_and_link(&ctx, callout_info, callout_len,
                                              aux, dest_keyring, flags);
         }
 
+error_free:
+        if (type->match_free)
+                type->match_free(&ctx.match_data);
 error:
         kleave(" = %p", key);
         return key;