Commit 553aff5f authored by Gilad Ben-Yossef's avatar Gilad Ben-Yossef Committed by Greg Kroah-Hartman
Browse files

staging: ccree: simplify OOM handling 



Simplify handling of memory allocation failures and remove
redundant log messages

Signed-off-by: default avatarGilad Ben-Yossef <gilad@benyossef.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent bdd0873d

drivers/staging/ccree/ssi_cipher.c

+4 −7
Original line number Diff line number Diff line
@@ -194,10 +194,9 @@ static int ssi_blkcipher_init(struct crypto_tfm *tfm) 


	/* Allocate key buffer, cache line aligned */

	ctx_p->user.key = kmalloc(max_key_buf_size, GFP_KERNEL | GFP_DMA);

	if (!ctx_p->user.key) {

		dev_dbg(dev, "Allocating key buffer in context failed\n");

		rc = -ENOMEM;

	}

	if (!ctx_p->user.key)

		return -ENOMEM;



	dev_dbg(dev, "Allocated key buffer in context. key=@%p\n",

		ctx_p->user.key);
@@ -1245,10 +1244,8 @@ struct ssi_crypto_alg *ssi_ablkcipher_create_alg(struct ssi_alg_template 
	struct crypto_alg *alg;



	t_alg = kzalloc(sizeof(*t_alg), GFP_KERNEL);

	if (!t_alg) {

		dev_dbg(dev, "failed to allocate t_alg\n");

	if (!t_alg)

		return ERR_PTR(-ENOMEM);

	}



	alg = &t_alg->crypto_alg;

drivers/staging/ccree/ssi_driver.c

+0 −1
Original line number Diff line number Diff line
@@ -212,7 +212,6 @@ static int init_cc_resources(struct platform_device *plat_dev) 


	new_drvdata = devm_kzalloc(dev, sizeof(*new_drvdata), GFP_KERNEL);

	if (!new_drvdata) {

		dev_dbg(dev, "Failed to allocate drvdata");

		rc = -ENOMEM;

		goto post_drvdata_err;

	}

drivers/staging/ccree/ssi_hash.c

+15 −27
Original line number Diff line number Diff line
@@ -157,34 +157,28 @@ static int ssi_hash_map_request(struct device *dev, 
	int rc = -ENOMEM;



	state->buff0 = kzalloc(SSI_MAX_HASH_BLCK_SIZE, GFP_KERNEL | GFP_DMA);

	if (!state->buff0) {

		dev_err(dev, "Allocating buff0 in context failed\n");

	if (!state->buff0)

		goto fail0;

	}



	state->buff1 = kzalloc(SSI_MAX_HASH_BLCK_SIZE, GFP_KERNEL | GFP_DMA);

	if (!state->buff1) {

		dev_err(dev, "Allocating buff1 in context failed\n");

	if (!state->buff1)

		goto fail_buff0;

	}



	state->digest_result_buff = kzalloc(SSI_MAX_HASH_DIGEST_SIZE, GFP_KERNEL | GFP_DMA);

	if (!state->digest_result_buff) {

		dev_err(dev, "Allocating digest_result_buff in context failed\n");

	if (!state->digest_result_buff)

		goto fail_buff1;

	}



	state->digest_buff = kzalloc(ctx->inter_digestsize, GFP_KERNEL | GFP_DMA);

	if (!state->digest_buff) {

		dev_err(dev, "Allocating digest-buffer in context failed\n");

	if (!state->digest_buff)

		goto fail_digest_result_buff;

	}



	dev_dbg(dev, "Allocated digest-buffer in context ctx->digest_buff=@%p\n",

		state->digest_buff);

	if (ctx->hw_mode != DRV_CIPHER_XCBC_MAC) {

		state->digest_bytes_len = kzalloc(HASH_LEN_SIZE, GFP_KERNEL | GFP_DMA);

		if (!state->digest_bytes_len) {

			dev_err(dev, "Allocating digest-bytes-len in context failed\n");

		if (!state->digest_bytes_len)

			goto fail1;

		}



		dev_dbg(dev, "Allocated digest-bytes-len in context state->>digest_bytes_len=@%p\n",

			state->digest_bytes_len);

	} else {
@@ -192,10 +186,9 @@ static int ssi_hash_map_request(struct device *dev, 
	}



	state->opad_digest_buff = kzalloc(ctx->inter_digestsize, GFP_KERNEL | GFP_DMA);

	if (!state->opad_digest_buff) {

		dev_err(dev, "Allocating opad-digest-buffer in context failed\n");

	if (!state->opad_digest_buff)

		goto fail2;

	}



	dev_dbg(dev, "Allocated opad-digest-buffer in context state->digest_bytes_len=@%p\n",

		state->opad_digest_buff);
@@ -2057,10 +2050,9 @@ ssi_hash_create_alg(struct ssi_hash_template *template, struct device *dev, 
	struct ahash_alg *halg;



	t_crypto_alg = kzalloc(sizeof(*t_crypto_alg), GFP_KERNEL);

	if (!t_crypto_alg) {

		dev_dbg(dev, "failed to allocate t_crypto_alg\n");

	if (!t_crypto_alg)

		return ERR_PTR(-ENOMEM);

	}





	t_crypto_alg->ahash_alg = template->template_ahash;

	halg = &t_crypto_alg->ahash_alg;
@@ -2225,12 +2217,8 @@ int ssi_hash_alloc(struct ssi_drvdata *drvdata) 
	int alg;



	hash_handle = kzalloc(sizeof(*hash_handle), GFP_KERNEL);

	if (!hash_handle) {

		dev_err(dev, "kzalloc failed to allocate %zu B\n",

			sizeof(*hash_handle));

		rc = -ENOMEM;

		goto fail;

	}

	if (!hash_handle)

		return -ENOMEM;



	INIT_LIST_HEAD(&hash_handle->hash_list);

	drvdata->hash_handle = hash_handle;

drivers/staging/ccree/ssi_ivgen.c

+3 −6
Original line number Diff line number Diff line
@@ -193,12 +193,9 @@ int ssi_ivgen_init(struct ssi_drvdata *drvdata) 
	/* Allocate "this" context */

	drvdata->ivgen_handle = kzalloc(sizeof(*drvdata->ivgen_handle),

					GFP_KERNEL);

	if (!drvdata->ivgen_handle) {

		dev_err(device, "Not enough memory to allocate IVGEN context (%zu B)\n",

			sizeof(*drvdata->ivgen_handle));

		rc = -ENOMEM;

		goto out;

	}

	if (!drvdata->ivgen_handle)

		return -ENOMEM;



	ivgen_ctx = drvdata->ivgen_handle;



	/* Allocate pool's header for intial enc. key/IV */

drivers/staging/ccree/ssi_sram_mgr.c

+4 −19
Original line number Diff line number Diff line
@@ -50,29 +50,14 @@ void ssi_sram_mgr_fini(struct ssi_drvdata *drvdata) 
 */

int ssi_sram_mgr_init(struct ssi_drvdata *drvdata)

{

	struct ssi_sram_mgr_ctx *smgr_ctx;

	struct device *dev = drvdata_to_dev(drvdata);

	int rc;



	/* Allocate "this" context */

	drvdata->sram_mgr_handle = kzalloc(

			sizeof(struct ssi_sram_mgr_ctx), GFP_KERNEL);

	if (!drvdata->sram_mgr_handle) {

		dev_err(dev, "Not enough memory to allocate SRAM_MGR ctx (%zu)\n",

			sizeof(struct ssi_sram_mgr_ctx));

		rc = -ENOMEM;

		goto out;

	}

	smgr_ctx = drvdata->sram_mgr_handle;

	drvdata->sram_mgr_handle = kzalloc(sizeof(struct ssi_sram_mgr_ctx),

					   GFP_KERNEL);



	/* Pool starts at start of SRAM */

	smgr_ctx->sram_free_offset = 0;

	if (!drvdata->sram_mgr_handle)

		return -ENOMEM;



	return 0;



out:

	ssi_sram_mgr_fini(drvdata);

	return rc;

}



/*!