diff options
| author | Ayush Sawal <ayush.sawal@chelsio.com> | 2020-02-05 10:48:42 +0530 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2020-10-01 13:14:33 +0200 |
| commit | 7444a79b60c777fb4c7bc2f4073c1ec95ee0cbf4 (patch) | |
| tree | 0480f63cf46abd1b6546c327272cb59c5c8af2d1 | |
| parent | f99ca8f0876372788b1b6ef04b37ce650ae9c5ae (diff) | |
| download | linux-stable-7444a79b60c777fb4c7bc2f4073c1ec95ee0cbf4.tar.gz linux-stable-7444a79b60c777fb4c7bc2f4073c1ec95ee0cbf4.tar.bz2 linux-stable-7444a79b60c777fb4c7bc2f4073c1ec95ee0cbf4.zip | |
crypto: chelsio - This fixes the kernel panic which occurs during a libkcapi test
[ Upstream commit 9195189e00a7db55e7d448cee973cae87c5a3c71 ]
The libkcapi test which causes kernel panic is
aead asynchronous vmsplice multiple test.
./bin/kcapi -v -d 4 -x 10 -c "ccm(aes)"
-q 4edb58e8d5eb6bc711c43a6f3693daebde2e5524f1b55297abb29f003236e43d
-t a7877c99 -n 674742abd0f5ba -k 2861fd0253705d7875c95ba8a53171b4
-a fb7bc304a3909e66e2e0c5ef952712dd884ce3e7324171369f2c5db1adc48c7d
This patch avoids dma_mapping of a zero length sg which causes the panic,
by using sg_nents_for_len which maps only upto a specific length
Signed-off-by: Ayush Sawal <ayush.sawal@chelsio.com>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Signed-off-by: Sasha Levin <sashal@kernel.org>
| -rw-r--r-- | drivers/crypto/chelsio/chcr_algo.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/crypto/chelsio/chcr_algo.c b/drivers/crypto/chelsio/chcr_algo.c index 9b3c259f081d..ee508bbbb750 100644 --- a/drivers/crypto/chelsio/chcr_algo.c +++ b/drivers/crypto/chelsio/chcr_algo.c @@ -2418,8 +2418,9 @@ int chcr_aead_dma_map(struct device *dev, else reqctx->b0_dma = 0; if (req->src == req->dst) { - error = dma_map_sg(dev, req->src, sg_nents(req->src), - DMA_BIDIRECTIONAL); + error = dma_map_sg(dev, req->src, + sg_nents_for_len(req->src, dst_size), + DMA_BIDIRECTIONAL); if (!error) goto err; } else { |