Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6

Conflicts:
	Documentation/feature-removal-schedule.txt
	drivers/scsi/fcoe/fcoe.c
	net/core/drop_monitor.c
	net/core/net-traces.c

1 files changed, 5 insertions, 10 deletions

diff --git a/crypto/api.c b/crypto/api.c
index 314dab96840e..d5944f92b416 100644
--- a/crypto/api.c
+++ b/crypto/api.c
@@ -217,13 +217,11 @@ struct crypto_alg *crypto_larval_lookup(const char *name, u32 type, u32 mask)
 
         alg = crypto_alg_lookup(name, type, mask);
         if (!alg) {
-                char tmp[CRYPTO_MAX_ALG_NAME];
+                request_module("%s", name);
 
-                request_module(name);
-
-                if (!((type ^ CRYPTO_ALG_NEED_FALLBACK) & mask) &&
-                    snprintf(tmp, sizeof(tmp), "%s-all", name) < sizeof(tmp))
-                        request_module(tmp);
+                if (!((type ^ CRYPTO_ALG_NEED_FALLBACK) & mask &
+                      CRYPTO_ALG_NEED_FALLBACK))
+                        request_module("%s-all", name);
 
                 alg = crypto_alg_lookup(name, type, mask);
         }
@@ -579,20 +577,17 @@ EXPORT_SYMBOL_GPL(crypto_alloc_tfm);
 void crypto_destroy_tfm(void *mem, struct crypto_tfm *tfm)
 {
         struct crypto_alg *alg;
-        int size;
 
         if (unlikely(!mem))
                 return;
 
         alg = tfm->__crt_alg;
-        size = ksize(mem);
 
         if (!tfm->exit && alg->cra_exit)
                 alg->cra_exit(tfm);
         crypto_exit_ops(tfm);
         crypto_mod_put(alg);
-        memset(mem, 0, size);
-        kfree(mem);
+        kzfree(mem);
 }
 EXPORT_SYMBOL_GPL(crypto_destroy_tfm);