From 5aa0ad117a91e246cb9b55f8dc74a1ed27499503 Mon Sep 17 00:00:00 2001
From: Herbert Xu <herbert@gondor.apana.org.au>
Date: Thu, 4 Oct 2007 14:49:00 +0800
Subject: [PATCH] --- yaml --- r: 67033 b: refs/heads/master c:
 2614de1b9af5a9e49cda64b394e1348159565bd5 h: refs/heads/master i:   67031:
 a2a28e5c4f04b7d4fb6eedf5b5f02a3bc9100876 v: v3

---
 [refs]                   | 2 +-
 trunk/crypto/blkcipher.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index f6573ec5bb21..554394e13479 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d8058480b35dbc3d1e6085b3f13b80af27def09e
+refs/heads/master: 2614de1b9af5a9e49cda64b394e1348159565bd5
diff --git a/trunk/crypto/blkcipher.c b/trunk/crypto/blkcipher.c
index a3c87da23f1e..3d05586a8f34 100644
--- a/trunk/crypto/blkcipher.c
+++ b/trunk/crypto/blkcipher.c
@@ -158,7 +158,7 @@ static inline int blkcipher_next_slow(struct blkcipher_desc *desc,
 	if (walk->buffer)
 		goto ok;
 
-	n = bsize * 3 - (alignmask + 1) +
+	n = aligned_bsize * 3 - (alignmask + 1) +
 	    (alignmask & ~(crypto_tfm_ctx_alignment() - 1));
 	walk->buffer = kmalloc(n, GFP_ATOMIC);
 	if (!walk->buffer)