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: skcipher - avoid NULL dereference

1 files changed, 1 insertions, 1 deletions

diff --git a/crypto/ablkcipher.c b/crypto/ablkcipher.c
index 98a66103f4f2..a854df2a5a4b 100644
--- a/crypto/ablkcipher.c
+++ b/crypto/ablkcipher.c
@@ -165,7 +165,7 @@ static inline int ablkcipher_next_slow(struct ablkcipher_request *req,
 
         p = kmalloc(n, GFP_ATOMIC);
         if (!p)
-                ablkcipher_walk_done(req, walk, -ENOMEM);
+                return ablkcipher_walk_done(req, walk, -ENOMEM);
 
         base = p + 1;