Changeset cfffb290 in mainline

Timestamp:

2006-08-05T16:05:25Z (18 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

e2882a7

Parents:

b006a2c8

Message:

finish security context isolation

Location:

kernel/generic

Files:

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

kernel/generic/include/arch.h

@@ -44 +44 @@
 #include <arch/asm.h> 
 
+#define DEFAULT_CONTEXT         0
+
 #define CPU                     THE->cpu
 #define THREAD                  THE->thread
 #define TASK                    THE->task
 #define AS                      THE->as
+#define CONTEXT         (THE->task ? THE->task->context : DEFAULT_CONTEXT)
 #define PREEMPTION_DISABLED     THE->preemption_disabled
+
+#define context_check(ctx1, ctx2)       ((ctx1) == (ctx2))
 
 /**
@@ -61 +66 @@
         cpu_t *cpu;                     /**< Executing cpu. */
         as_t *as;                       /**< Current address space. */
-        context_id_t context;   /**< Current security context. */
 };
 
-#define THE             ((the_t *)(get_stack_base()))   
+#define THE             ((the_t *)(get_stack_base()))
 
 extern void the_initialize(the_t *the);

kernel/generic/include/proc/thread.h

@@ -147 +147 @@
         int priority;                           /**< Thread's priority. Implemented as index to CPU->rq */
         uint32_t tid;                           /**< Thread ID. */
-        context_id_t context;           /**< Thread security context */
         
         thread_arch_t arch;                     /**< Architecture-specific data. */

kernel/generic/src/ddi/ddi.c

@@ -130 +130 @@
         t = task_find_by_id(id);
         
-        if (!t) {
+        if ((!t) || (!context_check(CONTEXT, t->context))) {
                 /*
-                 * There is no task with the specified ID.
+                 * There is no task with the specified ID
+                 * or the task belongs to a different security
+                 * context.
                  */
                 spinlock_unlock(&tasks_lock);

kernel/generic/src/proc/task.c

@@ -116 +116 @@
         ta->main_thread = NULL;
         ta->refcount = 0;
-        ta->context = THE->context;
+        ta->context = CONTEXT;
 
         ta->capabilities = 0;
@@ -122 +122 @@
         
         ipc_answerbox_init(&ta->answerbox);
-        for (i=0; i < IPC_MAX_PHONES;i++)
+        for (i = 0; i < IPC_MAX_PHONES; i++)
                 ipc_phone_init(&ta->phones[i]);
-        if (ipc_phone_0)
+        if ((ipc_phone_0) && (context_check(ipc_phone_0->task->context, ta->context)))
                 ipc_phone_connect(&ta->phones[0], ipc_phone_0);
         atomic_set(&ta->active_calls, 0);

kernel/generic/src/proc/the.c

@@ -59 +59 @@
         the->task = NULL;
         the->as = NULL;
-        the->context = 0;
 }
 

kernel/generic/src/proc/thread.c

@@ -319 +319 @@
         memcpy(t->name, name, THREAD_NAME_BUFLEN);
         
-        t->context = THE->context;
         t->thread_code = func;
         t->thread_arg = arg;
@@ -535 +534 @@
                 
                         t = (thread_t *) node->value[i];
-                        printf("%s: address=%#zx, tid=%zd, context=%ld, state=%s, task=%#zx, code=%#zx, stack=%#zx, cpu=",
-                                t->name, t, t->tid, t->context, thread_states[t->state], t->task, t->thread_code, t->kstack);
+                        printf("%s: address=%#zx, tid=%zd, state=%s, task=%#zx, context=%ld, code=%#zx, stack=%#zx, cpu=",
+                                t->name, t, t->tid, thread_states[t->state], t->task, t->task->context, t->thread_code, t->kstack);
                         if (t->cpu)
                                 printf("cpu%zd", t->cpu->id);

kernel/generic/src/security/cap.c

@@ -112 +112 @@
         spinlock_lock(&tasks_lock);
         t = task_find_by_id((task_id_t) taskid_arg.value);
-        if (!t) {
+        if ((!t) || (!context_check(CONTEXT, t->context))) {
                 spinlock_unlock(&tasks_lock);
                 interrupts_restore(ipl);
@@ -123 +123 @@
         
         spinlock_unlock(&tasks_lock);
-        
-
-        
         interrupts_restore(ipl);        
         return 0;
@@ -154 +151 @@
         spinlock_lock(&tasks_lock);     
         t = task_find_by_id((task_id_t) taskid_arg.value);
-        if (!t) {
+        if ((!t) || (!context_check(CONTEXT, t->context))) {
                 spinlock_unlock(&tasks_lock);
                 interrupts_restore(ipl);