Commit c4caa56d authored by Eric Biggers's avatar Eric Biggers Committed by Herbert Xu
Browse files

crypto: gcm - simplify error handling in crypto_rfc4543_create() 



Simplify the error handling in crypto_rfc4543_create() by taking
advantage of crypto_grab_aead() now handling an ERR_PTR() name and by
taking advantage of crypto_drop_aead() now accepting (as a no-op) a
spawn that hasn't been grabbed yet.

Conveniently, this eliminates the 'ccm_name' variable which was
incorrectly named (it should have been 'gcm_name').

Also fix a weird case where a line was terminated by a comma rather than
a semicolon, causing the statement to be continued on the next line.
Fortunately the code still behaved as intended, though.

Signed-off-by: default avatarEric Biggers <ebiggers@google.com>
Signed-off-by: default avatarHerbert Xu <herbert@gondor.apana.org.au>
parent 959ac1cd

crypto/gcm.c

+12 −25
Original line number Diff line number Diff line
@@ -1060,10 +1060,8 @@ static int crypto_rfc4543_create(struct crypto_template *tmpl, 
	struct crypto_attr_type *algt;

	u32 mask;

	struct aead_instance *inst;

	struct crypto_aead_spawn *spawn;

	struct aead_alg *alg;

	struct crypto_rfc4543_instance_ctx *ctx;

	const char *ccm_name;

	int err;



	algt = crypto_get_attr_type(tb);
@@ -1075,32 +1073,27 @@ static int crypto_rfc4543_create(struct crypto_template *tmpl, 


	mask = crypto_requires_sync(algt->type, algt->mask);



	ccm_name = crypto_attr_alg_name(tb[1]);

	if (IS_ERR(ccm_name))

		return PTR_ERR(ccm_name);



	inst = kzalloc(sizeof(*inst) + sizeof(*ctx), GFP_KERNEL);

	if (!inst)

		return -ENOMEM;



	ctx = aead_instance_ctx(inst);

	spawn = &ctx->aead;

	err = crypto_grab_aead(spawn, aead_crypto_instance(inst),

			       ccm_name, 0, mask);

	err = crypto_grab_aead(&ctx->aead, aead_crypto_instance(inst),

			       crypto_attr_alg_name(tb[1]), 0, mask);

	if (err)

		goto out_free_inst;

		goto err_free_inst;



	alg = crypto_spawn_aead_alg(spawn);

	alg = crypto_spawn_aead_alg(&ctx->aead);



	err = -EINVAL;



	/* Underlying IV size must be 12. */

	if (crypto_aead_alg_ivsize(alg) != GCM_AES_IV_SIZE)

		goto out_drop_alg;

		goto err_free_inst;



	/* Not a stream cipher? */

	if (alg->base.cra_blocksize != 1)

		goto out_drop_alg;

		goto err_free_inst;



	err = -ENAMETOOLONG;

	if (snprintf(inst->alg.base.cra_name, CRYPTO_MAX_ALG_NAME,
@@ -1109,7 +1102,7 @@ static int crypto_rfc4543_create(struct crypto_template *tmpl, 
	    snprintf(inst->alg.base.cra_driver_name, CRYPTO_MAX_ALG_NAME,

		     "rfc4543(%s)", alg->base.cra_driver_name) >=

	    CRYPTO_MAX_ALG_NAME)

		goto out_drop_alg;

		goto err_free_inst;



	inst->alg.base.cra_flags = alg->base.cra_flags & CRYPTO_ALG_ASYNC;

	inst->alg.base.cra_priority = alg->base.cra_priority;
@@ -1130,20 +1123,14 @@ static int crypto_rfc4543_create(struct crypto_template *tmpl, 
	inst->alg.encrypt = crypto_rfc4543_encrypt;

	inst->alg.decrypt = crypto_rfc4543_decrypt;



	inst->free = crypto_rfc4543_free,

	inst->free = crypto_rfc4543_free;



	err = aead_register_instance(tmpl, inst);

	if (err)

		goto out_drop_alg;



out:

	if (err) {

err_free_inst:

		crypto_rfc4543_free(inst);

	}

	return err;



out_drop_alg:

	crypto_drop_aead(spawn);

out_free_inst:

	kfree(inst);

	goto out;

}



static struct crypto_template crypto_gcm_tmpls[] = {