[Cryptodev-linux-devel] [PATCH 3/8] store the hash output inside struct kernel_crypt_op

[Phil Sutter]

---
 cryptodev_int.h  |    3 +++
 cryptodev_main.c |   19 +++++++++++--------
 2 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/cryptodev_int.h b/cryptodev_int.h
index 5072e8f..63e2ebd 100644
--- a/cryptodev_int.h
+++ b/cryptodev_int.h
@@ -123,6 +123,9 @@ struct kernel_crypt_op {
 
        int ivlen;
        __u8 iv[EALG_MAX_BLOCK_LEN];
+
+       int digestsize;
+       uint8_t hash_output[AALG_MAX_RESULT_LEN];
 };
 
 #endif /* CRYPTODEV_INT_H */
diff --git a/cryptodev_main.c b/cryptodev_main.c
index 5fd5907..6771f44 100644
--- a/cryptodev_main.c
+++ b/cryptodev_main.c
@@ -641,7 +641,6 @@ __crypto_run_zc(struct csession *ses_ptr, struct 
kernel_crypt_op *kcop)
 static int crypto_run(struct fcrypt *fcr, struct kernel_crypt_op *kcop)
 {
        struct csession *ses_ptr;
-       uint8_t hash_output[AALG_MAX_RESULT_LEN];
        struct crypt_op *cop = &kcop->cop;
        int ret;
 
@@ -692,17 +691,12 @@ static int crypto_run(struct fcrypt *fcr, struct 
kernel_crypt_op *kcop)
        if (ses_ptr->hdata.init != 0 &&
                ((cop->flags & COP_FLAG_FINAL) ||
                   (!(cop->flags & COP_FLAG_UPDATE) || cop->len == 0))) {
-               ret = cryptodev_hash_final(&ses_ptr->hdata, hash_output);
+
+               ret = cryptodev_hash_final(&ses_ptr->hdata, kcop->hash_output);
                if (unlikely(ret)) {
                        dprintk(0, KERN_ERR, "CryptoAPI failure: %d\n", ret);
                        goto out_unlock;
                }
-
-               if (unlikely(copy_to_user(cop->mac, hash_output,
-                                       ses_ptr->hdata.digestsize))) {
-                       ret = -EFAULT;
-                       goto out_unlock;
-               }
        }
 
 #if defined(CRYPTODEV_STATS)
@@ -780,6 +774,7 @@ static int fill_kcop_from_cop(struct kernel_crypt_op *kcop, 
struct fcrypt *fcr)
                return -EINVAL;
        }
        kcop->ivlen = cop->iv ? ses_ptr->cdata.ivsize : 0;
+       kcop->digestsize = ses_ptr->hdata.digestsize;
        mutex_unlock(&ses_ptr->sem);
 
        if (unlikely(rc = copy_from_user(kcop->iv, cop->iv, kcop->ivlen))) {
@@ -855,6 +850,9 @@ cryptodev_ioctl(struct file *filp, unsigned int cmd, 
unsigned long arg_)
                ret = crypto_run(fcr, &kcop);
                if (unlikely(ret))
                        return ret;
+               ret = copy_to_user(kcop.cop.mac, kcop.hash_output, 
kcop.digestsize);
+               if (unlikely(ret))
+                       return ret;
                if (unlikely(copy_to_user(arg, &kcop.cop, sizeof(kcop.cop))))
                        return -EFAULT;
                return 0;
@@ -980,6 +978,11 @@ cryptodev_compat_ioctl(struct file *file, unsigned int 
cmd, unsigned long arg_)
                if (unlikely(ret))
                        return ret;
 
+               ret = copy_to_user(kcop.cop.mac,
+                               kcop.hash_output, kcop.digestsize);
+               if (unlikely(ret))
+                       return ret;
+
                crypt_op_to_compat(&kcop.cop, &compat_cop);
                if (unlikely(copy_to_user(arg, &compat_cop,
                                          sizeof(compat_cop))))
-- 
1.7.2.2



_______________________________________________
Cryptodev-linux-devel mailing list
Cryptodev-linux-devel@gna.org
https://mail.gna.org/listinfo/cryptodev-linux-devel