aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/drivers/crypto
diff options
context:
space:
mode:
authorGilad Ben-Yossef <gilad@benyossef.com>2022-02-17 21:27:26 +0200
committerHerbert Xu <herbert@gondor.apana.org.au>2022-02-23 15:28:32 +1200
commit1fb37b5692c915edcc2448a6b37255738c7c77e0 (patch)
tree458d7f641ebf58f0b3e9aaab187f7db07a07d7fc /drivers/crypto
parentcrypto: x86/des3 - Remove unused inline function des3_ede_enc_blk_3way() (diff)
downloadwireguard-linux-1fb37b5692c915edcc2448a6b37255738c7c77e0.tar.xz
wireguard-linux-1fb37b5692c915edcc2448a6b37255738c7c77e0.zip
crypto: ccree - don't attempt 0 len DMA mappings
Refuse to try mapping zero bytes as this may cause a fault on some configurations / platforms and it seems the prev. attempt is not enough and we need to be more explicit. Signed-off-by: Gilad Ben-Yossef <gilad@benyossef.com> Reported-by: Corentin Labbe <clabbe.montjoie@gmail.com> Fixes: ce0fc6db38de ("crypto: ccree - protect against empty or NULL scatterlists") Tested-by: Corentin Labbe <clabbe.montjoie@gmail.com> Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Diffstat (limited to 'drivers/crypto')
-rw-r--r--drivers/crypto/ccree/cc_buffer_mgr.c7
1 files changed, 7 insertions, 0 deletions
diff --git a/drivers/crypto/ccree/cc_buffer_mgr.c b/drivers/crypto/ccree/cc_buffer_mgr.c
index a5e041d9d2cf..11e0278c8631 100644
--- a/drivers/crypto/ccree/cc_buffer_mgr.c
+++ b/drivers/crypto/ccree/cc_buffer_mgr.c
@@ -258,6 +258,13 @@ static int cc_map_sg(struct device *dev, struct scatterlist *sg,
{
int ret = 0;
+ if (!nbytes) {
+ *mapped_nents = 0;
+ *lbytes = 0;
+ *nents = 0;
+ return 0;
+ }
+
*nents = cc_get_sgl_nents(dev, sg, nbytes, lbytes);
if (*nents > max_sg_nents) {
*nents = 0;