diff options
| author |   Linus Torvalds <torvalds@linux-foundation.org> | 2010-07-15 20:25:44 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-07-15 20:25:44 -0700 |
| commit | 042bd1ff6cf255e71689db913786dbb6bb79542d (patch) | |
| tree | dbc4b4da7f34a4de52156d67588ad90fb9d447d7 | |
| parent | Merge master.kernel.org:/home/rmk/linux-2.6-arm (diff) | |
| parent | crypto: skcipher - avoid NULL dereference (diff) | |
| download | linux-dev-042bd1ff6cf255e71689db913786dbb6bb79542d.tar.xz linux-dev-042bd1ff6cf255e71689db913786dbb6bb79542d.zip | |
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
| -rw-r--r-- | crypto/ablkcipher.c | 2 |
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; |