Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6

Pull crypto fixes from Herbert Xu:
 "This fixes the following issues:

   - a crash regression in the new skcipher walker

   - incorrect return value in public_key_verify_signature

   - fix for in-place signing in the sign-file utility"

* 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6:
  crypto: skcipher - fix crash in virtual walk
  sign-file: Fix inplace signing when src and dst names are both specified
  crypto: asymmetric_keys - set error code on failure

3 files changed, 5 insertions, 2 deletions

diff --git a/crypto/asymmetric_keys/public_key.c b/crypto/asymmetric_keys/public_key.c
index fd76b5fc3b3a..d3a989e718f5 100644
--- a/crypto/asymmetric_keys/public_key.c
+++ b/crypto/asymmetric_keys/public_key.c
@@ -121,6 +121,7 @@ int public_key_verify_signature(const struct public_key *pkey,
         if (ret)
                 goto error_free_req;
 
+        ret = -ENOMEM;
         outlen = crypto_akcipher_maxsize(tfm);
         output = kmalloc(outlen, GFP_KERNEL);
         if (!output)
diff --git a/crypto/skcipher.c b/crypto/skcipher.c
index aca07c643d41..0e1e6c35188e 100644
--- a/crypto/skcipher.c
+++ b/crypto/skcipher.c
@@ -226,7 +226,9 @@ static int skcipher_next_slow(struct skcipher_walk *walk, unsigned int bsize)
         void *v;
 
         if (!phys) {
-                buffer = walk->buffer ?: walk->page;
+                if (!walk->buffer)
+                        walk->buffer = walk->page;
+                buffer = walk->buffer;
                 if (buffer)
                         goto ok;
         }
diff --git a/scripts/sign-file.c b/scripts/sign-file.c
index 53af6dc3e6c1..19ec468b1168 100644
--- a/scripts/sign-file.c
+++ b/scripts/sign-file.c
@@ -267,7 +267,7 @@ int main(int argc, char **argv)
         }
         x509_name = argv[2];
         module_name = argv[3];
-        if (argc == 5) {
+        if (argc == 5 && strcmp(argv[3], argv[4]) != 0) {
                 dest_name = argv[4];
                 replace_orig = false;
         } else {