random-mirrors/smaeul-u-boot
1
0
Fork 0
mirror of https://github.com/smaeul/u-boot.git synced 2025-10-14 04:46:01 +01:00
Code Issues Packages Projects Releases Wiki Activity

crypto/fsl: fsl_hash: Fix crash in flush dcache

Browse Source 
wrong end address passed to flush_dcache_range.
modified the flush_dache logic for scatter list elements.

Fixes: 1919f58a8f (crypto/fsl: fsl_hash: Fix dcache issue in caam_hash_finish)
Signed-off-by: Gaurav Jain <gaurav.jain@nxp.com>
This commit is contained in:
Gaurav Jain 2022-07-29 15:32:23 +05:30 committed by Stefano Babic
parent a8e518b80a
commit 4146078688
1 changed files with 16 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
drivers/crypto/fsl/fsl_hash.c
View File

@ -131,25 +131,35 @@ static int caam_hash_update(void *hash_ctx, const void *buf,
static int caam_hash_finish(void *hash_ctx, void *dest_buf, static int caam_hash_finish(void *hash_ctx, void *dest_buf,
int size, enum caam_hash_algos caam_algo) int size, enum caam_hash_algos caam_algo)
{ {
uint32_t len = 0; uint32_t len = 0, sg_entry_len;
struct sha_ctx *ctx = hash_ctx; struct sha_ctx *ctx = hash_ctx;
int i = 0, ret = 0; int i = 0, ret = 0;
caam_dma_addr_t addr;
if (size < driver_hash[caam_algo].digestsize) { if (size < driver_hash[caam_algo].digestsize) {
return -EINVAL; return -EINVAL;
} }
for (i = 0; i < ctx->sg_num; i++) flush_dcache_range((ulong)ctx->sg_tbl,
len += (sec_in32(&ctx->sg_tbl[i].len_flag) & (ulong)(ctx->sg_tbl) + (ctx->sg_num * sizeof(struct sg_entry)));
SG_ENTRY_LENGTH_MASK); for (i = 0; i < ctx->sg_num; i++) {
sg_entry_len = (sec_in32(&ctx->sg_tbl[i].len_flag) &
SG_ENTRY_LENGTH_MASK);
len += sg_entry_len;
#ifdef CONFIG_CAAM_64BIT
addr = sec_in32(&ctx->sg_tbl[i].addr_hi);
addr = (addr << 32) | sec_in32(&ctx->sg_tbl[i].addr_lo);
#else
addr = sec_in32(&ctx->sg_tbl[i].addr_lo);
#endif
flush_dcache_range(addr, addr + sg_entry_len);
}
inline_cnstr_jobdesc_hash(ctx->sha_desc, (uint8_t *)ctx->sg_tbl, len, inline_cnstr_jobdesc_hash(ctx->sha_desc, (uint8_t *)ctx->sg_tbl, len,
ctx->hash, ctx->hash,
driver_hash[caam_algo].alg_type, driver_hash[caam_algo].alg_type,
driver_hash[caam_algo].digestsize, driver_hash[caam_algo].digestsize,
1); 1);
flush_dcache_range((ulong)ctx->sg_tbl, (ulong)(ctx->sg_tbl) + len);
flush_dcache_range((ulong)ctx->sha_desc, flush_dcache_range((ulong)ctx->sha_desc,
(ulong)(ctx->sha_desc) + (sizeof(uint32_t) * MAX_CAAM_DESCSIZE)); (ulong)(ctx->sha_desc) + (sizeof(uint32_t) * MAX_CAAM_DESCSIZE));
flush_dcache_range((ulong)ctx->hash, flush_dcache_range((ulong)ctx->hash,