asgardius/android_kernel_motorola_sm6225
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

crypto: ccp - Set the AES size field for all modes

Browse source 
Ensure that the size field is correctly populated for
all AES modes.

Signed-off-by: Gary R Hook <gary.hook@amd.com>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
This commit is contained in:
Gary R Hook 2017-02-08 13:07:06 -06:00 committed by Herbert Xu
parent 9d12ba86f8
commit f7cc02b3c3
3 changed files with 10 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
drivers/crypto/ccp/ccp-dev-v5.c
View file

@ -284,8 +284,7 @@ static int ccp5_perform_aes(struct ccp_op *op)
CCP_AES_ENCRYPT(&function) = op->u.aes.action; CCP_AES_ENCRYPT(&function) = op->u.aes.action;
CCP_AES_MODE(&function) = op->u.aes.mode; CCP_AES_MODE(&function) = op->u.aes.mode;
CCP_AES_TYPE(&function) = op->u.aes.type; CCP_AES_TYPE(&function) = op->u.aes.type;
if (op->u.aes.mode == CCP_AES_MODE_CFB) CCP_AES_SIZE(&function) = op->u.aes.size;
CCP_AES_SIZE(&function) = 0x7f;
CCP5_CMD_FUNCTION(&desc) = function.raw; CCP5_CMD_FUNCTION(&desc) = function.raw;

1
drivers/crypto/ccp/ccp-dev.h
View file

@ -467,6 +467,7 @@ struct ccp_aes_op {
enum ccp_aes_type type; enum ccp_aes_type type;
enum ccp_aes_mode mode; enum ccp_aes_mode mode;
enum ccp_aes_action action; enum ccp_aes_action action;
unsigned int size;
}; };
struct ccp_xts_aes_op { struct ccp_xts_aes_op {

8
drivers/crypto/ccp/ccp-ops.c
View file

@ -692,6 +692,14 @@ static int ccp_run_aes_cmd(struct ccp_cmd_queue *cmd_q, struct ccp_cmd *cmd)
goto e_ctx; goto e_ctx;
} }
} }
switch (aes->mode) {
case CCP_AES_MODE_CFB: /* CFB128 only */
case CCP_AES_MODE_CTR:
op.u.aes.size = AES_BLOCK_SIZE * BITS_PER_BYTE - 1;
break;
default:
op.u.aes.size = 0;
}
/* Prepare the input and output data workareas. For in-place /* Prepare the input and output data workareas. For in-place
* operations we need to set the dma direction to BIDIRECTIONAL * operations we need to set the dma direction to BIDIRECTIONAL