diff options
| author | Ard Biesheuvel <ard.biesheuvel@linaro.org> | 2017-07-21 16:42:36 +0100 |
|---|---|---|
| committer | Herbert Xu <herbert@gondor.apana.org.au> | 2017-08-03 13:52:44 +0800 |
| commit | 3c08377262880afc1621ab9cb6dbe7df47a6033d (patch) | |
| tree | 69dcde2fb5ca3d990f557eee71047d2f5556eab7 | |
| parent | 9166c44358346c0a92b11fd4e24925efff791648 (diff) | |
| download | op-kernel-dev-3c08377262880afc1621ab9cb6dbe7df47a6033d.zip op-kernel-dev-3c08377262880afc1621ab9cb6dbe7df47a6033d.tar.gz | |
crypto: scompress - don't sleep with preemption disabled
Due to the use of per-CPU buffers, scomp_acomp_comp_decomp() executes
with preemption disabled, and so whether the CRYPTO_TFM_REQ_MAY_SLEEP
flag is set is irrelevant, since we cannot sleep anyway. So disregard
the flag, and use GFP_ATOMIC unconditionally.
Cc: <stable@vger.kernel.org> # v4.10+
Signed-off-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
| -rw-r--r-- | crypto/scompress.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/crypto/scompress.c b/crypto/scompress.c index ae1d3cf..0b40d99 100644 --- a/crypto/scompress.c +++ b/crypto/scompress.c @@ -211,9 +211,7 @@ static int scomp_acomp_comp_decomp(struct acomp_req *req, int dir) scratch_dst, &req->dlen, *ctx); if (!ret) { if (!req->dst) { - req->dst = crypto_scomp_sg_alloc(req->dlen, - req->base.flags & CRYPTO_TFM_REQ_MAY_SLEEP ? - GFP_KERNEL : GFP_ATOMIC); + req->dst = crypto_scomp_sg_alloc(req->dlen, GFP_ATOMIC); if (!req->dst) goto out; } |
