diff options
| author | Horia Geant? <horia.geanta@freescale.com> | 2015-05-11 20:04:49 +0300 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2015-07-10 10:40:21 -0700 |
| commit | fd2db9b79cfa3d4e31ac9df258dcf076b5dbadf0 (patch) | |
| tree | 1810886e8734b6104d729ab9a78f7019997589e4 | |
| parent | 54b915793f085622ffa78e3cffd94a5733cc71b9 (diff) | |
| download | linux-stable-fd2db9b79cfa3d4e31ac9df258dcf076b5dbadf0.tar.gz linux-stable-fd2db9b79cfa3d4e31ac9df258dcf076b5dbadf0.tar.bz2 linux-stable-fd2db9b79cfa3d4e31ac9df258dcf076b5dbadf0.zip | |
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: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| -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 9723b3dcebe7..057d894eee66 100644 --- a/drivers/crypto/talitos.c +++ b/drivers/crypto/talitos.c @@ -935,7 +935,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; |