diff options
| author | Horia Geant? <horia.geanta@freescale.com> | 2015-05-11 20:04:49 +0300 |
|---|---|---|
| committer | Herbert Xu <herbert@gondor.apana.org.au> | 2015-05-13 10:31:56 +0800 |
| commit | 69d9cd8c592f1abce820dbce7181bbbf6812cfbd (patch) | |
| tree | 3f8bd28c7687cf9ca4a595e83c03db286e19f57e | |
| parent | 5fa7dadc898567ce14d6d6d427e7bd8ce6eb5d39 (diff) | |
| download | linux-69d9cd8c592f1abce820dbce7181bbbf6812cfbd.tar.gz linux-69d9cd8c592f1abce820dbce7181bbbf6812cfbd.tar.bz2 linux-69d9cd8c592f1abce820dbce7181bbbf6812cfbd.zip | |
Revert "crypto: talitos - convert to use be16_add_cpu()"
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: <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>
| -rw-r--r-- | drivers/crypto/talitos.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/crypto/talitos.c b/drivers/crypto/talitos.c index 73a400483696..5f7c74d0afc3 100644 --- a/drivers/crypto/talitos.c +++ b/drivers/crypto/talitos.c @@ -1083,7 +1083,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; |