Changeset 473d5d2 in mainline

Timestamp:

2011-05-19T16:44:47Z (13 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

bcaca55

Parents:

9c757820

Message:

add magic value to THE structure for better stack/memory corruption detection
rename (security) contexts to containers (a slightly less overloaded term within SPARTAN kernel)

Location:

kernel/generic

Files:

• include/arch.h (modified) (3 diffs)
• src/ddi/ddi.c (modified) (1 diff)
• src/debug/panic.c (modified) (1 diff)
• src/proc/task.c (modified) (6 diffs)
• src/proc/the.c (modified) (2 diffs)
• src/security/cap.c (modified) (2 diffs)

kernel/generic/include/arch.h

@@ -41 +41 @@
 #include <mm/as.h>
 
-#define DEFAULT_CONTEXT  0
+/*
+ * THE is not an abbreviation, but the English definite article written in
+ * capital letters. It means the current pointer to something, e.g. thread,
+ * processor or address space. Kind reader of this comment shall appreciate
+ * the wit of constructs like THE->thread and similar.
+ */
+#define THE  ((the_t * )(get_stack_base()))
 
 #define CPU                  THE->cpu
@@ -47 +53 @@
 #define TASK                 THE->task
 #define AS                   THE->as
-#define CONTEXT              (THE->task ? THE->task->context : DEFAULT_CONTEXT)
 #define PREEMPTION_DISABLED  THE->preemption_disabled
+#define MAGIC                UINT32_C(0xfacefeed)
 
-#define context_check(ctx1, ctx2)  ((ctx1) == (ctx2))
+#define container_check(ctn1, ctn2)  ((ctn1) == (ctn2))
+
+#define DEFAULT_CONTAINER  0
+#define CONTAINER \
+        ((THE->task) ? (THE->task->container) : (DEFAULT_CONTAINER))
 
 /**
@@ -63 +73 @@
         cpu_t *cpu;                  /**< Executing cpu. */
         as_t *as;                    /**< Current address space. */
+        uint32_t magic;              /**< Magic value */
 } the_t;
-
-/*
- * THE is not an abbreviation, but the English definite article written in
- * capital letters. It means the current pointer to something, e.g. thread,
- * processor or address space. Kind reader of this comment shall appreciate
- * the wit of constructs like THE->thread and similar.
- */
-#define THE  ((the_t * )(get_stack_base()))
 
 extern void the_initialize(the_t *);

kernel/generic/src/ddi/ddi.c

@@ -224 +224 @@
         task_t *task = task_find_by_id(id);
         
-        if ((!task) || (!context_check(CONTEXT, task->context))) {
+        if ((!task) || (!container_check(CONTAINER, task->container))) {
                 /*
                  * There is no task with the specified ID

kernel/generic/src/debug/panic.c

@@ -95 +95 @@
         printf("\n");
         
-        printf("THE=%p", THE);
+        printf("THE=%p: ", THE);
         if (THE != NULL) {
-                printf(": pe=%" PRIun " thr=%p task=%p cpu=%p as=%p",
+                printf("pe=%" PRIun " thr=%p task=%p cpu=%p as=%p magic=%#x\n",
                     THE->preemption_disabled, THE->thread, THE->task,
-                    THE->cpu, THE->as);
-        }
-        printf("\n");
+                    THE->cpu, THE->as, THE->magic);
+        } else
+                printf("invalid\n");
         
         if (istate) {

kernel/generic/src/proc/task.c

@@ -190 +190 @@
         str_cpy(task->name, TASK_NAME_BUFLEN, name);
         
-        task->context = CONTEXT;
+        task->container = CONTAINER;
         task->capabilities = 0;
         task->ucycles = 0;
@@ -211 +211 @@
         
         if ((ipc_phone_0) &&
-            (context_check(ipc_phone_0->task->context, task->context)))
+            (container_check(ipc_phone_0->task->container, task->container)))
                 ipc_phone_connect(&task->phones[0], ipc_phone_0);
         
@@ -584 +584 @@
                 printf("%-8" PRIu64 " %-14s %-5" PRIu32 " %10p %10p"
                     " %9" PRIu64 "%c %9" PRIu64 "%c\n", task->taskid,
-                    task->name, task->context, task, task->as,
+                    task->name, task->container, task, task->as,
                     ucycles, usuffix, kcycles, ksuffix);
 #endif
@@ -595 +595 @@
         else
                 printf("%-8" PRIu64 " %-14s %-5" PRIu32 " %18p %18p\n",
-                    task->taskid, task->name, task->context, task, task->as);
+                    task->taskid, task->name, task->container, task, task->as);
 #endif
         
@@ -625 +625 @@
                 printf("[id    ] [threads] [calls] [callee\n");
         else
-                printf("[id    ] [name        ] [ctx] [address ] [as      ]"
+                printf("[id    ] [name        ] [ctn] [address ] [as      ]"
                     " [ucycles ] [kcycles ]\n");
 #endif
@@ -634 +634 @@
                     " [callee\n");
         else
-                printf("[id    ] [name        ] [ctx] [address         ]"
+                printf("[id    ] [name        ] [ctn] [address         ]"
                     " [as              ]\n");
 #endif

kernel/generic/src/proc/the.c

@@ -58 +58 @@
         the->task = NULL;
         the->as = NULL;
+        the->magic = MAGIC;
 }
 
@@ -70 +71 @@
 NO_TRACE void the_copy(the_t *src, the_t *dst)
 {
+        ASSERT(src->magic == MAGIC);
         *dst = *src;
 }

kernel/generic/src/security/cap.c

@@ -92 +92 @@
         task_t *task = task_find_by_id(taskid);
         
-        if ((!task) || (!context_check(CONTEXT, task->context))) {
+        if ((!task) || (!container_check(CONTAINER, task->container))) {
                 irq_spinlock_unlock(&tasks_lock, true);
                 return (sysarg_t) ENOENT;
@@ -121 +121 @@
         
         task_t *task = task_find_by_id(taskid);
-        if ((!task) || (!context_check(CONTEXT, task->context))) {
+        if ((!task) || (!container_check(CONTAINER, task->container))) {
                 irq_spinlock_unlock(&tasks_lock, true);
                 return (sysarg_t) ENOENT;