Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6

* git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6: crypto: hash - Fix handling of sg entry that crosses page boundary
xiaoqiangnk · Jun 1, 2009 · e7c4f03 · e7c4f03
2 parents d9244b5 + d315a0e
commit e7c4f03
Showing 1 changed file with 4 additions and 3 deletions.
diff --git a/crypto/ahash.c b/crypto/ahash.c
@@ -82,10 +82,11 @@ int crypto_hash_walk_done(struct crypto_hash_walk *walk, int err)
 	if (err)
 		return err;
 
-	walk->offset = 0;
-
-	if (nbytes)
+	if (nbytes) {
+		walk->offset = 0;
+		walk->pg++;
 		return hash_walk_next(walk);
+	}
 
 	if (!walk->total)
 		return 0;