crypto: scatterwalk - Fix test in scatterwalk_done

[cascardo/linux.git] / crypto / scatterwalk.c

diff --git a/crypto/scatterwalk.c b/crypto/scatterwalk.c
index ea5815c..52aae29 100644 (file)
--- a/crypto/scatterwalk.c
+++ b/crypto/scatterwalk.c
@@ -72,7 +72,8 @@ static void scatterwalk_pagedone(struct scatter_walk *walk, int out,
 
 void scatterwalk_done(struct scatter_walk *walk, int out, int more)
 {
-       if (!(scatterwalk_pagelen(walk) & (PAGE_SIZE - 1)) || !more)
+       if (!more || walk->offset >= walk->sg->offset + walk->sg->length ||
+           !(walk->offset & (PAGE_SIZE - 1)))
                scatterwalk_pagedone(walk, out, more);
 }
 EXPORT_SYMBOL_GPL(scatterwalk_done);
@@ -87,9 +88,11 @@ void scatterwalk_copychunks(void *buf, struct scatter_walk *walk,
                if (len_this_page > nbytes)
                        len_this_page = nbytes;
 
-               vaddr = scatterwalk_map(walk);
-               memcpy_dir(buf, vaddr, len_this_page, out);
-               scatterwalk_unmap(vaddr);
+               if (out != 2) {
+                       vaddr = scatterwalk_map(walk);
+                       memcpy_dir(buf, vaddr, len_this_page, out);
+                       scatterwalk_unmap(vaddr);
+               }
 
                scatterwalk_advance(walk, len_this_page);
 
@@ -99,7 +102,7 @@ void scatterwalk_copychunks(void *buf, struct scatter_walk *walk,
                buf += len_this_page;
                nbytes -= len_this_page;
 
-               scatterwalk_pagedone(walk, out, 1);
+               scatterwalk_pagedone(walk, out & 1, 1);
        }
 }
 EXPORT_SYMBOL_GPL(scatterwalk_copychunks);
@@ -125,28 +128,6 @@ void scatterwalk_map_and_copy(void *buf, struct scatterlist *sg,
 }
 EXPORT_SYMBOL_GPL(scatterwalk_map_and_copy);
 
-int scatterwalk_bytes_sglen(struct scatterlist *sg, int num_bytes)
-{
-       int offset = 0, n = 0;
-
-       /* num_bytes is too small */
-       if (num_bytes < sg->length)
-               return -1;
-
-       do {
-               offset += sg->length;
-               n++;
-               sg = sg_next(sg);
-
-               /* num_bytes is too large */
-               if (unlikely(!sg && (num_bytes < offset)))
-                       return -1;
-       } while (sg && (num_bytes > offset));
-
-       return n;
-}
-EXPORT_SYMBOL_GPL(scatterwalk_bytes_sglen);
-
 struct scatterlist *scatterwalk_ffwd(struct scatterlist dst[2],
                                     struct scatterlist *src,
                                     unsigned int len)