Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2af8f4a2 authored by Kim Phillips's avatar Kim Phillips Committed by Herbert Xu
Browse files

crypto: caam - coccicheck fixes 



use true/false for bool, fix code alignment, and fix two allocs with
no test.

Signed-off-by: default avatarKim Phillips <kim.phillips@freescale.com>
Signed-off-by: default avatarHerbert Xu <herbert@gondor.apana.org.au>
parent 6bbb98dd

drivers/crypto/caam/caamalg.c

+8 −8
Original line number Diff line number Diff line
@@ -224,7 +224,7 @@ static int aead_set_sh_desc(struct crypto_aead *aead) 
	struct aead_tfm *tfm = &aead->base.crt_aead;

	struct caam_ctx *ctx = crypto_aead_ctx(aead);

	struct device *jrdev = ctx->jrdev;

	bool keys_fit_inline = 0;

	bool keys_fit_inline = false;

	u32 *key_jump_cmd, *jump_cmd;

	u32 geniv, moveiv;

	u32 *desc;
@@ -239,7 +239,7 @@ static int aead_set_sh_desc(struct crypto_aead *aead) 
	if (DESC_AEAD_ENC_LEN + DESC_JOB_IO_LEN +

	    ctx->split_key_pad_len + ctx->enckeylen <=

	    CAAM_DESC_BYTES_MAX)

		keys_fit_inline = 1;

		keys_fit_inline = true;



	/* aead_encrypt shared descriptor */

	desc = ctx->sh_desc_enc;
@@ -297,7 +297,7 @@ static int aead_set_sh_desc(struct crypto_aead *aead) 
	if (DESC_AEAD_DEC_LEN + DESC_JOB_IO_LEN +

	    ctx->split_key_pad_len + ctx->enckeylen <=

	    CAAM_DESC_BYTES_MAX)

		keys_fit_inline = 1;

		keys_fit_inline = true;



	desc = ctx->sh_desc_dec;
@@ -365,7 +365,7 @@ static int aead_set_sh_desc(struct crypto_aead *aead) 
	if (DESC_AEAD_GIVENC_LEN + DESC_JOB_IO_LEN +

	    ctx->split_key_pad_len + ctx->enckeylen <=

	    CAAM_DESC_BYTES_MAX)

		keys_fit_inline = 1;

		keys_fit_inline = true;



	/* aead_givencrypt shared descriptor */

	desc = ctx->sh_desc_givenc;

drivers/crypto/caam/caamhash.c

+4 −0
Original line number Diff line number Diff line
@@ -430,6 +430,10 @@ static u32 hash_digest_key(struct caam_hash_ctx *ctx, const u8 *key_in, 
	int ret = 0;



	desc = kmalloc(CAAM_CMD_SZ * 6 + CAAM_PTR_SZ * 2, GFP_KERNEL | GFP_DMA);

	if (!desc) {

		dev_err(jrdev, "unable to allocate key input memory\n");

		return -ENOMEM;

	}



	init_job_desc(desc, 0);

drivers/crypto/caam/key_gen.c

+4 −0
Original line number Diff line number Diff line
@@ -54,6 +54,10 @@ u32 gen_split_key(struct device *jrdev, u8 *key_out, int split_key_len, 
	int ret = 0;



	desc = kmalloc(CAAM_CMD_SZ * 6 + CAAM_PTR_SZ * 2, GFP_KERNEL | GFP_DMA);

	if (!desc) {

		dev_err(jrdev, "unable to allocate key input memory\n");

		return -ENOMEM;

	}



	init_job_desc(desc, 0);