mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-10-29 23:53:32 +00:00
crypto: caam - ensure that we clean up after an error
Ensure that we clean up allocations and DMA mappings after encountering an error rather than just giving up and leaking memory and resources. Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk> Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
This commit is contained in:
Russell King
Herbert Xu
parent
343e44b15e
commit
32686d34f8
1 changed files with 79 additions and 53 deletions
|
|
@ -829,7 +829,7 @@ static int ahash_update_ctx(struct ahash_request *req)
|
|||
ret = ctx_map_to_sec4_sg(desc, jrdev, state, ctx->ctx_len,
|
||||
edesc->sec4_sg, DMA_BIDIRECTIONAL);
|
||||
if (ret)
|
||||
return ret;
|
||||
goto err;
|
||||
|
||||
state->buf_dma = try_buf_map_to_sec4_sg(jrdev,
|
||||
edesc->sec4_sg + 1,
|
||||
|
|
@ -860,7 +860,8 @@ static int ahash_update_ctx(struct ahash_request *req)
|
|||
DMA_TO_DEVICE);
|
||||
if (dma_mapping_error(jrdev, edesc->sec4_sg_dma)) {
|
||||
dev_err(jrdev, "unable to map S/G table\n");
|
||||
return -ENOMEM;
|
||||
ret = -ENOMEM;
|
||||
goto err;
|
||||
}
|
||||
|
||||
append_seq_in_ptr(desc, edesc->sec4_sg_dma, ctx->ctx_len +
|
||||
|
|
@ -875,13 +876,10 @@ static int ahash_update_ctx(struct ahash_request *req)
|
|||
#endif
|
||||
|
||||
ret = caam_jr_enqueue(jrdev, desc, ahash_done_bi, req);
|
||||
if (!ret) {
|
||||
if (ret)
|
||||
goto err;
|
||||
|
||||
ret = -EINPROGRESS;
|
||||
} else {
|
||||
ahash_unmap_ctx(jrdev, edesc, req, ctx->ctx_len,
|
||||
DMA_BIDIRECTIONAL);
|
||||
kfree(edesc);
|
||||
}
|
||||
} else if (*next_buflen) {
|
||||
scatterwalk_map_and_copy(buf + *buflen, req->src, 0,
|
||||
req->nbytes, 0);
|
||||
|
|
@ -897,6 +895,11 @@ static int ahash_update_ctx(struct ahash_request *req)
|
|||
#endif
|
||||
|
||||
return ret;
|
||||
|
||||
err:
|
||||
ahash_unmap_ctx(jrdev, edesc, req, ctx->ctx_len, DMA_BIDIRECTIONAL);
|
||||
kfree(edesc);
|
||||
return ret;
|
||||
}
|
||||
|
||||
static int ahash_final_ctx(struct ahash_request *req)
|
||||
|
|
@ -939,7 +942,7 @@ static int ahash_final_ctx(struct ahash_request *req)
|
|||
ret = ctx_map_to_sec4_sg(desc, jrdev, state, ctx->ctx_len,
|
||||
edesc->sec4_sg, DMA_TO_DEVICE);
|
||||
if (ret)
|
||||
return ret;
|
||||
goto err;
|
||||
|
||||
state->buf_dma = try_buf_map_to_sec4_sg(jrdev, edesc->sec4_sg + 1,
|
||||
buf, state->buf_dma, buflen,
|
||||
|
|
@ -951,7 +954,8 @@ static int ahash_final_ctx(struct ahash_request *req)
|
|||
sec4_sg_bytes, DMA_TO_DEVICE);
|
||||
if (dma_mapping_error(jrdev, edesc->sec4_sg_dma)) {
|
||||
dev_err(jrdev, "unable to map S/G table\n");
|
||||
return -ENOMEM;
|
||||
ret = -ENOMEM;
|
||||
goto err;
|
||||
}
|
||||
|
||||
append_seq_in_ptr(desc, edesc->sec4_sg_dma, ctx->ctx_len + buflen,
|
||||
|
|
@ -961,7 +965,8 @@ static int ahash_final_ctx(struct ahash_request *req)
|
|||
digestsize);
|
||||
if (dma_mapping_error(jrdev, edesc->dst_dma)) {
|
||||
dev_err(jrdev, "unable to map dst\n");
|
||||
return -ENOMEM;
|
||||
ret = -ENOMEM;
|
||||
goto err;
|
||||
}
|
||||
|
||||
#ifdef DEBUG
|
||||
|
|
@ -970,13 +975,14 @@ static int ahash_final_ctx(struct ahash_request *req)
|
|||
#endif
|
||||
|
||||
ret = caam_jr_enqueue(jrdev, desc, ahash_done_ctx_src, req);
|
||||
if (!ret) {
|
||||
ret = -EINPROGRESS;
|
||||
} else {
|
||||
if (ret)
|
||||
goto err;
|
||||
|
||||
return -EINPROGRESS;
|
||||
|
||||
err:
|
||||
ahash_unmap_ctx(jrdev, edesc, req, digestsize, DMA_FROM_DEVICE);
|
||||
kfree(edesc);
|
||||
}
|
||||
|
||||
return ret;
|
||||
}
|
||||
|
||||
|
|
@ -1027,7 +1033,7 @@ static int ahash_finup_ctx(struct ahash_request *req)
|
|||
ret = ctx_map_to_sec4_sg(desc, jrdev, state, ctx->ctx_len,
|
||||
edesc->sec4_sg, DMA_TO_DEVICE);
|
||||
if (ret)
|
||||
return ret;
|
||||
goto err;
|
||||
|
||||
state->buf_dma = try_buf_map_to_sec4_sg(jrdev, edesc->sec4_sg + 1,
|
||||
buf, state->buf_dma, buflen,
|
||||
|
|
@ -1040,7 +1046,8 @@ static int ahash_finup_ctx(struct ahash_request *req)
|
|||
sec4_sg_bytes, DMA_TO_DEVICE);
|
||||
if (dma_mapping_error(jrdev, edesc->sec4_sg_dma)) {
|
||||
dev_err(jrdev, "unable to map S/G table\n");
|
||||
return -ENOMEM;
|
||||
ret = -ENOMEM;
|
||||
goto err;
|
||||
}
|
||||
|
||||
append_seq_in_ptr(desc, edesc->sec4_sg_dma, ctx->ctx_len +
|
||||
|
|
@ -1050,7 +1057,8 @@ static int ahash_finup_ctx(struct ahash_request *req)
|
|||
digestsize);
|
||||
if (dma_mapping_error(jrdev, edesc->dst_dma)) {
|
||||
dev_err(jrdev, "unable to map dst\n");
|
||||
return -ENOMEM;
|
||||
ret = -ENOMEM;
|
||||
goto err;
|
||||
}
|
||||
|
||||
#ifdef DEBUG
|
||||
|
|
@ -1059,13 +1067,14 @@ static int ahash_finup_ctx(struct ahash_request *req)
|
|||
#endif
|
||||
|
||||
ret = caam_jr_enqueue(jrdev, desc, ahash_done_ctx_src, req);
|
||||
if (!ret) {
|
||||
ret = -EINPROGRESS;
|
||||
} else {
|
||||
if (ret)
|
||||
goto err;
|
||||
|
||||
return -EINPROGRESS;
|
||||
|
||||
err:
|
||||
ahash_unmap_ctx(jrdev, edesc, req, digestsize, DMA_FROM_DEVICE);
|
||||
kfree(edesc);
|
||||
}
|
||||
|
||||
return ret;
|
||||
}
|
||||
|
||||
|
|
@ -1117,6 +1126,8 @@ static int ahash_digest(struct ahash_request *req)
|
|||
sec4_sg_bytes, DMA_TO_DEVICE);
|
||||
if (dma_mapping_error(jrdev, edesc->sec4_sg_dma)) {
|
||||
dev_err(jrdev, "unable to map S/G table\n");
|
||||
ahash_unmap(jrdev, edesc, req, digestsize);
|
||||
kfree(edesc);
|
||||
return -ENOMEM;
|
||||
}
|
||||
src_dma = edesc->sec4_sg_dma;
|
||||
|
|
@ -1131,6 +1142,8 @@ static int ahash_digest(struct ahash_request *req)
|
|||
digestsize);
|
||||
if (dma_mapping_error(jrdev, edesc->dst_dma)) {
|
||||
dev_err(jrdev, "unable to map dst\n");
|
||||
ahash_unmap(jrdev, edesc, req, digestsize);
|
||||
kfree(edesc);
|
||||
return -ENOMEM;
|
||||
}
|
||||
|
||||
|
|
@ -1183,6 +1196,8 @@ static int ahash_final_no_ctx(struct ahash_request *req)
|
|||
state->buf_dma = dma_map_single(jrdev, buf, buflen, DMA_TO_DEVICE);
|
||||
if (dma_mapping_error(jrdev, state->buf_dma)) {
|
||||
dev_err(jrdev, "unable to map src\n");
|
||||
ahash_unmap(jrdev, edesc, req, digestsize);
|
||||
kfree(edesc);
|
||||
return -ENOMEM;
|
||||
}
|
||||
|
||||
|
|
@ -1192,6 +1207,8 @@ static int ahash_final_no_ctx(struct ahash_request *req)
|
|||
digestsize);
|
||||
if (dma_mapping_error(jrdev, edesc->dst_dma)) {
|
||||
dev_err(jrdev, "unable to map dst\n");
|
||||
ahash_unmap(jrdev, edesc, req, digestsize);
|
||||
kfree(edesc);
|
||||
return -ENOMEM;
|
||||
}
|
||||
edesc->src_nents = 0;
|
||||
|
|
@ -1285,14 +1302,15 @@ static int ahash_update_no_ctx(struct ahash_request *req)
|
|||
DMA_TO_DEVICE);
|
||||
if (dma_mapping_error(jrdev, edesc->sec4_sg_dma)) {
|
||||
dev_err(jrdev, "unable to map S/G table\n");
|
||||
return -ENOMEM;
|
||||
ret = -ENOMEM;
|
||||
goto err;
|
||||
}
|
||||
|
||||
append_seq_in_ptr(desc, edesc->sec4_sg_dma, to_hash, LDST_SGF);
|
||||
|
||||
ret = map_seq_out_ptr_ctx(desc, jrdev, state, ctx->ctx_len);
|
||||
if (ret)
|
||||
return ret;
|
||||
goto err;
|
||||
|
||||
#ifdef DEBUG
|
||||
print_hex_dump(KERN_ERR, "jobdesc@"__stringify(__LINE__)": ",
|
||||
|
|
@ -1301,16 +1319,13 @@ static int ahash_update_no_ctx(struct ahash_request *req)
|
|||
#endif
|
||||
|
||||
ret = caam_jr_enqueue(jrdev, desc, ahash_done_ctx_dst, req);
|
||||
if (!ret) {
|
||||
if (ret)
|
||||
goto err;
|
||||
|
||||
ret = -EINPROGRESS;
|
||||
state->update = ahash_update_ctx;
|
||||
state->finup = ahash_finup_ctx;
|
||||
state->final = ahash_final_ctx;
|
||||
} else {
|
||||
ahash_unmap_ctx(jrdev, edesc, req, ctx->ctx_len,
|
||||
DMA_TO_DEVICE);
|
||||
kfree(edesc);
|
||||
}
|
||||
} else if (*next_buflen) {
|
||||
scatterwalk_map_and_copy(buf + *buflen, req->src, 0,
|
||||
req->nbytes, 0);
|
||||
|
|
@ -1326,6 +1341,11 @@ static int ahash_update_no_ctx(struct ahash_request *req)
|
|||
#endif
|
||||
|
||||
return ret;
|
||||
|
||||
err:
|
||||
ahash_unmap_ctx(jrdev, edesc, req, ctx->ctx_len, DMA_TO_DEVICE);
|
||||
kfree(edesc);
|
||||
return ret;
|
||||
}
|
||||
|
||||
/* submit ahash finup if it the first job descriptor after update */
|
||||
|
|
@ -1382,6 +1402,8 @@ static int ahash_finup_no_ctx(struct ahash_request *req)
|
|||
sec4_sg_bytes, DMA_TO_DEVICE);
|
||||
if (dma_mapping_error(jrdev, edesc->sec4_sg_dma)) {
|
||||
dev_err(jrdev, "unable to map S/G table\n");
|
||||
ahash_unmap(jrdev, edesc, req, digestsize);
|
||||
kfree(edesc);
|
||||
return -ENOMEM;
|
||||
}
|
||||
|
||||
|
|
@ -1392,6 +1414,8 @@ static int ahash_finup_no_ctx(struct ahash_request *req)
|
|||
digestsize);
|
||||
if (dma_mapping_error(jrdev, edesc->dst_dma)) {
|
||||
dev_err(jrdev, "unable to map dst\n");
|
||||
ahash_unmap(jrdev, edesc, req, digestsize);
|
||||
kfree(edesc);
|
||||
return -ENOMEM;
|
||||
}
|
||||
|
||||
|
|
@ -1476,7 +1500,8 @@ static int ahash_update_first(struct ahash_request *req)
|
|||
DMA_TO_DEVICE);
|
||||
if (dma_mapping_error(jrdev, edesc->sec4_sg_dma)) {
|
||||
dev_err(jrdev, "unable to map S/G table\n");
|
||||
return -ENOMEM;
|
||||
ret = -ENOMEM;
|
||||
goto err;
|
||||
}
|
||||
src_dma = edesc->sec4_sg_dma;
|
||||
options = LDST_SGF;
|
||||
|
|
@ -1498,7 +1523,7 @@ static int ahash_update_first(struct ahash_request *req)
|
|||
|
||||
ret = map_seq_out_ptr_ctx(desc, jrdev, state, ctx->ctx_len);
|
||||
if (ret)
|
||||
return ret;
|
||||
goto err;
|
||||
|
||||
#ifdef DEBUG
|
||||
print_hex_dump(KERN_ERR, "jobdesc@"__stringify(__LINE__)": ",
|
||||
|
|
@ -1506,18 +1531,14 @@ static int ahash_update_first(struct ahash_request *req)
|
|||
desc_bytes(desc), 1);
|
||||
#endif
|
||||
|
||||
ret = caam_jr_enqueue(jrdev, desc, ahash_done_ctx_dst,
|
||||
req);
|
||||
if (!ret) {
|
||||
ret = caam_jr_enqueue(jrdev, desc, ahash_done_ctx_dst, req);
|
||||
if (ret)
|
||||
goto err;
|
||||
|
||||
ret = -EINPROGRESS;
|
||||
state->update = ahash_update_ctx;
|
||||
state->finup = ahash_finup_ctx;
|
||||
state->final = ahash_final_ctx;
|
||||
} else {
|
||||
ahash_unmap_ctx(jrdev, edesc, req, ctx->ctx_len,
|
||||
DMA_TO_DEVICE);
|
||||
kfree(edesc);
|
||||
}
|
||||
} else if (*next_buflen) {
|
||||
state->update = ahash_update_no_ctx;
|
||||
state->finup = ahash_finup_no_ctx;
|
||||
|
|
@ -1532,6 +1553,11 @@ static int ahash_update_first(struct ahash_request *req)
|
|||
#endif
|
||||
|
||||
return ret;
|
||||
|
||||
err:
|
||||
ahash_unmap_ctx(jrdev, edesc, req, ctx->ctx_len, DMA_TO_DEVICE);
|
||||
kfree(edesc);
|
||||
return ret;
|
||||
}
|
||||
|
||||
static int ahash_finup_first(struct ahash_request *req)
|
||||
|
|
|
|||
Loading…
Reference in a new issue