diff options
| author | Corentin Labbe <clabbe.montjoie@gmail.com> | 2019-04-18 10:17:34 +0200 |
|---|---|---|
| committer | Herbert Xu <herbert@gondor.apana.org.au> | 2019-04-25 15:38:12 +0800 |
| commit | f87391558acf816b48f325a493d81d45dec40da0 (patch) | |
| tree | 4afdcaad4a70ddcadf78d24445e4d6e3169d2d13 | |
| parent | 179930a62f3182eb384ae1e4d1ad47e97f6f5e90 (diff) | |
| download | linux-f87391558acf816b48f325a493d81d45dec40da0.tar.gz linux-f87391558acf816b48f325a493d81d45dec40da0.tar.bz2 linux-f87391558acf816b48f325a493d81d45dec40da0.zip | |
crypto: sun4i-ss - Fix invalid calculation of hash end
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>
| -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 */ |