summaryrefslogtreecommitdiff
path: root/crypto
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2008-06-16 11:23:36 +0200
committerIngo Molnar <mingo@elte.hu>2008-06-16 11:23:36 +0200
commitee1ee76b601e4de16246fc4d3f261f4a0c82b01d (patch)
tree30987ee1e39dbfb47f280dd06775fbb8732c5f89 /crypto
parentf04a40e1bddd04ad5ffcf198370210faf937c4be (diff)
parente91fca6420deb9bd222ee354cdfb3653b740069c (diff)
downloadlinux-crypto-ee1ee76b601e4de16246fc4d3f261f4a0c82b01d.tar.gz
linux-crypto-ee1ee76b601e4de16246fc4d3f261f4a0c82b01d.zip
Merge branch 'linus' into core/rcu
Diffstat (limited to 'crypto')
-rw-r--r--crypto/cts.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/crypto/cts.c b/crypto/cts.c
index c4e70bfb..ccf9c5de 100644
--- a/crypto/cts.c
+++ b/crypto/cts.c
@@ -89,6 +89,9 @@ static int cts_cbc_encrypt(struct crypto_cts_ctx *ctx,
if (lastn < 0)
return -EINVAL;
+ sg_init_table(sgsrc, 1);
+ sg_init_table(sgdst, 1);
+
memset(s, 0, sizeof(s));
scatterwalk_map_and_copy(s, src, offset, nbytes, 0);
@@ -172,6 +175,9 @@ static int cts_cbc_decrypt(struct crypto_cts_ctx *ctx,
if (lastn < 0)
return -EINVAL;
+ sg_init_table(sgsrc, 1);
+ sg_init_table(sgdst, 1);
+
scatterwalk_map_and_copy(s, src, offset, nbytes, 0);
lcldesc.tfm = ctx->child;