summaryrefslogtreecommitdiffstats
path: root/cryptodev_main.c
diff options
context:
space:
mode:
authorMiloslav Trmač <mitr@redhat.com>2010-07-09 06:44:29 +0200
committerNikos Mavrogiannopoulos <nmav@gnutls.org>2010-07-19 09:23:30 +0200
commitd14687b82cb156a98990abff610f22726dc9ec28 (patch)
tree0aa6e6031e45bdaea6da89cff6cc844a8e5c14fc /cryptodev_main.c
parent94da9cb2317a184ca6246c359a9add8df2bc9abc (diff)
downloadkernel-crypto-d14687b82cb156a98990abff610f22726dc9ec28.tar.gz
kernel-crypto-d14687b82cb156a98990abff610f22726dc9ec28.tar.xz
kernel-crypto-d14687b82cb156a98990abff610f22726dc9ec28.zip
Fix error paths in crypto_run
Signed-off-by: Nikos Mavrogiannopoulos <nmav@gnutls.org>
Diffstat (limited to 'cryptodev_main.c')
-rw-r--r--cryptodev_main.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/cryptodev_main.c b/cryptodev_main.c
index d969bb1891a..7424746e311 100644
--- a/cryptodev_main.c
+++ b/cryptodev_main.c
@@ -409,7 +409,7 @@ crypto_run(struct fcrypt *fcr, struct crypt_op *cop)
if (unlikely(ret)) {
dprintk(1, KERN_ERR,
"error in cryptodev_hash_reset()\n");
- goto out_unlock;
+ goto out;
}
}
@@ -421,7 +421,7 @@ crypto_run(struct fcrypt *fcr, struct crypt_op *cop)
"data size (%zu) isn't a multiple of block size (%u)\n",
nbytes, blocksize);
ret = -EINVAL;
- goto out_unlock;
+ goto out;
}
if (cop->iv) {
@@ -430,7 +430,7 @@ crypto_run(struct fcrypt *fcr, struct crypt_op *cop)
ivsize = min((int)sizeof(iv), ses_ptr->cdata.ivsize);
ret = copy_from_user(iv, cop->iv, ivsize);
if (unlikely(ret))
- goto out_unlock;
+ goto out;
cryptodev_cipher_set_iv(&ses_ptr->cdata, iv, ivsize);
}