| commit | 042bd1ff6cf255e71689db913786dbb6bb79542d | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Thu Jul 15 20:25:44 2010 -0700 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Thu Jul 15 20:25:44 2010 -0700 |
| tree | dbc4b4da7f34a4de52156d67588ad90fb9d447d7 | |
| parent | 2f7989efd4398d92b8adffce2e07dd043a0895fe [diff] | |
| parent | 2716fbf63ee39eadc1aa9b3841b20f75b99a9bc3 [diff] |
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
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 @@ p = kmalloc(n, GFP_ATOMIC); if (!p) - ablkcipher_walk_done(req, walk, -ENOMEM); + return ablkcipher_walk_done(req, walk, -ENOMEM); base = p + 1;