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

Commit e6c2e65c authored by Marcelo Cerri's avatar Marcelo Cerri Committed by Herbert Xu
Browse files

crypto: cbc - Propagate NEED_FALLBACK bit 



When requesting a fallback algorithm, we should propagate the
NEED_FALLBACK bit when search for the underlying algorithm.

This will prevents drivers from allocating unnecessary fallbacks that
are never called. For instance, currently the vmx-crypto driver will use
the following chain of calls when calling the fallback implementation:

p8_aes_cbc -> cbc(p8_aes) -> aes-generic

However p8_aes will always delegate its calls to aes-generic. With this
patch, p8_aes_cbc will be able to use cbc(aes-generic) directly as its
fallback. The same applies to aes_s390.

Signed-off-by: default avatarMarcelo Henrique Cerri <marcelo.cerri@canonical.com>
Signed-off-by: default avatarHerbert Xu <herbert@gondor.apana.org.au>
parent b13b1e0c

crypto/cbc.c

+13 −2
Original line number Original line Diff line number Diff line
@@ -10,6 +10,7 @@ 
 *

 *

 */

 */





#include <crypto/algapi.h>

#include <crypto/cbc.h>

#include <crypto/cbc.h>

#include <crypto/internal/skcipher.h>

#include <crypto/internal/skcipher.h>

#include <linux/err.h>

#include <linux/err.h>
@@ -108,8 +109,10 @@ static void crypto_cbc_free(struct skcipher_instance *inst) 
static int crypto_cbc_create(struct crypto_template *tmpl, struct rtattr **tb)

static int crypto_cbc_create(struct crypto_template *tmpl, struct rtattr **tb)

{

{

	struct skcipher_instance *inst;

	struct skcipher_instance *inst;

	struct crypto_attr_type *algt;

	struct crypto_spawn *spawn;

	struct crypto_spawn *spawn;

	struct crypto_alg *alg;

	struct crypto_alg *alg;

	u32 mask;

	int err;

	int err;





	err = crypto_check_attr_type(tb, CRYPTO_ALG_TYPE_SKCIPHER);

	err = crypto_check_attr_type(tb, CRYPTO_ALG_TYPE_SKCIPHER);
@@ -120,8 +123,16 @@ static int crypto_cbc_create(struct crypto_template *tmpl, struct rtattr **tb) 
	if (!inst)

	if (!inst)

		return -ENOMEM;

		return -ENOMEM;





	alg = crypto_get_attr_alg(tb, CRYPTO_ALG_TYPE_CIPHER,

	algt = crypto_get_attr_type(tb);

				  CRYPTO_ALG_TYPE_MASK);

	err = PTR_ERR(algt);

	if (IS_ERR(algt))

		goto err_free_inst;



	mask = CRYPTO_ALG_TYPE_MASK |

		crypto_requires_off(algt->type, algt->mask,

				    CRYPTO_ALG_NEED_FALLBACK);



	alg = crypto_get_attr_alg(tb, CRYPTO_ALG_TYPE_CIPHER, mask);

	err = PTR_ERR(alg);

	err = PTR_ERR(alg);

	if (IS_ERR(alg))

	if (IS_ERR(alg))

		goto err_free_inst;

		goto err_free_inst;