Changeset 544a2e4 in mainline for kernel/generic/src/security/cap.c

Timestamp:

2011-05-30T21:37:43Z (14 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

7b712b60

Parents:

18ba2e4f (diff), 0743493a (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/security/cap.c (modified) (2 diffs)

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;