mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-25 20:05:39 +00:00
crypto: safexcel - Add error handling for dma_map_sg() calls
[ Upstream commit87e02063d0
] Macro dma_map_sg() may return 0 on error. This patch enables checks in case of the macro failure and ensures unmapping of previously mapped buffers with dma_unmap_sg(). Found by Linux Verification Center (linuxtesting.org) with static analysis tool SVACE. Fixes:49186a7d9e
("crypto: inside_secure - Avoid dma map if size is zero") Signed-off-by: Nikita Zhandarovich <n.zhandarovich@fintech.ru> Reviewed-by: Antoine Tenart <atenart@kernel.org> Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au> Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
parent
d5d4dfc73b
commit
4c0ac81a17
1 changed files with 11 additions and 8 deletions
|
@ -742,9 +742,9 @@ static int safexcel_send_req(struct crypto_async_request *base, int ring,
|
|||
max(totlen_src, totlen_dst));
|
||||
return -EINVAL;
|
||||
}
|
||||
if (sreq->nr_src > 0)
|
||||
dma_map_sg(priv->dev, src, sreq->nr_src,
|
||||
DMA_BIDIRECTIONAL);
|
||||
if (sreq->nr_src > 0 &&
|
||||
!dma_map_sg(priv->dev, src, sreq->nr_src, DMA_BIDIRECTIONAL))
|
||||
return -EIO;
|
||||
} else {
|
||||
if (unlikely(totlen_src && (sreq->nr_src <= 0))) {
|
||||
dev_err(priv->dev, "Source buffer not large enough (need %d bytes)!",
|
||||
|
@ -752,8 +752,9 @@ static int safexcel_send_req(struct crypto_async_request *base, int ring,
|
|||
return -EINVAL;
|
||||
}
|
||||
|
||||
if (sreq->nr_src > 0)
|
||||
dma_map_sg(priv->dev, src, sreq->nr_src, DMA_TO_DEVICE);
|
||||
if (sreq->nr_src > 0 &&
|
||||
!dma_map_sg(priv->dev, src, sreq->nr_src, DMA_TO_DEVICE))
|
||||
return -EIO;
|
||||
|
||||
if (unlikely(totlen_dst && (sreq->nr_dst <= 0))) {
|
||||
dev_err(priv->dev, "Dest buffer not large enough (need %d bytes)!",
|
||||
|
@ -762,9 +763,11 @@ static int safexcel_send_req(struct crypto_async_request *base, int ring,
|
|||
goto unmap;
|
||||
}
|
||||
|
||||
if (sreq->nr_dst > 0)
|
||||
dma_map_sg(priv->dev, dst, sreq->nr_dst,
|
||||
DMA_FROM_DEVICE);
|
||||
if (sreq->nr_dst > 0 &&
|
||||
!dma_map_sg(priv->dev, dst, sreq->nr_dst, DMA_FROM_DEVICE)) {
|
||||
ret = -EIO;
|
||||
goto unmap;
|
||||
}
|
||||
}
|
||||
|
||||
memcpy(ctx->base.ctxr->data, ctx->key, ctx->key_len);
|
||||
|
|
Loading…
Reference in a new issue