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

Commit ebc610e5 authored by Herbert Xu's avatar Herbert Xu
Browse files

[CRYPTO] templates: Pass type/mask when creating instances 



This patch passes the type/mask along when constructing instances of
templates.  This is in preparation for templates that may support
multiple types of instances depending on what is requested.  For example,
the planned software async crypto driver will use this construct.

For the moment this allows us to check whether the instance constructed
is of the correct type and avoid returning success if the type does not
match.

Signed-off-by: default avatarHerbert Xu <herbert@gondor.apana.org.au>
parent 6158efc0

crypto/algapi.c

+36 −6
Original line number Diff line number Diff line
@@ -425,15 +425,45 @@ int crypto_unregister_notifier(struct notifier_block *nb) 
}

EXPORT_SYMBOL_GPL(crypto_unregister_notifier);



struct crypto_alg *crypto_get_attr_alg(void *param, unsigned int len,

				       u32 type, u32 mask)

struct crypto_attr_type *crypto_get_attr_type(struct rtattr **tb)

{

	struct rtattr *rta = param;

	struct rtattr *rta = tb[CRYPTOA_TYPE - 1];

	struct crypto_attr_type *algt;



	if (!rta)

		return ERR_PTR(-ENOENT);

	if (RTA_PAYLOAD(rta) < sizeof(*algt))

		return ERR_PTR(-EINVAL);



	algt = RTA_DATA(rta);



	return algt;

}

EXPORT_SYMBOL_GPL(crypto_get_attr_type);



int crypto_check_attr_type(struct rtattr **tb, u32 type)

{

	struct crypto_attr_type *algt;



	algt = crypto_get_attr_type(tb);

	if (IS_ERR(algt))

		return PTR_ERR(algt);



	if ((algt->type ^ type) & algt->mask)

		return -EINVAL;



	return 0;

}

EXPORT_SYMBOL_GPL(crypto_check_attr_type);



struct crypto_alg *crypto_get_attr_alg(struct rtattr **tb, u32 type, u32 mask)

{

	struct rtattr *rta = tb[CRYPTOA_ALG - 1];

	struct crypto_attr_alg *alga;



	if (!RTA_OK(rta, len))

		return ERR_PTR(-EBADR);

	if (rta->rta_type != CRYPTOA_ALG || RTA_PAYLOAD(rta) < sizeof(*alga))

	if (!rta)

		return ERR_PTR(-ENOENT);

	if (RTA_PAYLOAD(rta) < sizeof(*alga))

		return ERR_PTR(-EINVAL);



	alga = RTA_DATA(rta);

crypto/cbc.c

+8 −3
Original line number Diff line number Diff line
@@ -275,13 +275,18 @@ static void crypto_cbc_exit_tfm(struct crypto_tfm *tfm) 
	crypto_free_cipher(ctx->child);

}



static struct crypto_instance *crypto_cbc_alloc(void *param, unsigned int len)

static struct crypto_instance *crypto_cbc_alloc(struct rtattr **tb)

{

	struct crypto_instance *inst;

	struct crypto_alg *alg;

	int err;



	err = crypto_check_attr_type(tb, CRYPTO_ALG_TYPE_BLKCIPHER);

	if (err)

		return ERR_PTR(err);



	alg = crypto_get_attr_alg(param, len, CRYPTO_ALG_TYPE_CIPHER,

				  CRYPTO_ALG_TYPE_MASK | CRYPTO_ALG_ASYNC);

	alg = crypto_get_attr_alg(tb, CRYPTO_ALG_TYPE_CIPHER,

				  CRYPTO_ALG_TYPE_MASK);

	if (IS_ERR(alg))

		return ERR_PTR(PTR_ERR(alg));

crypto/cryptomgr.c

+18 −10
Original line number Diff line number Diff line
@@ -26,14 +26,19 @@ 
struct cryptomgr_param {

	struct work_struct work;



	struct rtattr *tb[CRYPTOA_MAX];



	struct {

		struct rtattr attr;

		struct crypto_attr_type data;

	} type;



	struct {

		struct rtattr attr;

		struct crypto_attr_alg data;

	} alg;



	struct {

		u32 type;

		u32 mask;

		char name[CRYPTO_MAX_ALG_NAME];

	} larval;
@@ -53,7 +58,7 @@ static void cryptomgr_probe(struct work_struct *work) 
		goto err;



