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

042bd1ff · Linus Torvalds <[email protected]> · 2010-07-15 20:25:44 -07:00

* git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6:
  crypto: skcipher - avoid NULL dereference

Merge commit. Changes below are compared with the first parent: 2f7989ef.

Changes

1 files changed · +1 −1

File	Status	Add	Del	Content
crypto/ablkcipher.c	modified	+1	−1	View file

diff --git a/crypto/ablkcipher.c b/crypto/ablkcipher.c
index 98a6610..a854df2 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;
 