summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHerbert Xu <herbert@gondor.apana.org.au>2016-11-21 09:26:19 +0100
committerHerbert Xu <herbert@gondor.apana.org.au>2016-11-22 08:02:25 +0100
commitc8467f7a3620698bf3c22f0e199b550fb611a8ae (patch)
treeac4aff2322676b17b409a142c1f41a77eb6678ad
parentcrypto: algif_hash - Fix result clobbering in recvmsg (diff)
downloadlinux-c8467f7a3620698bf3c22f0e199b550fb611a8ae.tar.xz
linux-c8467f7a3620698bf3c22f0e199b550fb611a8ae.zip
crypto: scatterwalk - Remove unnecessary aliasing check in map_and_copy
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>
-rw-r--r--crypto/scatterwalk.c4
1 files changed, 0 insertions, 4 deletions
diff --git a/crypto/scatterwalk.c b/crypto/scatterwalk.c
index 52ce17a3dd63..c16c94f88733 100644
--- a/crypto/scatterwalk.c
+++ b/crypto/scatterwalk.c
@@ -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);