diff options
author | Ingo Molnar <mingo@elte.hu> | 2008-06-16 05:23:36 -0400 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2008-06-16 05:23:36 -0400 |
commit | 766d02786ecd22932beeb9ca8bad6d8c5a552ef9 (patch) | |
tree | f6f2df0e35bbea914d1f4d12be6d02f128c73575 /crypto | |
parent | 906d882cacecd37ad2fdd03ed2a9b232bcb9507e (diff) | |
parent | 066519068ad2fbe98c7f45552b1f592903a9c8c8 (diff) |
Merge branch 'linus' into core/rcu
Diffstat (limited to 'crypto')
-rw-r--r-- | crypto/cts.c | 6 |
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, | |||
89 | if (lastn < 0) | 89 | if (lastn < 0) |
90 | return -EINVAL; | 90 | return -EINVAL; |
91 | 91 | ||
92 | sg_init_table(sgsrc, 1); | ||
93 | sg_init_table(sgdst, 1); | ||
94 | |||
92 | memset(s, 0, sizeof(s)); | 95 | memset(s, 0, sizeof(s)); |
93 | scatterwalk_map_and_copy(s, src, offset, nbytes, 0); | 96 | scatterwalk_map_and_copy(s, src, offset, nbytes, 0); |
94 | 97 | ||
@@ -172,6 +175,9 @@ static int cts_cbc_decrypt(struct crypto_cts_ctx *ctx, | |||
172 | if (lastn < 0) | 175 | if (lastn < 0) |
173 | return -EINVAL; | 176 | return -EINVAL; |
174 | 177 | ||
178 | sg_init_table(sgsrc, 1); | ||
179 | sg_init_table(sgdst, 1); | ||
180 | |||
175 | scatterwalk_map_and_copy(s, src, offset, nbytes, 0); | 181 | scatterwalk_map_and_copy(s, src, offset, nbytes, 0); |
176 | 182 | ||
177 | lcldesc.tfm = ctx->child; | 183 | lcldesc.tfm = ctx->child; |