[Cryptodev-linux-devel] [PATCH 2/8] keep a copy of the IV and size in struct kernel_crypt_op

[Phil Sutter]

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

diff --git a/cryptodev_int.h b/cryptodev_int.h
index 6b0b909..5072e8f 100644
--- a/cryptodev_int.h
+++ b/cryptodev_int.h
@@ -120,6 +120,9 @@ struct compat_session_op {
 /* kernel-internal extension to struct crypt_op */
 struct kernel_crypt_op {
        struct crypt_op cop;
+
+       int ivlen;
+       __u8 iv[EALG_MAX_BLOCK_LEN];
 };
 
 #endif /* CRYPTODEV_INT_H */
diff --git a/cryptodev_main.c b/cryptodev_main.c
index fb51723..5fd5907 100644
--- a/cryptodev_main.c
+++ b/cryptodev_main.c
@@ -679,23 +679,8 @@ static int crypto_run(struct fcrypt *fcr, struct 
kernel_crypt_op *kcop)
                        goto out_unlock;
                }
 
-               if (cop->iv) {
-                       uint8_t iv[EALG_MAX_BLOCK_LEN];
-
-                       ret = copy_from_user(iv, cop->iv,
-                               min((int)sizeof(iv), (ses_ptr->cdata.ivsize)));
-                       if (unlikely(ret)) {
-                               dprintk(1, KERN_ERR,
-                                       "error copying IV (%d bytes)\n",
-                                       min((int)sizeof(iv),
-                                       (ses_ptr->cdata.ivsize)));
-                               ret = -EFAULT;
-                               goto out_unlock;
-                       }
-
-                       cryptodev_cipher_set_iv(&ses_ptr->cdata, iv,
-                                               ses_ptr->cdata.ivsize);
-               }
+               cryptodev_cipher_set_iv(&ses_ptr->cdata, kcop->iv,
+                               min(ses_ptr->cdata.ivsize, kcop->ivlen));
        }
 
        if (cop->len != 0) {
@@ -786,6 +771,7 @@ static int fill_kcop_from_cop(struct kernel_crypt_op *kcop, 
struct fcrypt *fcr)
 {
        struct crypt_op *cop = &kcop->cop;
        struct csession *ses_ptr;
+       int rc;
 
        /* this also enters ses_ptr->sem */
        ses_ptr = crypto_get_session_by_sid(fcr, cop->ses);
@@ -793,8 +779,16 @@ static int fill_kcop_from_cop(struct kernel_crypt_op 
*kcop, struct fcrypt *fcr)
                dprintk(1, KERN_ERR, "invalid session ID=0x%08X\n", cop->ses);
                return -EINVAL;
        }
+       kcop->ivlen = cop->iv ? ses_ptr->cdata.ivsize : 0;
        mutex_unlock(&ses_ptr->sem);
 
+       if (unlikely(rc = copy_from_user(kcop->iv, cop->iv, kcop->ivlen))) {
+               dprintk(1, KERN_ERR,
+                       "error copying IV (%d bytes), copy_from_user returned 
%d for address %lx\n",
+                       kcop->ivlen, rc, (unsigned long)cop->iv);
+               return -EFAULT;
+       }
+
        return 0;
 }
 
-- 
1.7.2.2



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