diff options
| author | Herbert Xu <herbert@gondor.apana.org.au> | 2016-09-13 14:43:29 +0800 |
|---|---|---|
| committer | Sasha Levin <alexander.levin@verizon.com> | 2016-10-05 22:40:20 -0400 |
| commit | 4f17ddb10568a473ef3e786536cb38f56a3a2a91 (patch) | |
| tree | 790c6c0a1bd626a429083a623af3117af8ad45eb /crypto | |
| parent | f5c698a84c6e7570dc27338db9f65552ace9a8ac (diff) | |
| download | linux-stable-4f17ddb10568a473ef3e786536cb38f56a3a2a91.tar.gz linux-stable-4f17ddb10568a473ef3e786536cb38f56a3a2a91.tar.bz2 linux-stable-4f17ddb10568a473ef3e786536cb38f56a3a2a91.zip | |
crypto: skcipher - Fix blkcipher walk OOM crash
[ Upstream commit acdb04d0b36769b3e05990c488dc74d8b7ac8060 ]
When we need to allocate a temporary blkcipher_walk_next and it
fails, the code is supposed to take the slow path of processing
the data block by block. However, due to an unrelated change
we instead end up dereferencing the NULL pointer.
This patch fixes it by moving the unrelated bsize setting out
of the way so that we enter the slow path as inteded.
Fixes: 7607bd8ff03b ("[CRYPTO] blkcipher: Added blkcipher_walk_virt_block")
Cc: stable@vger.kernel.org
Reported-by: xiakaixu <xiakaixu@huawei.com>
Reported-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Tested-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>
Signed-off-by: Sasha Levin <alexander.levin@verizon.com>
Diffstat (limited to 'crypto')
| -rw-r--r-- | crypto/blkcipher.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/crypto/blkcipher.c b/crypto/blkcipher.c index 0122bec38564..f25799f351f7 100644 --- a/crypto/blkcipher.c +++ b/crypto/blkcipher.c @@ -233,6 +233,8 @@ static int blkcipher_walk_next(struct blkcipher_desc *desc, return blkcipher_walk_done(desc, walk, -EINVAL); } + bsize = min(walk->walk_blocksize, n); + walk->flags &= ~(BLKCIPHER_WALK_SLOW | BLKCIPHER_WALK_COPY | BLKCIPHER_WALK_DIFF); if (!scatterwalk_aligned(&walk->in, walk->alignmask) || @@ -245,7 +247,6 @@ static int blkcipher_walk_next(struct blkcipher_desc *desc, } } - bsize = min(walk->walk_blocksize, n); n = scatterwalk_clamp(&walk->in, n); n = scatterwalk_clamp(&walk->out, n); |