diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-04-02 07:43:37 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-04-02 07:43:37 -0700 |
| commit | 8774b7f63be0d1b237bc30d49b6486f7691e2ed4 (patch) | |
| tree | 2e0b9587fd3bb93a9166ad46ac7f928a41c59bb8 | |
| parent | a5f37c3252b174efdcdd808797a7c529064c95c0 (diff) | |
| parent | 1edcf2e1ee2babb011cfca80ad9d202e9c491669 (diff) | |
| download | linux-8774b7f63be0d1b237bc30d49b6486f7691e2ed4.tar.bz2 | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6:
[CRYPTO] xcbc: Fix crash when ipsec uses xcbc-mac with big data chunk
| -rw-r--r-- | crypto/xcbc.c | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/crypto/xcbc.c b/crypto/xcbc.c index 2feb0f239c38..b63b633e549c 100644 --- a/crypto/xcbc.c +++ b/crypto/xcbc.c @@ -116,13 +116,11 @@ static int crypto_xcbc_digest_update2(struct hash_desc *pdesc, struct crypto_xcbc_ctx *ctx = crypto_hash_ctx_aligned(parent); struct crypto_cipher *tfm = ctx->child; int bs = crypto_hash_blocksize(parent); - unsigned int i = 0; - do { - - struct page *pg = sg_page(&sg[i]); - unsigned int offset = sg[i].offset; - unsigned int slen = sg[i].length; + for (;;) { + struct page *pg = sg_page(sg); + unsigned int offset = sg->offset; + unsigned int slen = sg->length; if (unlikely(slen > nbytes)) slen = nbytes; @@ -182,8 +180,11 @@ static int crypto_xcbc_digest_update2(struct hash_desc *pdesc, offset = 0; pg++; } - i++; - } while (nbytes>0); + + if (!nbytes) + break; + sg = scatterwalk_sg_next(sg); + } return 0; } |