Skip to contentSkip to conversation

crypto: sun8i-ss - fix error codes in allocate_flows()

PATCH In review Dan Carpenter 3 participants 3 messages May 18, 2022 – Jun 10, 2022

Subsystems (4)
Kernel janitors Crypto API Arm/Allwinner sunXi SoC support Allwinner crypto drivers
lore
Share & tools
lore

Dan Carpenter

author
#0 lore raw

PATCH 1/1 crypto: sun8i-ss - fix error codes in allocate_flows()

These failure paths should return -ENOMEM. Currently they return success.

Fixes 359e893e8af4 ("crypto: sun8i-ss - rework handling of IV")
Fixes 8eec4563f152 ("crypto: sun8i-ss - do not allocate memory when handling hash requests")
Signed-off-by Dan Carpenter <[email protected]>
---
 .../crypto/allwinner/sun8i-ss/sun8i-ss-core.c    | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)
drivers/crypto/allwinner/sun8i-ss/sun8i-ss-core.c +12 -4
index 98593a0cff69..ac2329e2b0e5 100644
@@ -528,25 +528,33 @@ static int allocate_flows(struct sun8i_ss_dev *ss)
 
 		ss->flows[i].biv = devm_kmalloc(ss->dev, AES_BLOCK_SIZE,
 						GFP_KERNEL | GFP_DMA);
-		if (!ss->flows[i].biv)
+		if (!ss->flows[i].biv) {
+			err = -ENOMEM;
 			goto error_engine;
+		}
 
 		for (j = 0; j < MAX_SG; j++) {
 			ss->flows[i].iv[j] = devm_kmalloc(ss->dev, AES_BLOCK_SIZE,
 							  GFP_KERNEL | GFP_DMA);
-			if (!ss->flows[i].iv[j])
+			if (!ss->flows[i].iv[j]) {
+				err = -ENOMEM;
 				goto error_engine;
+			}
 		}
 
 		/* the padding could be up to two block. */
 		ss->flows[i].pad = devm_kmalloc(ss->dev, MAX_PAD_SIZE,
 						GFP_KERNEL | GFP_DMA);
-		if (!ss->flows[i].pad)
+		if (!ss->flows[i].pad) {
+			err = -ENOMEM;
 			goto error_engine;
+		}
 		ss->flows[i].result = devm_kmalloc(ss->dev, SHA256_DIGEST_SIZE,
 						   GFP_KERNEL | GFP_DMA);
-		if (!ss->flows[i].result)
+		if (!ss->flows[i].result) {
+			err = -ENOMEM;
 			goto error_engine;
+		}
 
 		ss->flows[i].engine = crypto_engine_alloc_init(ss->dev, true);
 		if (!ss->flows[i].engine) {
Signature · 1 line
2.35.1
maintainer Acked-by Tested-by on v1 1/1
#1 lore raw
Quoted 6 lines · Dan Carpenter

These failure paths should return -ENOMEM. Currently they return success.

Fixes 359e893e8af4 ("crypto: sun8i-ss - rework handling of IV")
Fixes 8eec4563f152 ("crypto: sun8i-ss - do not allocate memory when handling hash requests")
Signed-off-by Dan Carpenter <[email protected]>
Acked-by Corentin Labbe <[email protected]>
Tested-by Corentin Labbe <[email protected]>

Tested-on: sun8i-a83t-bananapi-m3

Thanks

maintainer
#2 lore raw
In reply to Dan Carpenter
Quoted 9 lines · Dan Carpenter

These failure paths should return -ENOMEM. Currently they return success.

Fixes 359e893e8af4 ("crypto: sun8i-ss - rework handling of IV")
Fixes 8eec4563f152 ("crypto: sun8i-ss - do not allocate memory when handling hash requests")
Signed-off-by Dan Carpenter <[email protected]>
---
 .../crypto/allwinner/sun8i-ss/sun8i-ss-core.c    | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

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