releases/3.10.84/revert-crypto-talitos-convert-to-use-be16_add_cpu.patch

   1 From 69d9cd8c592f1abce820dbce7181bbbf6812cfbd Mon Sep 17 00:00:00 2001
   2 From: Horia Geant? <horia.geanta@freescale.com>
   3 Date: Mon, 11 May 2015 20:04:49 +0300
   4 Subject: Revert "crypto: talitos - convert to use be16_add_cpu()"
   5
   6 From: Horia Geant? <horia.geanta@freescale.com>
   7
   8 commit 69d9cd8c592f1abce820dbce7181bbbf6812cfbd upstream.
   9
  10 This reverts commit 7291a932c6e27d9768e374e9d648086636daf61c.
  11
  12 The conversion to be16_add_cpu() is incorrect in case cryptlen is
  13 negative due to premature (i.e. before addition / subtraction)
  14 implicit conversion of cryptlen (int -> u16) leading to sign loss.
  15
  16 Cc: Wei Yongjun <yongjun_wei@trendmicro.com.cn>
  17 Signed-off-by: Horia Geanta <horia.geanta@freescale.com>
  18 Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
  19 Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  20
  21 ---
  22  drivers/crypto/talitos.c |    3 ++-
  23  1 file changed, 2 insertions(+), 1 deletion(-)
  24
  25 --- a/drivers/crypto/talitos.c
  26 +++ b/drivers/crypto/talitos.c
  27 @@ -935,7 +935,8 @@ static int sg_to_link_tbl(struct scatter
  28                 sg_count--;
  29                 link_tbl_ptr--;
  30         }
  31 -       be16_add_cpu(&link_tbl_ptr->len, cryptlen);
  32 +       link_tbl_ptr->len = cpu_to_be16(be16_to_cpu(link_tbl_ptr->len)
  33 +                                       + cryptlen);
  34
  35         /* tag end of link table */
  36         link_tbl_ptr->j_extent = DESC_PTR_LNKTBL_RETURN;