diff options
author | Dan Carpenter <dan.carpenter@oracle.com> | 2014-02-13 09:58:32 -0500 |
---|---|---|
committer | Herbert Xu <herbert@gondor.apana.org.au> | 2014-02-26 16:56:54 -0500 |
commit | b3bd5869fd65f509d96a9fcb47cdea81163a811d (patch) | |
tree | b17732975cbf77d72a3a4183cd048a353559a4bd | |
parent | fb5d23e3e09d6c9719b783ac1955c085aca3d4ae (diff) |
crypto: remove a duplicate checks in __cbc_decrypt()
We checked "nbytes < bsize" before so it can't happen here.
Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
Acked-by: Jussi Kivilinna <jussi.kivilinna@iki.fi>
Acked-by: Johannes Götzfried <johannes.goetzfried@cs.fau.de>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
-rw-r--r-- | arch/x86/crypto/blowfish_glue.c | 3 | ||||
-rw-r--r-- | arch/x86/crypto/cast5_avx_glue.c | 3 |
2 files changed, 0 insertions, 6 deletions
diff --git a/arch/x86/crypto/blowfish_glue.c b/arch/x86/crypto/blowfish_glue.c index 50ec333b70e6..8af519ed73d1 100644 --- a/arch/x86/crypto/blowfish_glue.c +++ b/arch/x86/crypto/blowfish_glue.c | |||
@@ -223,9 +223,6 @@ static unsigned int __cbc_decrypt(struct blkcipher_desc *desc, | |||
223 | src -= 1; | 223 | src -= 1; |
224 | dst -= 1; | 224 | dst -= 1; |
225 | } while (nbytes >= bsize * 4); | 225 | } while (nbytes >= bsize * 4); |
226 | |||
227 | if (nbytes < bsize) | ||
228 | goto done; | ||
229 | } | 226 | } |
230 | 227 | ||
231 | /* Handle leftovers */ | 228 | /* Handle leftovers */ |
diff --git a/arch/x86/crypto/cast5_avx_glue.c b/arch/x86/crypto/cast5_avx_glue.c index e6a3700489b9..e57e20ab5e0b 100644 --- a/arch/x86/crypto/cast5_avx_glue.c +++ b/arch/x86/crypto/cast5_avx_glue.c | |||
@@ -203,9 +203,6 @@ static unsigned int __cbc_decrypt(struct blkcipher_desc *desc, | |||
203 | src -= 1; | 203 | src -= 1; |
204 | dst -= 1; | 204 | dst -= 1; |
205 | } while (nbytes >= bsize * CAST5_PARALLEL_BLOCKS); | 205 | } while (nbytes >= bsize * CAST5_PARALLEL_BLOCKS); |
206 | |||
207 | if (nbytes < bsize) | ||
208 | goto done; | ||
209 | } | 206 | } |
210 | 207 | ||
211 | /* Handle leftovers */ | 208 | /* Handle leftovers */ |