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

Commit 9b17e5ad authored by Corentin LABBE's avatar Corentin LABBE Committed by Herbert Xu
Browse files

crypto: sun4i-ss - Always use sun4i_tfm_ctx for storing pointer to dev ss 



The dev *ss is stored both in sun4i_tfm_ctx and sun4i_req_ctx.
Since this pointer will never be changed during tfm life, it is better
to remove it from sun4i_req_ctx.

Signed-off-by: default avatarLABBE Corentin <clabbe.montjoie@gmail.com>
Signed-off-by: default avatarHerbert Xu <herbert@gondor.apana.org.au>
parent 933e7e3a

drivers/crypto/sunxi-ss/sun4i-ss-hash.c

+11 −2
Original line number Diff line number Diff line
@@ -20,6 +20,15 @@ 


int sun4i_hash_crainit(struct crypto_tfm *tfm)

{

	struct sun4i_tfm_ctx *op = crypto_tfm_ctx(tfm);

	struct ahash_alg *alg = __crypto_ahash_alg(tfm->__crt_alg);

	struct sun4i_ss_alg_template *algt;



	memset(op, 0, sizeof(struct sun4i_tfm_ctx));



	algt = container_of(alg, struct sun4i_ss_alg_template, alg.hash);

	op->ss = algt->ss;



	crypto_ahash_set_reqsize(__crypto_ahash_cast(tfm),

				 sizeof(struct sun4i_req_ctx));

	return 0;
@@ -36,7 +45,6 @@ int sun4i_hash_init(struct ahash_request *areq) 
	memset(op, 0, sizeof(struct sun4i_req_ctx));



	algt = container_of(alg, struct sun4i_ss_alg_template, alg.hash);

	op->ss = algt->ss;

	op->mode = algt->mode;



	return 0;
@@ -168,8 +176,9 @@ int sun4i_hash(struct ahash_request *areq) 
	 */



	struct sun4i_req_ctx *op = ahash_request_ctx(areq);

	struct sun4i_ss_ctx *ss = op->ss;

	struct crypto_ahash *tfm = crypto_ahash_reqtfm(areq);

	struct sun4i_tfm_ctx *tfmctx = crypto_ahash_ctx(tfm);

	struct sun4i_ss_ctx *ss = tfmctx->ss;

	unsigned int in_i = 0; /* advancement in the current SG */

	unsigned int end;

	/*

drivers/crypto/sunxi-ss/sun4i-ss.h

+0 −1
Original line number Diff line number Diff line
@@ -163,7 +163,6 @@ struct sun4i_req_ctx { 
	u32 hash[5]; /* for storing SS_IVx register */

	char buf[64];

	unsigned int len;

	struct sun4i_ss_ctx *ss;

	int flags;

};