Commit b31dde2a authored by Tom Lendacky's avatar Tom Lendacky Committed by Herbert Xu
Browse files

crypto: ccp - Don't assume export/import areas are aligned 



Use a local variable for the exported and imported state so that
alignment is not an issue. On export, set a local variable from the
request context and then memcpy the contents of the local variable to
the export memory area. On import, memcpy the import memory area into
a local variable and then use the local variable to set the request
context.

Cc: <stable@vger.kernel.org> # 3.14.x-
Signed-off-by: default avatarTom Lendacky <thomas.lendacky@amd.com>
Signed-off-by: default avatarHerbert Xu <herbert@gondor.apana.org.au>
parent fd09967b

drivers/crypto/ccp/ccp-crypto-aes-cmac.c

+16 −10
Original line number Diff line number Diff line
@@ -223,12 +223,15 @@ static int ccp_aes_cmac_digest(struct ahash_request *req) 
static int ccp_aes_cmac_export(struct ahash_request *req, void *out)

{

	struct ccp_aes_cmac_req_ctx *rctx = ahash_request_ctx(req);

	struct ccp_aes_cmac_exp_ctx *state = out;

	struct ccp_aes_cmac_exp_ctx state;



	state->null_msg = rctx->null_msg;

	memcpy(state->iv, rctx->iv, sizeof(state->iv));

	state->buf_count = rctx->buf_count;

	memcpy(state->buf, rctx->buf, sizeof(state->buf));

	state.null_msg = rctx->null_msg;

	memcpy(state.iv, rctx->iv, sizeof(state.iv));

	state.buf_count = rctx->buf_count;

	memcpy(state.buf, rctx->buf, sizeof(state.buf));



	/* 'out' may not be aligned so memcpy from local variable */

	memcpy(out, &state, sizeof(state));



	return 0;

}
@@ -236,12 +239,15 @@ static int ccp_aes_cmac_export(struct ahash_request *req, void *out) 
static int ccp_aes_cmac_import(struct ahash_request *req, const void *in)

{

	struct ccp_aes_cmac_req_ctx *rctx = ahash_request_ctx(req);

	const struct ccp_aes_cmac_exp_ctx *state = in;

	struct ccp_aes_cmac_exp_ctx state;



	/* 'in' may not be aligned so memcpy to local variable */

	memcpy(&state, in, sizeof(state));



	rctx->null_msg = state->null_msg;

	memcpy(rctx->iv, state->iv, sizeof(rctx->iv));

	rctx->buf_count = state->buf_count;

	memcpy(rctx->buf, state->buf, sizeof(rctx->buf));

	rctx->null_msg = state.null_msg;

	memcpy(rctx->iv, state.iv, sizeof(rctx->iv));

	rctx->buf_count = state.buf_count;

	memcpy(rctx->buf, state.buf, sizeof(rctx->buf));



	return 0;

}

drivers/crypto/ccp/ccp-crypto-sha.c

+21 −15
Original line number Diff line number Diff line
@@ -210,14 +210,17 @@ static int ccp_sha_digest(struct ahash_request *req) 
static int ccp_sha_export(struct ahash_request *req, void *out)

{

	struct ccp_sha_req_ctx *rctx = ahash_request_ctx(req);

	struct ccp_sha_exp_ctx *state = out;

	struct ccp_sha_exp_ctx state;



	state->type = rctx->type;

	state->msg_bits = rctx->msg_bits;

	state->first = rctx->first;

	memcpy(state->ctx, rctx->ctx, sizeof(state->ctx));

	state->buf_count = rctx->buf_count;

	memcpy(state->buf, rctx->buf, sizeof(state->buf));

	state.type = rctx->type;

	state.msg_bits = rctx->msg_bits;

	state.first = rctx->first;

	memcpy(state.ctx, rctx->ctx, sizeof(state.ctx));

	state.buf_count = rctx->buf_count;

	memcpy(state.buf, rctx->buf, sizeof(state.buf));



	/* 'out' may not be aligned so memcpy from local variable */

	memcpy(out, &state, sizeof(state));



	return 0;

}
@@ -225,14 +228,17 @@ static int ccp_sha_export(struct ahash_request *req, void *out) 
static int ccp_sha_import(struct ahash_request *req, const void *in)

{

	struct ccp_sha_req_ctx *rctx = ahash_request_ctx(req);

	const struct ccp_sha_exp_ctx *state = in;



	rctx->type = state->type;

	rctx->msg_bits = state->msg_bits;

	rctx->first = state->first;

	memcpy(rctx->ctx, state->ctx, sizeof(rctx->ctx));

	rctx->buf_count = state->buf_count;

	memcpy(rctx->buf, state->buf, sizeof(rctx->buf));

	struct ccp_sha_exp_ctx state;



	/* 'in' may not be aligned so memcpy to local variable */

	memcpy(&state, in, sizeof(state));



	rctx->type = state.type;

	rctx->msg_bits = state.msg_bits;

	rctx->first = state.first;

	memcpy(rctx->ctx, state.ctx, sizeof(rctx->ctx));

	rctx->buf_count = state.buf_count;

	memcpy(rctx->buf, state.buf, sizeof(rctx->buf));



	return 0;

}

CRA Git | Maintained and supported by SUSTech CRA and CCSE