xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

crypto: sun8i-ce - call finalize with bh disabled

Browse Source 
[ Upstream commit f75a749b6d78aeae2ce90e14fcc4b7b3ba46126d ]

Doing ipsec produces a spinlock recursion warning.
This is due to not disabling BH during crypto completion function.

Fixes: 06f751b613 ("crypto: allwinner - Add sun8i-ce Crypto Engine")
Signed-off-by: Corentin Labbe <clabbe@baylibre.com>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
Corentin Labbe
2022-02-21 12:08:30 +00:00
committed by Greg Kroah-Hartman
parent bf4814d58b
commit 24857d87cc
2 changed files with 6 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
drivers/crypto/allwinner/sun8i-ce/sun8i-ce-cipher.c
View File

@@ -11,6 +11,7 @@
* You could find a link for the datasheet in Documentation/arm/sunxi.rst * You could find a link for the datasheet in Documentation/arm/sunxi.rst
*/ */
#include <linux/bottom_half.h>
#include <linux/crypto.h> #include <linux/crypto.h>
#include <linux/dma-mapping.h> #include <linux/dma-mapping.h>
#include <linux/io.h> #include <linux/io.h>
@@ -280,7 +281,9 @@ static int sun8i_ce_cipher_run(struct crypto_engine *engine, void *areq)
flow = rctx->flow; flow = rctx->flow;
err = sun8i_ce_run_task(ce, flow, crypto_tfm_alg_name(breq->base.tfm)); err = sun8i_ce_run_task(ce, flow, crypto_tfm_alg_name(breq->base.tfm));
local_bh_disable();
crypto_finalize_skcipher_request(engine, breq, err); crypto_finalize_skcipher_request(engine, breq, err);
local_bh_enable();
return 0; return 0;
} }

3
drivers/crypto/allwinner/sun8i-ce/sun8i-ce-hash.c
View File

@@ -9,6 +9,7 @@
* *
* You could find the datasheet in Documentation/arm/sunxi.rst * You could find the datasheet in Documentation/arm/sunxi.rst
*/ */
#include <linux/bottom_half.h>
#include <linux/dma-mapping.h> #include <linux/dma-mapping.h>
#include <linux/pm_runtime.h> #include <linux/pm_runtime.h>
#include <linux/scatterlist.h> #include <linux/scatterlist.h>
@@ -412,6 +413,8 @@ int sun8i_ce_hash_run(struct crypto_engine *engine, void *breq)
theend: theend:
kfree(buf); kfree(buf);
kfree(result); kfree(result);
local_bh_disable();
crypto_finalize_hash_request(engine, breq, err); crypto_finalize_hash_request(engine, breq, err);
local_bh_enable();
return 0; return 0;
} }