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

Commit c8cff87d authored by Gilad Ben-Yossef's avatar Gilad Ben-Yossef Committed by Greg Kroah-Hartman
Browse files

crypto: ccree - zero out internal struct before use 



[ Upstream commit 9f31eb6e08cc1b0eb3926eebf4c51467479a7722 ]

We did not zero out the internal struct before use causing problem
in some rare error code paths.

Signed-off-by: default avatarGilad Ben-Yossef <gilad@benyossef.com>
Signed-off-by: default avatarHerbert Xu <herbert@gondor.apana.org.au>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent c08805aa

drivers/crypto/ccree/cc_aead.c

+16 −0
Original line number Diff line number Diff line
@@ -2058,6 +2058,8 @@ static int cc_aead_encrypt(struct aead_request *req) 
	struct aead_req_ctx *areq_ctx = aead_request_ctx(req);

	int rc;



	memset(areq_ctx, 0, sizeof(*areq_ctx));



	/* No generated IV required */

	areq_ctx->backup_iv = req->iv;

	areq_ctx->backup_giv = NULL;
@@ -2087,6 +2089,8 @@ static int cc_rfc4309_ccm_encrypt(struct aead_request *req) 
		goto out;

	}



	memset(areq_ctx, 0, sizeof(*areq_ctx));



	/* No generated IV required */

	areq_ctx->backup_iv = req->iv;

	areq_ctx->backup_giv = NULL;
@@ -2106,6 +2110,8 @@ static int cc_aead_decrypt(struct aead_request *req) 
	struct aead_req_ctx *areq_ctx = aead_request_ctx(req);

	int rc;



	memset(areq_ctx, 0, sizeof(*areq_ctx));



	/* No generated IV required */

	areq_ctx->backup_iv = req->iv;

	areq_ctx->backup_giv = NULL;
@@ -2133,6 +2139,8 @@ static int cc_rfc4309_ccm_decrypt(struct aead_request *req) 
		goto out;

	}



	memset(areq_ctx, 0, sizeof(*areq_ctx));



	/* No generated IV required */

	areq_ctx->backup_iv = req->iv;

	areq_ctx->backup_giv = NULL;
@@ -2250,6 +2258,8 @@ static int cc_rfc4106_gcm_encrypt(struct aead_request *req) 
		goto out;

	}



	memset(areq_ctx, 0, sizeof(*areq_ctx));



	/* No generated IV required */

	areq_ctx->backup_iv = req->iv;

	areq_ctx->backup_giv = NULL;
@@ -2273,6 +2283,8 @@ static int cc_rfc4543_gcm_encrypt(struct aead_request *req) 
	struct aead_req_ctx *areq_ctx = aead_request_ctx(req);

	int rc;



	memset(areq_ctx, 0, sizeof(*areq_ctx));



	//plaintext is not encryped with rfc4543

	areq_ctx->plaintext_authenticate_only = true;
@@ -2305,6 +2317,8 @@ static int cc_rfc4106_gcm_decrypt(struct aead_request *req) 
		goto out;

	}



	memset(areq_ctx, 0, sizeof(*areq_ctx));



	/* No generated IV required */

	areq_ctx->backup_iv = req->iv;

	areq_ctx->backup_giv = NULL;
@@ -2328,6 +2342,8 @@ static int cc_rfc4543_gcm_decrypt(struct aead_request *req) 
	struct aead_req_ctx *areq_ctx = aead_request_ctx(req);

	int rc;



	memset(areq_ctx, 0, sizeof(*areq_ctx));



	//plaintext is not decryped with rfc4543

	areq_ctx->plaintext_authenticate_only = true;