Changeset 57d44dd in mainline for kernel/generic/src/main/kinit.c

Timestamp:

2018-04-10T18:51:14Z (6 years ago)

Author:

Jiří Zárevúcky <jiri.zarevucky@…>

Branches:

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

Children:

20287223

Parents:

e3f819f

Message:

Instead of using .interp section, determine loader by name.

File:

• kernel/generic/src/main/kinit.c (modified) (2 diffs)

kernel/generic/src/main/kinit.c

@@ -253 +253 @@
                 assert(page);
 
+                if (str_cmp(name, "loader") == 0) {
+                        /* Register image as the program loader */
+                        if (program_loader == NULL) {
+                                program_loader = (void *) page;
+                                log(LF_OTHER, LVL_NOTE, "Program loader at %p",
+                                    program_loader);
+                        } else {
+                                log(LF_OTHER, LVL_ERROR,
+                                    "init[%zu]: Second binary named \"loader\""
+                                    " present.", i);
+                        }
+                        continue;
+                }
+
                 errno_t rc = program_create_from_image((void *) page, namebuf,
                     &programs[i]);
 
                 if (rc == 0) {
-                        if (programs[i].task != NULL) {
+                        assert(programs[i].task != NULL);
+
+                        /*
+                         * Set permissions to init userspace tasks.
+                         */
+                        perm_set(programs[i].task,
+                            PERM_PERM | PERM_MEM_MANAGER |
+                            PERM_IO_MANAGER | PERM_IRQ_REG);
+
+                        if (!ipc_box_0) {
+                                ipc_box_0 = &programs[i].task->answerbox;
                                 /*
-                                 * Set permissions to init userspace tasks.
+                                 * Hold the first task so that
+                                 * ipc_box_0 remains a valid pointer
+                                 * even if the first task exits for
+                                 * whatever reason.
                                  */
-                                perm_set(programs[i].task,
-                                    PERM_PERM | PERM_MEM_MANAGER |
-                                    PERM_IO_MANAGER | PERM_IRQ_REG);
-
-                                if (!ipc_box_0) {
-                                        ipc_box_0 = &programs[i].task->answerbox;
-                                        /*
-                                         * Hold the first task so that
-                                         * ipc_box_0 remains a valid pointer
-                                         * even if the first task exits for
-                                         * whatever reason.
-                                         */
-                                        task_hold(programs[i].task);
-                                }
+                                task_hold(programs[i].task);
                         }
 
-                        /*
-                         * If programs[i].task == NULL then it is
-                         * the program loader and it was registered
-                         * successfully.
-                         */
                 } else if (i == init.cnt - 1) {
                         /*
@@ -287 +296 @@
                          */
                         init_rd((void *) init.tasks[i].paddr, init.tasks[i].size);
-                } else
+                } else {
                         log(LF_OTHER, LVL_ERROR,
                             "init[%zu]: Init binary load failed "
                             "(error %s, loader status %u)", i,
                             str_error_name(rc), programs[i].loader_status);
+                }
         }