Merge branch 'upstream-greg' of gregkh@master.kernel.org:/pub/scm/linux/kernel/git...

[pandora-kernel.git] / crypto / api.c

diff --git a/crypto/api.c b/crypto/api.c
index e26156f..c11ec1f 100644 (file)
--- a/crypto/api.c
+++ b/crypto/api.c
@@ -165,7 +165,7 @@ static unsigned int crypto_ctxsize(struct crypto_alg *alg, int flags)
                break;
        }
 
-       return len + alg->cra_alignmask;
+       return len + (alg->cra_alignmask & ~(crypto_tfm_ctx_alignment() - 1));
 }
 
 struct crypto_tfm *crypto_alloc_tfm(const char *name, u32 flags)
@@ -179,24 +179,25 @@ struct crypto_tfm *crypto_alloc_tfm(const char *name, u32 flags)
                goto out;
 
        tfm_size = sizeof(*tfm) + crypto_ctxsize(alg, flags);
-       tfm = kmalloc(tfm_size, GFP_KERNEL);
+       tfm = kzalloc(tfm_size, GFP_KERNEL);
        if (tfm == NULL)
                goto out_put;
 
-       memset(tfm, 0, tfm_size);
-       
        tfm->__crt_alg = alg;
        
        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;
@@ -217,6 +218,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);
@@ -226,7 +229,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)
@@ -264,13 +267,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;