diff options
| author | Corentin Labbe | 2019-04-18 10:17:34 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman | 2019-05-31 15:46:15 +0200 |
| commit | e82df5f1e54ae1116d473916e7f94ac7143f7b69 (patch) | |
| tree | f0ee15af03fd3699efeb283e45c22b79fedee0db /drivers/crypto/sunxi-ss | |
| parent | nvme-rdma: fix a NULL deref when an admin connect times out (diff) | |
| download | kernel-qcow2-linux-e82df5f1e54ae1116d473916e7f94ac7143f7b69.tar.gz kernel-qcow2-linux-e82df5f1e54ae1116d473916e7f94ac7143f7b69.tar.xz kernel-qcow2-linux-e82df5f1e54ae1116d473916e7f94ac7143f7b69.zip | |
crypto: sun4i-ss - Fix invalid calculation of hash end
[ Upstream commit f87391558acf816b48f325a493d81d45dec40da0 ]
When nbytes < 4, end is wronlgy set to a negative value which, due to
uint, is then interpreted to a large value leading to a deadlock in the
following code.
This patch fix this problem.
Fixes: 6298e948215f ("crypto: sunxi-ss - Add Allwinner Security System crypto accelerator")
Signed-off-by: Corentin Labbe <clabbe.montjoie@gmail.com>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Signed-off-by: Sasha Levin <sashal@kernel.org>
Diffstat (limited to 'drivers/crypto/sunxi-ss')
| -rw-r--r-- | drivers/crypto/sunxi-ss/sun4i-ss-hash.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/drivers/crypto/sunxi-ss/sun4i-ss-hash.c b/drivers/crypto/sunxi-ss/sun4i-ss-hash.c index a4b5ff2b72f8..f6936bb3b7be 100644 --- a/drivers/crypto/sunxi-ss/sun4i-ss-hash.c +++ b/drivers/crypto/sunxi-ss/sun4i-ss-hash.c @@ -240,7 +240,10 @@ static int sun4i_hash(struct ahash_request *areq) } } else { /* Since we have the flag final, we can go up to modulo 4 */ - end = ((areq->nbytes + op->len) / 4) * 4 - op->len; + if (areq->nbytes < 4) + end = 0; + else + end = ((areq->nbytes + op->len) / 4) * 4 - op->len; } /* TODO if SGlen % 4 and !op->len then DMA */ |