releases/4.19.31/crypto-ccree-unmap-buffer-before-copying-iv.patch

   1 From c139c72e2beb3e3db5148910b3962b7322e24374 Mon Sep 17 00:00:00 2001
   2 From: Gilad Ben-Yossef <gilad@benyossef.com>
   3 Date: Tue, 15 Jan 2019 15:43:15 +0200
   4 Subject: crypto: ccree - unmap buffer before copying IV
   5
   6 From: Gilad Ben-Yossef <gilad@benyossef.com>
   7
   8 commit c139c72e2beb3e3db5148910b3962b7322e24374 upstream.
   9
  10 We were copying the last ciphertext block into the IV field
  11 for CBC before removing the DMA mapping of the output buffer
  12 with the result of the buffer sometime being out-of-sync cache
  13 wise and were getting intermittent cases of bad output IV.
  14
  15 Fix it by moving the DMA buffer unmapping before the copy.
  16
  17 Signed-off-by: Gilad Ben-Yossef <gilad@benyossef.com>
  18 Fixes: 00904aa0cd59 ("crypto: ccree - fix iv handling")
  19 Cc: <stable@vger.kernel.org>
  20 Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
  21 Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  22
  23 ---
  24  drivers/crypto/ccree/cc_cipher.c |    3 ++-
  25  1 file changed, 2 insertions(+), 1 deletion(-)
  26
  27 --- a/drivers/crypto/ccree/cc_cipher.c
  28 +++ b/drivers/crypto/ccree/cc_cipher.c
  29 @@ -635,6 +635,8 @@ static void cc_cipher_complete(struct de
  30         unsigned int ivsize = crypto_skcipher_ivsize(sk_tfm);
  31         unsigned int len;
  32
  33 +       cc_unmap_cipher_request(dev, req_ctx, ivsize, src, dst);
  34 +
  35         switch (ctx_p->cipher_mode) {
  36         case DRV_CIPHER_CBC:
  37                 /*
  38 @@ -664,7 +666,6 @@ static void cc_cipher_complete(struct de
  39                 break;
  40         }
  41
  42 -       cc_unmap_cipher_request(dev, req_ctx, ivsize, src, dst);
  43         kzfree(req_ctx->iv);
  44
  45         skcipher_request_complete(req, err);