crypto: ccp - Limit the amount of information exported

Orabug: 23331051

[ Upstream commit d1662165ae612ec8b5f94a6b07e65ea58b6dce34 ]

Since the exported information can be exposed to user-space, instead of
exporting the entire request context only export the minimum information
needed.

Cc: <stable@vger.kernel.org> # 3.14.x-
Signed-off-by: Tom Lendacky <thomas.lendacky@amd.com>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Signed-off-by: Sasha Levin <sasha.levin@oracle.com>
(cherry picked from commit 5badf7e00f0968d820bf7bba9081339bfca3489c)

Signed-off-by: Dan Duval <dan.duval@oracle.com>

diff --git a/drivers/crypto/ccp/ccp-crypto-aes-cmac.c b/drivers/crypto/ccp/ccp-crypto-aes-cmac.c
index 3b6fd1f11c9ad9853778f9b8b91fdbf531c0b404..2af9c0952048b036f0eed93fb443f3c5cc7090b4 100644 (file)
--- a/drivers/crypto/ccp/ccp-crypto-aes-cmac.c
+++ b/drivers/crypto/ccp/ccp-crypto-aes-cmac.c
@@ -205,9 +205,12 @@ 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_req_ctx *state = out;
+       struct ccp_aes_cmac_exp_ctx *state = out;
 
-       *state = *rctx;
+       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));
 
        return 0;
 }
@@ -215,9 +218,12 @@ 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_req_ctx *state = in;
+       const struct ccp_aes_cmac_exp_ctx *state = in;
 
-       *rctx = *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));
 
        return 0;
 }
@@ -360,7 +366,7 @@ int ccp_register_aes_cmac_algs(struct list_head *head)
 
        halg = &alg->halg;
        halg->digestsize = AES_BLOCK_SIZE;
-       halg->statesize = sizeof(struct ccp_aes_cmac_req_ctx);
+       halg->statesize = sizeof(struct ccp_aes_cmac_exp_ctx);
 
        base = &halg->base;
        snprintf(base->cra_name, CRYPTO_MAX_ALG_NAME, "cmac(aes)");

diff --git a/drivers/crypto/ccp/ccp-crypto-sha.c b/drivers/crypto/ccp/ccp-crypto-sha.c
index 1747fbec1838e2407b9439ac3dc58af0785da0d2..a68aa4c4a5e6194053fe9de842ff2f40384f903a 100644 (file)
--- a/drivers/crypto/ccp/ccp-crypto-sha.c
+++ b/drivers/crypto/ccp/ccp-crypto-sha.c
@@ -197,9 +197,14 @@ 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_req_ctx *state = out;
+       struct ccp_sha_exp_ctx *state = out;
 
-       *state = *rctx;
+       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));
 
        return 0;
 }
@@ -207,9 +212,14 @@ 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_req_ctx *state = in;
+       const struct ccp_sha_exp_ctx *state = in;
 
-       *rctx = *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;
 }
@@ -415,7 +425,7 @@ static int ccp_register_sha_alg(struct list_head *head,
 
        halg = &alg->halg;
        halg->digestsize = def->digest_size;
-       halg->statesize = sizeof(struct ccp_sha_req_ctx);
+       halg->statesize = sizeof(struct ccp_sha_exp_ctx);
 
        base = &halg->base;
        snprintf(base->cra_name, CRYPTO_MAX_ALG_NAME, "%s", def->name);

diff --git a/drivers/crypto/ccp/ccp-crypto.h b/drivers/crypto/ccp/ccp-crypto.h
index 76a96f0f44c6d7c659c57cfed3e93928683d9687..a326ec20bfa877c1a2dce78c5f15f3a5ec0731f4 100644 (file)
--- a/drivers/crypto/ccp/ccp-crypto.h
+++ b/drivers/crypto/ccp/ccp-crypto.h
@@ -129,6 +129,15 @@ struct ccp_aes_cmac_req_ctx {
        struct ccp_cmd cmd;
 };
 
+struct ccp_aes_cmac_exp_ctx {
+       unsigned int null_msg;
+
+       u8 iv[AES_BLOCK_SIZE];
+
+       unsigned int buf_count;
+       u8 buf[AES_BLOCK_SIZE];
+};
+
 /***** SHA related defines *****/
 #define MAX_SHA_CONTEXT_SIZE   SHA256_DIGEST_SIZE
 #define MAX_SHA_BLOCK_SIZE     SHA256_BLOCK_SIZE
@@ -171,6 +180,19 @@ struct ccp_sha_req_ctx {
        struct ccp_cmd cmd;
 };
 
+struct ccp_sha_exp_ctx {
+       enum ccp_sha_type type;
+
+       u64 msg_bits;
+
+       unsigned int first;
+
+       u8 ctx[MAX_SHA_CONTEXT_SIZE];
+
+       unsigned int buf_count;
+       u8 buf[MAX_SHA_BLOCK_SIZE];
+};
+
 /***** Common Context Structure *****/
 struct ccp_ctx {
        int (*complete)(struct crypto_async_request *req, int ret);