Commit 3900078d authored by Tom Lendacky's avatar Tom Lendacky Committed by Ben Hutchings

crypto: ccp - memset request context to zero during import

commit ce0ae266 upstream.

Since a crypto_ahash_import() can be called against a request context
that has not had a crypto_ahash_init() performed, the request context
needs to be cleared to insure there is no random data present. If not,
the random data can result in a kernel oops during crypto_ahash_update().
Signed-off-by: default avatarTom Lendacky <thomas.lendacky@amd.com>
Signed-off-by: default avatarHerbert Xu <herbert@gondor.apana.org.au>
Signed-off-by: default avatarBen Hutchings <ben@decadent.org.uk>
parent 24a748be
...@@ -225,6 +225,7 @@ static int ccp_aes_cmac_import(struct ahash_request *req, const void *in) ...@@ -225,6 +225,7 @@ static int ccp_aes_cmac_import(struct ahash_request *req, const void *in)
/* 'in' may not be aligned so memcpy to local variable */ /* 'in' may not be aligned so memcpy to local variable */
memcpy(&state, in, sizeof(state)); memcpy(&state, in, sizeof(state));
memset(rctx, 0, sizeof(*rctx));
rctx->null_msg = state.null_msg; rctx->null_msg = state.null_msg;
memcpy(rctx->iv, state.iv, sizeof(rctx->iv)); memcpy(rctx->iv, state.iv, sizeof(rctx->iv));
rctx->buf_count = state.buf_count; rctx->buf_count = state.buf_count;
......
...@@ -219,6 +219,7 @@ static int ccp_sha_import(struct ahash_request *req, const void *in) ...@@ -219,6 +219,7 @@ static int ccp_sha_import(struct ahash_request *req, const void *in)
/* 'in' may not be aligned so memcpy to local variable */ /* 'in' may not be aligned so memcpy to local variable */
memcpy(&state, in, sizeof(state)); memcpy(&state, in, sizeof(state));
memset(rctx, 0, sizeof(*rctx));
rctx->type = state.type; rctx->type = state.type;
rctx->msg_bits = state.msg_bits; rctx->msg_bits = state.msg_bits;
rctx->first = state.first; rctx->first = state.first;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment