Merge to Fedora kernel-2.6.18-1.2224_FC5 patched with stable patch-2.6.18.1-vs2.0...

[linux-2.6.git] / crypto / api.c

diff --git a/crypto/api.c b/crypto/api.c
index a5317b2..a1920d5 100644 (file)
--- a/crypto/api.c
+++ b/crypto/api.c
@@ -175,12 +175,10 @@ struct crypto_tfm *crypto_alloc_tfm2(const char *name, u32 flags,
        struct crypto_alg *alg;
        unsigned int tfm_size;
 
-       if (!nomodload) {
+       if (!nomodload)
                alg = crypto_alg_mod_lookup(name);
-       }
-       else {
+       else
                alg = crypto_alg_lookup(name);
-       }
 
        if (alg == NULL)
                goto out;
@@ -195,13 +193,16 @@ struct crypto_tfm *crypto_alloc_tfm2(const char *name, u32 flags,
        if (crypto_init_flags(tfm, flags))
                goto out_free_tfm;
                
-       if (crypto_init_ops(tfm)) {
-               crypto_exit_ops(tfm);
+       if (crypto_init_ops(tfm))
                goto out_free_tfm;
-       }
+
+       if (alg->cra_init && alg->cra_init(tfm))
+               goto cra_init_failed;
 
        goto out;
 
+cra_init_failed:
+       crypto_exit_ops(tfm);
 out_free_tfm:
        kfree(tfm);
        tfm = NULL;
@@ -227,6 +228,8 @@ void crypto_free_tfm(struct crypto_tfm *tfm)
        alg = tfm->__crt_alg;
        size = sizeof(*tfm) + alg->cra_ctxsize;
 
+       if (alg->cra_exit)
+               alg->cra_exit(tfm);
        crypto_exit_ops(tfm);
        crypto_alg_put(alg);
        memset(tfm, 0, size);
@@ -236,7 +239,7 @@ void crypto_free_tfm(struct crypto_tfm *tfm)
 static inline int crypto_set_driver_name(struct crypto_alg *alg)
 {
        static const char suffix[] = "-generic";
-       char *driver_name = (char *)alg->cra_driver_name;
+       char *driver_name = alg->cra_driver_name;
        int len;
 
        if (*driver_name)
@@ -274,13 +277,13 @@ int crypto_register_alg(struct crypto_alg *alg)
        down_write(&crypto_alg_sem);
        
        list_for_each_entry(q, &crypto_alg_list, cra_list) {
-               if (!strcmp(q->cra_driver_name, alg->cra_driver_name)) {
+               if (q == alg) {
                        ret = -EEXIST;
                        goto out;
                }
        }
        
-       list_add_tail(&alg->cra_list, &crypto_alg_list);
+       list_add(&alg->cra_list, &crypto_alg_list);
 out:   
        up_write(&crypto_alg_sem);
        return ret;