Skip to contentSkip to conversation

crypto: shash - fix missed optimization in shash_ahash_digest()

PATCH In review Eric Biggers 2 participants 2 messages Apr 14, 2019 – Apr 18, 2019 Crypto API

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 crypto: shash - fix missed optimization in shash_ahash_digest()

From: Eric Biggers <[email protected]>

shash_ahash_digest(), which is the ->digest() method for ahash tfms that use an shash algorithm, has an optimization where crypto_shash_digest() is called if the data is in a single page. But an off-by-one error prevented this path from being taken unless the user happened to provide extra data in the scatterlist. Fix it.

---
 crypto/shash.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
crypto/shash.c +1 -1
index 15b369c4745f6..b85930e9a7a2e 100644
@@ -307,7 +307,7 @@ int shash_ahash_digest(struct ahash_request *req, struct shash_desc *desc)
 
 	if (nbytes &&
 	    (sg = req->src, offset = sg->offset,
-	     nbytes < min(sg->length, ((unsigned int)(PAGE_SIZE)) - offset))) {
+	     nbytes <= min(sg->length, ((unsigned int)(PAGE_SIZE)) - offset))) {
 		void *data;
 
 		data = kmap_atomic(sg_page(sg));
Signature · 1 line
2.21.0
maintainer
#1 lore raw
Quoted 8 lines · Eric Biggers

From: Eric Biggers <[email protected]>

shash_ahash_digest(), which is the ->digest() method for ahash tfms that use an shash algorithm, has an optimization where crypto_shash_digest() is called if the data is in a single page. But an off-by-one error prevented this path from being taken unless the user happened to provide extra data in the scatterlist. Fix it.

Quoted 4 lines
---
 crypto/shash.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Patch applied. Thanks.

Signature · 3 lines
Email: Herbert Xu <[email protected]>
Home Page: http://gondor.apana.org.au/~herbert/
PGP Key: http://gondor.apana.org.au/~herbert/pubkey.txt