Commit bc8298a3 authored May 11, 2015 by Horia Geant? Committed by Sasha Levin Jul 03, 2015

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



[ Upstream commit 69d9cd8c592f1abce820dbce7181bbbf6812cfbd ]

This reverts commit 7291a932.

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: <stable@vger.kernel.org> # 3.10+
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: Sasha Levin <sasha.levin@oracle.com>

parent a6642fe7

drivers/crypto/talitos.c

+2 −1

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