Merge branch 'drm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied...

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

diff --git a/crypto/cryptomgr.c b/crypto/cryptomgr.c
index 2ebffb8..e5e3cf8 100644 (file)
--- a/crypto/cryptomgr.c
+++ b/crypto/cryptomgr.c
@@ -14,36 +14,42 @@
 #include <linux/ctype.h>
 #include <linux/err.h>
 #include <linux/init.h>
+#include <linux/kthread.h>
 #include <linux/module.h>
 #include <linux/notifier.h>
 #include <linux/rtnetlink.h>
 #include <linux/sched.h>
 #include <linux/string.h>
-#include <linux/workqueue.h>
 
 #include "internal.h"
 
 struct cryptomgr_param {
-       struct work_struct work;
+       struct rtattr *tb[CRYPTO_MAX_ATTRS + 2];
 
        struct {
                struct rtattr attr;
-               struct crypto_attr_alg data;
-       } alg;
-
-       struct {
-               u32 type;
-               u32 mask;
-               char name[CRYPTO_MAX_ALG_NAME];
-       } larval;
+               struct crypto_attr_type data;
+       } type;
 
+       union {
+               struct rtattr attr;
+               struct {
+                       struct rtattr attr;
+                       struct crypto_attr_alg data;
+               } alg;
+               struct {
+                       struct rtattr attr;
+                       struct crypto_attr_u32 data;
+               } nu32;
+       } attrs[CRYPTO_MAX_ATTRS];
+
+       char larval[CRYPTO_MAX_ALG_NAME];
        char template[CRYPTO_MAX_ALG_NAME];
 };
 
-static void cryptomgr_probe(struct work_struct *work)
+static int cryptomgr_probe(void *data)
 {
-       struct cryptomgr_param *param =
-               container_of(work, struct cryptomgr_param, work);
+       struct cryptomgr_param *param = data;
        struct crypto_template *tmpl;
        struct crypto_instance *inst;
        int err;
@@ -53,7 +59,7 @@ static void cryptomgr_probe(struct work_struct *work)
                goto err;
 
        do {
-               inst = tmpl->alloc(&param->alg, sizeof(param->alg));
+               inst = tmpl->alloc(param->tb);
                if (IS_ERR(inst))
                        err = PTR_ERR(inst);
                else if ((err = crypto_register_instance(tmpl, inst)))
@@ -67,25 +73,30 @@ static void cryptomgr_probe(struct work_struct *work)
 
 out:
        kfree(param);
-       return;
+       module_put_and_exit(0);
 
 err:
-       crypto_larval_error(param->larval.name, param->larval.type,
-                           param->larval.mask);
+       crypto_larval_error(param->larval, param->type.data.type,
+                           param->type.data.mask);
        goto out;
 }
 
 static int cryptomgr_schedule_probe(struct crypto_larval *larval)
 {
+       struct task_struct *thread;
        struct cryptomgr_param *param;
        const char *name = larval->alg.cra_name;
        const char *p;
        unsigned int len;
+       int i;
 
-       param = kmalloc(sizeof(*param), GFP_KERNEL);
-       if (!param)
+       if (!try_module_get(THIS_MODULE))
                goto err;
 
+       param = kzalloc(sizeof(*param), GFP_KERNEL);
+       if (!param)
+               goto err_put_module;
+
        for (p = name; isalnum(*p) || *p == '-' || *p == '_'; p++)
                ;
 
@@ -94,32 +105,86 @@ static int cryptomgr_schedule_probe(struct crypto_larval *larval)
                goto err_free_param;
 
        memcpy(param->template, name, len);
-       param->template[len] = 0;
 
-       name = p + 1;
-       for (p = name; isalnum(*p) || *p == '-' || *p == '_'; p++)
-               ;
+       i = 0;
+       for (;;) {
+               int notnum = 0;
+
+               name = ++p;
+               len = 0;
+
+               for (; isalnum(*p) || *p == '-' || *p == '_'; p++)
+                       notnum |= !isdigit(*p);
+
+               if (*p == '(') {
+                       int recursion = 0;
+
+                       for (;;) {
+                               if (!*++p)
+                                       goto err_free_param;
+                               if (*p == '(')
+                                       recursion++;
+                               else if (*p == ')' && !recursion--)
+                                       break;
+                       }
+
+                       notnum = 1;
+                       p++;
+               }
+
+               len = p - name;
+               if (!len)
+                       goto err_free_param;
+
+               if (notnum) {
+                       param->attrs[i].alg.attr.rta_len =
+                               sizeof(param->attrs[i].alg);
+                       param->attrs[i].alg.attr.rta_type = CRYPTOA_ALG;
+                       memcpy(param->attrs[i].alg.data.name, name, len);
+               } else {
+                       param->attrs[i].nu32.attr.rta_len =
+                               sizeof(param->attrs[i].nu32);
+                       param->attrs[i].nu32.attr.rta_type = CRYPTOA_U32;
+                       param->attrs[i].nu32.data.num =
+                               simple_strtol(name, NULL, 0);
+               }
+
+               param->tb[i + 1] = &param->attrs[i].attr;
+               i++;
+
+               if (i >= CRYPTO_MAX_ATTRS)
+                       goto err_free_param;
+
+               if (*p == ')')
+                       break;
+
+               if (*p != ',')
+                       goto err_free_param;
+       }
 
-       len = p - name;
-       if (!len || *p != ')' || p[1])
+       if (!i)
                goto err_free_param;
 
-       param->alg.attr.rta_len = sizeof(param->alg);
-       param->alg.attr.rta_type = CRYPTOA_ALG;
-       memcpy(param->alg.data.name, name, len);
-       param->alg.data.name[len] = 0;
+       param->tb[i + 1] = NULL;
+
+       param->type.attr.rta_len = sizeof(param->type);
+       param->type.attr.rta_type = CRYPTOA_TYPE;
+       param->type.data.type = larval->alg.cra_flags;
+       param->type.data.mask = larval->mask;
+       param->tb[0] = &param->type.attr;
 
-       memcpy(param->larval.name, larval->alg.cra_name, CRYPTO_MAX_ALG_NAME);
-       param->larval.type = larval->alg.cra_flags;
-       param->larval.mask = larval->mask;
+       memcpy(param->larval, larval->alg.cra_name, CRYPTO_MAX_ALG_NAME);
 
-       INIT_WORK(&param->work, cryptomgr_probe);
-       schedule_work(&param->work);
+       thread = kthread_run(cryptomgr_probe, param, "cryptomgr");
+       if (IS_ERR(thread))
+               goto err_free_param;
 
        return NOTIFY_STOP;
 
 err_free_param:
        kfree(param);
+err_put_module:
+       module_put(THIS_MODULE);
 err:
        return NOTIFY_OK;
 }