Merge tag 'trace-fixes-3.16' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt...

[firefly-linux-kernel-4.4.55.git] / net / ceph / crypto.c

diff --git a/net/ceph/crypto.c b/net/ceph/crypto.c
index 6e7a236525b6ff92d9cd2e44770cb6f7334b0b02..ffeba8f9dda929df4f111a9ef652cf1830f348a9 100644 (file)
--- a/net/ceph/crypto.c
+++ b/net/ceph/crypto.c
@@ -8,6 +8,7 @@
 #include <linux/key-type.h>
 
 #include <keys/ceph-type.h>
+#include <keys/user-type.h>
 #include <linux/ceph/decode.h>
 #include "crypto.h"
 
@@ -423,8 +424,7 @@ int ceph_encrypt2(struct ceph_crypto_key *secret, void *dst, size_t *dst_len,
        }
 }
 
-static int ceph_key_instantiate(struct key *key,
-                               struct key_preparsed_payload *prep)
+static int ceph_key_preparse(struct key_preparsed_payload *prep)
 {
        struct ceph_crypto_key *ckey;
        size_t datalen = prep->datalen;
@@ -435,10 +435,6 @@ static int ceph_key_instantiate(struct key *key,
        if (datalen <= 0 || datalen > 32767 || !prep->data)
                goto err;
 
-       ret = key_payload_reserve(key, datalen);
-       if (ret < 0)
-               goto err;
-
        ret = -ENOMEM;
        ckey = kmalloc(sizeof(*ckey), GFP_KERNEL);
        if (!ckey)
@@ -450,7 +446,8 @@ static int ceph_key_instantiate(struct key *key,
        if (ret < 0)
                goto err_ckey;
 
-       key->payload.data = ckey;
+       prep->payload[0] = ckey;
+       prep->quotalen = datalen;
        return 0;
 
 err_ckey:
@@ -459,12 +456,15 @@ err:
        return ret;
 }
 
-static int ceph_key_match(const struct key *key, const void *description)
+static void ceph_key_free_preparse(struct key_preparsed_payload *prep)
 {
-       return strcmp(key->description, description) == 0;
+       struct ceph_crypto_key *ckey = prep->payload[0];
+       ceph_crypto_key_destroy(ckey);
+       kfree(ckey);
 }
 
-static void ceph_key_destroy(struct key *key) {
+static void ceph_key_destroy(struct key *key)
+{
        struct ceph_crypto_key *ckey = key->payload.data;
 
        ceph_crypto_key_destroy(ckey);
@@ -473,8 +473,10 @@ static void ceph_key_destroy(struct key *key) {
 
 struct key_type key_type_ceph = {
        .name           = "ceph",
-       .instantiate    = ceph_key_instantiate,
-       .match          = ceph_key_match,
+       .preparse       = ceph_key_preparse,
+       .free_preparse  = ceph_key_free_preparse,
+       .instantiate    = generic_key_instantiate,
+       .match          = user_match,
        .destroy        = ceph_key_destroy,
 };