summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2008-06-02 15:30:44 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2008-06-02 15:30:44 -0700
commitc3b25b32e8bef526cca748e1ba023c6bdd705a99 (patch)
treee5dd19611d77689153eea5fdecb1de322623b12d
parent28928b2f1d769abdc173c96e2632d30cbde9ec4a (diff)
parentc4913c7b71abc79b008a3c118628cfb59bdb0efc (diff)
Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6tip-genirq-2008-06-06_07.38_Fri
* git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6: [CRYPTO] cts: Init SG tables
-rw-r--r--crypto/cts.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/crypto/cts.c b/crypto/cts.c
index c4e70bfb4970..ccf9c5de3958 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;