	do {

		inst = tmpl->alloc(&param->alg, sizeof(param->alg));

		inst = tmpl->alloc(param->tb);

		if (IS_ERR(inst))

			err = PTR_ERR(inst);

		else if ((err = crypto_register_instance(tmpl, inst)))
@@ -70,8 +75,8 @@ static void cryptomgr_probe(struct work_struct *work) 
	return;



err:

	crypto_larval_error(param->larval.name, param->larval.type,

			    param->larval.mask);

	crypto_larval_error(param->larval.name, param->type.data.type,

			    param->type.data.mask);

	goto out;

}
@@ -82,7 +87,7 @@ static int cryptomgr_schedule_probe(struct crypto_larval *larval) 
	const char *p;

	unsigned int len;



	param = kmalloc(sizeof(*param), GFP_KERNEL);

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

	if (!param)

		goto err;
@@ -94,7 +99,6 @@ static int cryptomgr_schedule_probe(struct crypto_larval *larval) 
		goto err_free_param;



	memcpy(param->template, name, len);

	param->template[len] = 0;



	name = p + 1;

	for (p = name; isalnum(*p) || *p == '-' || *p == '_'; p++)
@@ -104,14 +108,18 @@ static int cryptomgr_schedule_probe(struct crypto_larval *larval) 
	if (!len || *p != ')' || p[1])

		goto err_free_param;



	param->type.attr.rta_len = sizeof(param->type);

	param->type.attr.rta_type = CRYPTOA_TYPE;

	param->type.data.type = larval->alg.cra_flags;

	param->type.data.mask = larval->mask;

	param->tb[CRYPTOA_TYPE - 1] = &param->type.attr;



	param->alg.attr.rta_len = sizeof(param->alg);

	param->alg.attr.rta_type = CRYPTOA_ALG;

	memcpy(param->alg.data.name, name, len);

	param->alg.data.name[len] = 0;

	param->tb[CRYPTOA_ALG - 1] = &param->alg.attr;



	memcpy(param->larval.name, larval->alg.cra_name, CRYPTO_MAX_ALG_NAME);

	param->larval.type = larval->alg.cra_flags;

	param->larval.mask = larval->mask;



	INIT_WORK(&param->work, cryptomgr_probe);

	schedule_work(&param->work);

crypto/ecb.c

+8 −3
Original line number Diff line number Diff line
@@ -115,13 +115,18 @@ static void crypto_ecb_exit_tfm(struct crypto_tfm *tfm) 
	crypto_free_cipher(ctx->child);

}



static struct crypto_instance *crypto_ecb_alloc(void *param, unsigned int len)

static struct crypto_instance *crypto_ecb_alloc(struct rtattr **tb)

{

	struct crypto_instance *inst;

	struct crypto_alg *alg;

	int err;



	err = crypto_check_attr_type(tb, CRYPTO_ALG_TYPE_BLKCIPHER);

	if (err)

		return ERR_PTR(err);



	alg = crypto_get_attr_alg(param, len, CRYPTO_ALG_TYPE_CIPHER,

				  CRYPTO_ALG_TYPE_MASK | CRYPTO_ALG_ASYNC);

	alg = crypto_get_attr_alg(tb, CRYPTO_ALG_TYPE_CIPHER,

				  CRYPTO_ALG_TYPE_MASK);

	if (IS_ERR(alg))

		return ERR_PTR(PTR_ERR(alg));

crypto/hmac.c

+8 −3
Original line number Diff line number Diff line
@@ -197,13 +197,18 @@ static void hmac_free(struct crypto_instance *inst) 
	kfree(inst);

}



static struct crypto_instance *hmac_alloc(void *param, unsigned int len)

static struct crypto_instance *hmac_alloc(struct rtattr **tb)

{

	struct crypto_instance *inst;

	struct crypto_alg *alg;

	int err;



	err = crypto_check_attr_type(tb, CRYPTO_ALG_TYPE_HASH);

	if (err)

		return ERR_PTR(err);



	alg = crypto_get_attr_alg(param, len, CRYPTO_ALG_TYPE_HASH,

				  CRYPTO_ALG_TYPE_HASH_MASK | CRYPTO_ALG_ASYNC);

	alg = crypto_get_attr_alg(tb, CRYPTO_ALG_TYPE_HASH,

				  CRYPTO_ALG_TYPE_HASH_MASK);

	if (IS_ERR(alg))

		return ERR_PTR(PTR_ERR(alg));