Patched in Tegra support.

1 files changed, 6 insertions, 7 deletions

diff --git a/net/ceph/crypto.c b/net/ceph/crypto.c
index af14cb42516..85f3bc0a706 100644
--- a/net/ceph/crypto.c
+++ b/net/ceph/crypto.c
@@ -15,9 +15,10 @@ int ceph_crypto_key_clone(struct ceph_crypto_key *dst,
                           const struct ceph_crypto_key *src)
 {
         memcpy(dst, src, sizeof(struct ceph_crypto_key));
-        dst->key = kmemdup(src->key, src->len, GFP_NOFS);
+        dst->key = kmalloc(src->len, GFP_NOFS);
         if (!dst->key)
                 return -ENOMEM;
+        memcpy(dst->key, src->key, src->len);
         return 0;
 }
 
@@ -423,15 +424,14 @@ int ceph_encrypt2(struct ceph_crypto_key *secret, void *dst, size_t *dst_len,
         }
 }
 
-int ceph_key_instantiate(struct key *key, struct key_preparsed_payload *prep)
+int ceph_key_instantiate(struct key *key, const void *data, size_t datalen)
 {
         struct ceph_crypto_key *ckey;
-        size_t datalen = prep->datalen;
         int ret;
         void *p;
 
         ret = -EINVAL;
-        if (datalen <= 0 || datalen > 32767 || !prep->data)
+        if (datalen <= 0 || datalen > 32767 || !data)
                 goto err;
 
         ret = key_payload_reserve(key, datalen);
@@ -444,8 +444,8 @@ int ceph_key_instantiate(struct key *key, struct key_preparsed_payload *prep)
                 goto err;
 
         /* TODO ceph_crypto_key_decode should really take const input */
-        p = (void *)prep->data;
-        ret = ceph_crypto_key_decode(ckey, &p, (char*)prep->data+datalen);
+        p = (void *)data;
+        ret = ceph_crypto_key_decode(ckey, &p, (char*)data+datalen);
         if (ret < 0)
                 goto err_ckey;
 
@@ -467,7 +467,6 @@ void ceph_key_destroy(struct key *key) {
         struct ceph_crypto_key *ckey = key->payload.data;
 
         ceph_crypto_key_destroy(ckey);
-        kfree(ckey);
 }
 
 struct key_type key_type_ceph = {