Changeset 90478727 in mainline for kernel/generic/src/proc/program.c

Timestamp:

2012-08-12T11:46:44Z (12 years ago)

Author:

Maurizio Lombardi <m.lombardi85@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

41b764b7

Parents:

e1e4192 (diff), 371cb6c (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

merge mainline changes

File:

• kernel/generic/src/proc/program.c (modified) (3 diffs)

kernel/generic/src/proc/program.c

@@ -71 +71 @@
 int program_create(as_t *as, uintptr_t entry_addr, char *name, program_t *prg)
 {
-        uspace_arg_t *kernel_uarg;
-        
-        kernel_uarg = (uspace_arg_t *) malloc(sizeof(uspace_arg_t), 0);
-        kernel_uarg->uspace_entry = (void *) entry_addr;
-        kernel_uarg->uspace_stack = (void *) USTACK_ADDRESS;
-        kernel_uarg->uspace_thread_function = NULL;
-        kernel_uarg->uspace_thread_arg = NULL;
-        kernel_uarg->uspace_uarg = NULL;
-        
         prg->loader_status = EE_OK;
         prg->task = task_create(as, name);
@@ -92 +83 @@
             AS_AREA_READ | AS_AREA_WRITE | AS_AREA_CACHEABLE,
             STACK_SIZE, AS_AREA_ATTR_NONE, &anon_backend, NULL, &virt, 0);
-        if (!area)
+        if (!area) {
+                task_destroy(prg->task);
                 return ENOMEM;
+        }
+        
+        uspace_arg_t *kernel_uarg = (uspace_arg_t *)
+            malloc(sizeof(uspace_arg_t), 0);
+        
+        kernel_uarg->uspace_entry = (void *) entry_addr;
+        kernel_uarg->uspace_stack = (void *) virt;
+        kernel_uarg->uspace_stack_size = STACK_SIZE;
+        kernel_uarg->uspace_thread_function = NULL;
+        kernel_uarg->uspace_thread_arg = NULL;
+        kernel_uarg->uspace_uarg = NULL;
         
         /*
@@ -99 +102 @@
          */
         prg->main_thread = thread_create(uinit, kernel_uarg, prg->task,
-            THREAD_FLAG_USPACE, "uinit", false);
-        if (!prg->main_thread)
+            THREAD_FLAG_USPACE, "uinit");
+        if (!prg->main_thread) {
+                free(kernel_uarg);
+                as_area_destroy(as, virt);
+                task_destroy(prg->task);
                 return ELIMIT;
+        }
         
         return EOK;