]> git.proxmox.com Git - mirror_ubuntu-bionic-kernel.git/commitdiff
crypto: scatterwalk - Remove unnecessary aliasing check in map_and_copy
authorHerbert Xu <herbert@gondor.apana.org.au>
Mon, 21 Nov 2016 08:26:19 +0000 (16:26 +0800)
committerHerbert Xu <herbert@gondor.apana.org.au>
Tue, 22 Nov 2016 07:02:25 +0000 (15:02 +0800)
The aliasing check in map_and_copy is no longer necessary because
the IPsec ESP code no longer provides an IV that points into the
actual request data.  As this check is now triggering BUG checks
due to the vmalloced stack code, I'm removing it.

Reported-by: Eric Biggers <ebiggers@google.com>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
crypto/scatterwalk.c

index 52ce17a3dd63079c3f5bb6eacde40ec1a61aa2ab..c16c94f88733e738f4ee1dff7a1334f9c2e39eb4 100644 (file)
@@ -68,10 +68,6 @@ void scatterwalk_map_and_copy(void *buf, struct scatterlist *sg,
 
        sg = scatterwalk_ffwd(tmp, sg, start);
 
-       if (sg_page(sg) == virt_to_page(buf) &&
-           sg->offset == offset_in_page(buf))
-               return;
-
        scatterwalk_start(&walk, sg);
        scatterwalk_copychunks(buf, &walk, nbytes, out);
        scatterwalk_done(&walk, out, 0);