Commit d2765e1b authored by Dan Carpenter's avatar Dan Carpenter Committed by Herbert Xu
Browse files

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



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

Fixes: 359e893e ("crypto: sun8i-ss - rework handling of IV")
Fixes: 8eec4563 ("crypto: sun8i-ss - do not allocate memory when handling hash requests")
Signed-off-by: default avatarDan Carpenter <dan.carpenter@oracle.com>
Acked-by: default avatarCorentin Labbe <clabbe.montjoie@gmail.com>
Tested-by: default avatarCorentin Labbe <clabbe.montjoie@gmail.com>
Signed-off-by: default avatarHerbert Xu <herbert@gondor.apana.org.au>
parent 13dc15a3

drivers/crypto/allwinner/sun8i-ss/sun8i-ss-core.c

+12 −4
Original line number Diff line number Diff line
@@ -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) {