Commit 3c083772 authored Jul 21, 2017 by Ard Biesheuvel Committed by Herbert Xu Aug 03, 2017

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>

parent 9166c443

crypto/scompress.c

+1 −3

Original line number	Diff line number	Diff line
		@@ -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;
		}