From: Horia Geant? <horia.geanta@freescale.com>
Date: Mon, 11 May 2015 17:04:49 +0000 (+0300)
Subject: Revert "crypto: talitos - convert to use be16_add_cpu()"
X-Git-Tag: v3.16.35~1817
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=e4fa50cdd84057fd277aacfe02906e4369d6a12a;p=thirdparty%2Fkernel%2Fstable.git

Revert "crypto: talitos - convert to use be16_add_cpu()"

commit 69d9cd8c592f1abce820dbce7181bbbf6812cfbd upstream.

This reverts commit 7291a932c6e27d9768e374e9d648086636daf61c.

The conversion to be16_add_cpu() is incorrect in case cryptlen is
negative due to premature (i.e. before addition / subtraction)
implicit conversion of cryptlen (int -> u16) leading to sign loss.

Cc: Wei Yongjun <yongjun_wei@trendmicro.com.cn>
Signed-off-by: Horia Geanta <horia.geanta@freescale.com>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Signed-off-by: Luis Henriques <luis.henriques@canonical.com>
---

diff --git a/drivers/crypto/talitos.c b/drivers/crypto/talitos.c
index eb12caa8e94aa..307931528eb20 100644
--- a/drivers/crypto/talitos.c
+++ b/drivers/crypto/talitos.c
@@ -927,7 +927,8 @@ static int sg_to_link_tbl(struct scatterlist *sg, int sg_count,
 		sg_count--;
 		link_tbl_ptr--;
 	}
-	be16_add_cpu(&link_tbl_ptr->len, cryptlen);
+	link_tbl_ptr->len = cpu_to_be16(be16_to_cpu(link_tbl_ptr->len)
+					+ cryptlen);
 
 	/* tag end of link table */
 	link_tbl_ptr->j_extent = DESC_PTR_LNKTBL_RETURN;