[9/*] [CRYPTO] Remap when walk_out crosses page in crypt()

From: Herbert Xu <herbert@gondor.apana.org.au>
To: Fruhwirth Clemens <clemens@endorphin.org>
Cc: James Morris <jmorris@redhat.com>,
	Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
	cryptoapi@lists.logix.cz, linux-crypto@vger.kernel.org
Subject: [9/*] [CRYPTO] Remap when walk_out crosses page in crypt()
Date: Tue, 22 Mar 2005 22:25:04 +1100	[thread overview]
Message-ID: <20050322112504.GC7224@gondor.apana.org.au> (raw)
In-Reply-To: <20050322112416.GB7224@gondor.apana.org.au>

[-- Attachment #1: Type: text/plain, Size: 474 bytes --]

Hi:

This is needed so that we can keep the in_place assignment outside the
inner loop.  Without this in pathalogical situations we can start out
having walk_out being different from walk_in, but when walk_out crosses
a page it may converge with walk_in.

Cheers,
-- 
Visit Openswan at http://www.openswan.org/
Email: Herbert Xu ~{PmV>HI~} <herbert@gondor.apana.org.au>
Home Page: http://gondor.apana.org.au/~herbert/
PGP Key: http://gondor.apana.org.au/~herbert/pubkey.txt

[-- Attachment #2: sg-9 --]
[-- Type: text/plain, Size: 509 bytes --]

===== cipher.c 1.26 vs edited =====

--- 1.26/crypto/cipher.c	2005-03-22 21:56:21 +11:00
+++ edited/cipher.c	2005-03-22 21:59:53 +11:00
@@ -129,7 +129,9 @@
 			complete_dst(&walk_out, bsize, dst_p, in_place);
 
 			nbytes -= bsize;
-		} while (nbytes && !scatterwalk_across_pages(&walk_in, bsize));
+		} while (nbytes &&
+			 !scatterwalk_across_pages(&walk_in, bsize) &&
+			 !scatterwalk_across_pages(&walk_out, bsize));
 
 		scatterwalk_done(&walk_in, 0, nbytes);
 		scatterwalk_done(&walk_out, 1, nbytes);
