]> git.kernelconcepts.de Git - karo-tx-linux.git/commitdiff
crypto: talitos - fix size calculation in talitos_edesc_alloc()
authorDan Carpenter <dan.carpenter@oracle.com>
Mon, 11 May 2015 10:10:09 +0000 (13:10 +0300)
committerHerbert Xu <herbert@gondor.apana.org.au>
Wed, 13 May 2015 02:31:54 +0000 (10:31 +0800)
The + operation has higher precedence than ?: so we need parentheses
here.  Otherwise we may end up allocating a max of only one "cryptlen"
instead of two.

Fixes: 6f65f6ac5fb3 ('crypto: talitos - implement scatter/gather copy for SEC1')
Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
Acked-by: Christophe Leroy <christophe.leroy@c-s.fr>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
drivers/crypto/talitos.c

index 4c0778b03de655f571a6716991a362f3ef437684..aaa7af856b39890be1b2b2ba9a5fb178bb5fb171 100644 (file)
@@ -1335,8 +1335,8 @@ static struct talitos_edesc *talitos_edesc_alloc(struct device *dev,
        alloc_len = sizeof(struct talitos_edesc);
        if (assoc_nents || src_nents || dst_nents) {
                if (is_sec1)
-                       dma_len = src_nents ? cryptlen : 0 +
-                                 dst_nents ? cryptlen : 0;
+                       dma_len = (src_nents ? cryptlen : 0) +
+                                 (dst_nents ? cryptlen : 0);
                else
                        dma_len = (src_nents + dst_nents + 2 + assoc_nents) *
                                  sizeof(struct talitos_ptr) + authsize;