KEYS: Provide a generic instantiation function

Provide a generic instantiation function for key types that use the preparse
hook.  This makes it easier to prereserve key quota before keyrings get locked
to retain the new key.

Signed-off-by: David Howells <dhowells@redhat.com>
Acked-by: Steve Dickson <steved@redhat.com>
Acked-by: Jeff Layton <jlayton@primarydata.com>
Reviewed-by: Sage Weil <sage@redhat.com>

1 files changed, 1 insertions, 24 deletions

diff --git a/crypto/asymmetric_keys/asymmetric_type.c b/crypto/asymmetric_keys/asymmetric_type.c
index b77eb5304788..c1fe0fcee8e3 100644
--- a/crypto/asymmetric_keys/asymmetric_type.c
+++ b/crypto/asymmetric_keys/asymmetric_type.c
@@ -164,29 +164,6 @@ static void asymmetric_key_free_preparse(struct key_preparsed_payload *prep)
 }
 
 /*
- * Instantiate a asymmetric_key defined key.  The key was preparsed, so we just
- * have to transfer the data here.
- */
-static int asymmetric_key_instantiate(struct key *key, struct key_preparsed_payload *prep)
-{
-        int ret;
-
-        pr_devel("==>%s()\n", __func__);
-
-        ret = key_payload_reserve(key, prep->quotalen);
-        if (ret == 0) {
-                key->type_data.p[0] = prep->type_data[0];
-                key->type_data.p[1] = prep->type_data[1];
-                key->payload.data = prep->payload;
-                prep->type_data[0] = NULL;
-                prep->type_data[1] = NULL;
-                prep->payload = NULL;
-        }
-        pr_devel("<==%s() = %d\n", __func__, ret);
-        return ret;
-}
-
-/*
  * dispose of the data dangling from the corpse of a asymmetric key
  */
 static void asymmetric_key_destroy(struct key *key)
@@ -205,7 +182,7 @@ struct key_type key_type_asymmetric = {
         .name           = "asymmetric",
         .preparse       = asymmetric_key_preparse,
         .free_preparse  = asymmetric_key_free_preparse,
-        .instantiate    = asymmetric_key_instantiate,
+        .instantiate    = generic_key_instantiate,
         .match          = asymmetric_key_match,
         .destroy        = asymmetric_key_destroy,
         .describe       = asymmetric_key_describe,