android/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

qcedev: assign pattern info correctly

Browse Source 
When non-pattern tests are run after pattern tests, there is
stale data from previous tests that never get erased, which
depending on crypto behavior might cause decrypt discrepancies.
Make the change to correctly set the pattern info to the
command descriptors.
Also, convert all debug logs to pr_info to avoid flooding serial
when QCE_DEBUG is enabled.

Tests: STS test cases(testPocCVE_2020_11267).

Change-Id: Iaff8bb3a4780a46c2c4ef4203f7ec120fa6daccb
Signed-off-by: Gaurav Kashyap<quic_gaurkash@quicinc.com>
Signed-off-by: Pranav Lavhate <quic_plavhate@quicinc.com>
This commit is contained in:
Gaurav Kashyap 2022-06-15 11:42:13 +05:30 committed by Pranav Lavhate
parent 7ea8480c23
commit 6ebe57bf32
2 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
drivers/crypto/msm/qce50.c
View File

@ -1119,8 +1119,7 @@ static int _ce_setup_cipher(struct qce_device *pce_dev, struct qce_req *creq,
if (is_offload_op(creq->offload_op)) {
/* pattern info */
pce = cmdlistinfo->pattern_info;
if (creq->is_pattern_valid)
pce->data = creq->pattern_info;
pce->data = creq->pattern_info;
/* block offset */
pce = cmdlistinfo->block_offset;
@ -1287,11 +1286,11 @@ static void _qce_dump_descr_fifos(struct qce_device *pce_dev, int req_info)
pce_sps_data = &pce_dev->ce_request_info[req_info].ce_sps;
iovec = pce_sps_data->in_transfer.iovec;
pr_err("==============================================\n");
pr_err("CONSUMER (TX/IN/DEST) PIPE DESCRIPTOR\n");
pr_err("==============================================\n");
pr_info("==============================================\n");
pr_info("CONSUMER (TX/IN/DEST) PIPE DESCRIPTOR\n");
pr_info("==============================================\n");
for (i = 0; i < pce_sps_data->in_transfer.iovec_count; i++) {
pr_err(" [%d] addr=0x%x size=0x%x flags=0x%x\n", i,
pr_info(" [%d] addr=0x%x size=0x%x flags=0x%x\n", i,
iovec->addr, iovec->size, iovec->flags);
if (iovec->flags & cmd_flags) {
struct sps_command_element *pced;
@ -1300,7 +1299,7 @@ static void _qce_dump_descr_fifos(struct qce_device *pce_dev, int req_info)
(GET_VIRT_ADDR(iovec->addr));
ents = iovec->size/(sizeof(struct sps_command_element));
for (j = 0; j < ents; j++) {
pr_err(" [%d] [0x%x] 0x%x\n", j,
pr_info(" [%d] [0x%x] 0x%x\n", j,
pced->addr, pced->data);
pced++;
}
@ -1308,9 +1307,9 @@ static void _qce_dump_descr_fifos(struct qce_device *pce_dev, int req_info)
iovec++;
}
pr_err("==============================================\n");
pr_err("PRODUCER (RX/OUT/SRC) PIPE DESCRIPTOR\n");
pr_err("==============================================\n");
pr_info("==============================================\n");
pr_info("PRODUCER (RX/OUT/SRC) PIPE DESCRIPTOR\n");
pr_info("==============================================\n");
iovec = pce_sps_data->out_transfer.iovec;
for (i = 0; i < pce_sps_data->out_transfer.iovec_count; i++) {
pr_info(" [%d] addr=0x%x size=0x%x flags=0x%x\n", i,

1
drivers/crypto/msm/qcedev.c
View File

@ -513,6 +513,7 @@ static int start_offload_cipher_req(struct qcedev_control *podev,
u8 patt_sz = 0, proc_data_sz = 0;
int ret = 0;
memset(&creq, 0, sizeof(creq));
/* Start the command on the podev->active_command */
qcedev_areq = podev->active_command;
qcedev_areq->cipher_req.cookie = qcedev_areq->handle;