linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: "Horia Geantă" <horia.geanta@nxp.com>
To: Herbert Xu <herbert@gondor.apana.org.au>,
	David Gstir <david@sigma-star.at>
Cc: "David S. Miller" <davem@davemloft.net>,
	Dan Douglass <dan.douglass@nxp.com>, <richard@sigma-star.at>,
	Radu Solea <radu.solea@nxp.com>, <linux-crypto@vger.kernel.org>,
	<linux-kernel@vger.kernel.org>
Subject: [PATCH 1/2] crypto: caam - fix gfp allocation flags (part I)
Date: Mon, 19 Jun 2017 11:44:45 +0300	[thread overview]
Message-ID: <20170619084446.27967-1-horia.geanta@nxp.com> (raw)
In-Reply-To: <5215CFD1-A162-4668-A34C-1C29509DC27E@sigma-star.at>

Changes in the SW cts (ciphertext stealing) code in
commit 0605c41cc53ca ("crypto: cts - Convert to skcipher")
revealed a problem in the CAAM driver:
when cts(cbc(aes)) is executed and cts runs in SW,
cbc(aes) is offloaded in CAAM; cts encrypts the last block
in atomic context and CAAM incorrectly decides to use GFP_KERNEL
for memory allocation.

Fix this by allowing GFP_KERNEL (sleeping) only when MAY_SLEEP flag is
set, i.e. remove MAY_BACKLOG flag.

We split the fix in two parts - first is sent to -stable, while the
second is not (since there is no known failure case).

Link: http://lkml.kernel.org/g/20170602122446.2427-1-david@sigma-star.at
Cc: <stable@vger.kernel.org> # 4.8+
Reported-by: David Gstir <david@sigma-star.at>
Signed-off-by: Horia Geantă <horia.geanta@nxp.com>
---
 drivers/crypto/caam/caamalg.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/drivers/crypto/caam/caamalg.c b/drivers/crypto/caam/caamalg.c
index 398807d1b77e..4ecf92e3b404 100644
--- a/drivers/crypto/caam/caamalg.c
+++ b/drivers/crypto/caam/caamalg.c
@@ -1475,8 +1475,7 @@ static struct ablkcipher_edesc *ablkcipher_edesc_alloc(struct ablkcipher_request
 	struct crypto_ablkcipher *ablkcipher = crypto_ablkcipher_reqtfm(req);
 	struct caam_ctx *ctx = crypto_ablkcipher_ctx(ablkcipher);
 	struct device *jrdev = ctx->jrdev;
-	gfp_t flags = (req->base.flags & (CRYPTO_TFM_REQ_MAY_BACKLOG |
-					  CRYPTO_TFM_REQ_MAY_SLEEP)) ?
+	gfp_t flags = (req->base.flags & CRYPTO_TFM_REQ_MAY_SLEEP) ?
 		       GFP_KERNEL : GFP_ATOMIC;
 	int src_nents, mapped_src_nents, dst_nents = 0, mapped_dst_nents = 0;
 	struct ablkcipher_edesc *edesc;
-- 
2.12.0.264.gd6db3f216544

  reply	other threads:[~2017-06-19  8:50 UTC|newest]

Thread overview: 27+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2017-06-02 12:24 [RFC PATCH 0/2] crypto: caam - fix cts(cbc(aes)) with CAAM driver David Gstir
2017-06-02 12:24 ` [RFC PATCH 1/2] crypto: caam - properly set IV after {en,de}crypt David Gstir
2017-06-19 10:31   ` Horia Geantă
2017-06-20  1:28     ` Herbert Xu
2017-06-26  5:40       ` David Gstir
2017-06-26  6:47         ` Herbert Xu
2017-06-28  8:32     ` Horia Geantă
2017-06-28  9:03       ` David Gstir
2017-06-02 12:24 ` [RFC PATCH 2/2] crypto: caam - fix k*alloc if called from own cipher callback David Gstir
2017-06-13 11:53 ` [RFC PATCH 0/2] crypto: caam - fix cts(cbc(aes)) with CAAM driver David Gstir
2017-06-15 14:57 ` Horia Geantă
2017-06-16  7:57   ` Horia Geantă
2017-06-16  7:59     ` Herbert Xu
2017-06-16 21:01       ` Horia Geantă
2017-06-17  9:05         ` David Gstir
2017-06-19  8:44           ` Horia Geantă [this message]
2017-06-19  8:44             ` [PATCH 2/2] crypto: caam - fix gfp allocation flags (part II) Horia Geantă
2017-06-22  9:00               ` Herbert Xu
2017-06-22  9:00             ` [PATCH 1/2] crypto: caam - fix gfp allocation flags (part I) Herbert Xu
2017-06-28 13:27 ` [PATCH] crypto: caam - properly set IV after {en,de}crypt David Gstir
2017-06-28 13:42   ` Horia Geantă
2017-06-29 10:19     ` Horia Geantă
2017-08-14  7:59       ` Gilad Ben-Yossef
2017-09-05 15:33         ` Horia Geantă
2017-09-06 10:14           ` Gilad Ben-Yossef
2017-09-07 10:12             ` Horia Geantă
2017-07-12 10:51   ` Herbert Xu

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20170619084446.27967-1-horia.geanta@nxp.com \
    --to=horia.geanta@nxp.com \
    --cc=dan.douglass@nxp.com \
    --cc=davem@davemloft.net \
    --cc=david@sigma-star.at \
    --cc=herbert@gondor.apana.org.au \
    --cc=linux-crypto@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=radu.solea@nxp.com \
    --cc=richard@sigma-star.at \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).