UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

crypto: sun4i_ss_prng - convert lock to _bh in sun4i_ss_prng_generate 

Lockdep detects a possible deadlock in sun4i_ss_prng_generate() and
throws an "inconsistent {SOFTIRQ-ON-W} -> {IN-SOFTIRQ-W} usage" warning.
Disabling softirqs to fix this.

Fixes: b8ae5c7387 ("crypto: sun4i-ss - support the Security System PRNG")
Signed-off-by: Artem Savkov <artem.savkov@gmail.com>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
This commit is contained in:
Artem Savkov 2018-02-06 22:20:22 +01:00 committed by Herbert Xu
parent dd78c832ff
commit 2e7d1d61ea
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/crypto/sunxi-ss/sun4i-ss-prng.c
View File

@ -28,7 +28,7 @@ int sun4i_ss_prng_generate(struct crypto_rng *tfm, const u8 *src,
algt = container_of(alg, struct sun4i_ss_alg_template, alg.rng); algt = container_of(alg, struct sun4i_ss_alg_template, alg.rng);
ss = algt->ss; ss = algt->ss;
spin_lock(&ss->slock); spin_lock_bh(&ss->slock);
writel(mode, ss->base + SS_CTL); writel(mode, ss->base + SS_CTL);
@ -51,6 +51,6 @@ int sun4i_ss_prng_generate(struct crypto_rng *tfm, const u8 *src,
} }
writel(0, ss->base + SS_CTL); writel(0, ss->base + SS_CTL);
spin_unlock(&ss->slock); spin_unlock_bh(&ss->slock);
return 0; return 0;
} }