From: Horia Geanta Date: Thu, 2 Aug 2012 14:16:37 +0000 (+0300) Subject: crypto: talitos - fix icv management on outbound direction X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=60542505b0bccbc5e2e518c9dd6bee9a30546061;p=GitHub%2FLineageOS%2Fandroid_kernel_motorola_exynos9610.git crypto: talitos - fix icv management on outbound direction For IPsec encryption, in the case when: -the input buffer is fragmented (edesc->src_nents > 0) -the output buffer is not fragmented (edesc->dst_nents = 0) the ICV is not output in the link table, but after the encrypted payload. Copying the ICV must be avoided in this case; consequently the condition edesc->dma_len > 0 must be more specific, i.e. must depend on the type of the output buffer - fragmented or not. Testing was performed by modifying testmgr to support src != dst, since currently native kernel IPsec does in-place encryption (src == dst). Signed-off-by: Horia Geanta Signed-off-by: Herbert Xu --- diff --git a/drivers/crypto/talitos.c b/drivers/crypto/talitos.c index b299f0902827..8653f601b95f 100644 --- a/drivers/crypto/talitos.c +++ b/drivers/crypto/talitos.c @@ -825,7 +825,7 @@ static void ipsec_esp_encrypt_done(struct device *dev, ipsec_esp_unmap(dev, edesc, areq); /* copy the generated ICV to dst */ - if (edesc->dma_len) { + if (edesc->dst_nents) { icvdata = &edesc->link_tbl[edesc->src_nents + edesc->dst_nents + 2]; sg = sg_last(areq->dst, edesc->dst_nents);