diff options
| author | Herbert Xu | 2009-01-16 04:40:54 +0100 |
|---|---|---|
| committer | Herbert Xu | 2009-01-27 07:11:13 +0100 |
| commit | bac1b5c4696f217afeac5b29874a337bc39da717 (patch) | |
| tree | 7e13f7953ea27cff00ef5e45a3fd8e7dac4ea95a | |
| parent | crypto: authenc - Fix zero-length IV crash (diff) | |
| download | kernel-qcow2-linux-bac1b5c4696f217afeac5b29874a337bc39da717.tar.gz kernel-qcow2-linux-bac1b5c4696f217afeac5b29874a337bc39da717.tar.xz kernel-qcow2-linux-bac1b5c4696f217afeac5b29874a337bc39da717.zip | |
crypto: blkcipher - Fix WARN_ON handling in walk_done
When we get left-over bits from a slow walk, it means that the
underlying cipher has gone troppo. However, as we're handling
that case we should ensure that the caller terminates the walk.
This patch does this by setting walk->nbytes to zero.
Reported-by: Roel Kluin <roel.kluin@gmail.com>
Reported-by: Huang Ying <ying.huang@intel.com>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
| -rw-r--r-- | crypto/blkcipher.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/crypto/blkcipher.c b/crypto/blkcipher.c index 4a7e65c4df4d..d70a41c002df 100644 --- a/crypto/blkcipher.c +++ b/crypto/blkcipher.c @@ -124,6 +124,7 @@ int blkcipher_walk_done(struct blkcipher_desc *desc, scatterwalk_done(&walk->in, 0, nbytes); scatterwalk_done(&walk->out, 1, nbytes); +err: walk->total = nbytes; walk->nbytes = nbytes; @@ -132,7 +133,6 @@ int blkcipher_walk_done(struct blkcipher_desc *desc, return blkcipher_walk_next(desc, walk); } -err: if (walk->iv != desc->info) memcpy(desc->info, walk->iv, crypto_blkcipher_ivsize(tfm)); if (walk->buffer != walk->page) |