UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

[CRYPTO] Fix boundary check in standard multi-block cipher processors 

The boundary check in the standard multi-block cipher processors are
broken when nbytes is not a multiple of bsize.  In those cases it will
always process an extra block.

This patch corrects the check so that it processes at most nbytes of
data.

Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Herbert Xu 2005-09-06 14:49:44 -07:00 committed by David S. Miller
parent b69aee04fb
commit fe2d5295a1
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
crypto/cipher.c
View File

@ -191,6 +191,8 @@ static unsigned int cbc_process_encrypt(const struct cipher_desc *desc,
u8 *iv = desc->info; u8 *iv = desc->info;
unsigned int done = 0; unsigned int done = 0;
nbytes -= bsize;
do { do {
xor(iv, src); xor(iv, src);
fn(crypto_tfm_ctx(tfm), dst, iv); fn(crypto_tfm_ctx(tfm), dst, iv);
@ -198,7 +200,7 @@ static unsigned int cbc_process_encrypt(const struct cipher_desc *desc,
src += bsize; src += bsize;
dst += bsize; dst += bsize;
} while ((done += bsize) < nbytes); } while ((done += bsize) <= nbytes);
return done; return done;
} }
@ -219,6 +221,8 @@ static unsigned int cbc_process_decrypt(const struct cipher_desc *desc,
u8 *iv = desc->info; u8 *iv = desc->info;
unsigned int done = 0; unsigned int done = 0;
nbytes -= bsize;
do { do {
u8 *tmp_dst = *dst_p; u8 *tmp_dst = *dst_p;
@ -230,7 +234,7 @@ static unsigned int cbc_process_decrypt(const struct cipher_desc *desc,
src += bsize; src += bsize;
dst += bsize; dst += bsize;
} while ((done += bsize) < nbytes); } while ((done += bsize) <= nbytes);
return done; return done;
} }
@ -243,12 +247,14 @@ static unsigned int ecb_process(const struct cipher_desc *desc, u8 *dst,
void (*fn)(void *, u8 *, const u8 *) = desc->crfn; void (*fn)(void *, u8 *, const u8 *) = desc->crfn;
unsigned int done = 0; unsigned int done = 0;
nbytes -= bsize;
do { do {
fn(crypto_tfm_ctx(tfm), dst, src); fn(crypto_tfm_ctx(tfm), dst, src);
src += bsize; src += bsize;
dst += bsize; dst += bsize;
} while ((done += bsize) < nbytes); } while ((done += bsize) <= nbytes);
return done; return done;
} }