Changeset 719a208 in mainline for kernel/generic/include

Timestamp:

2017-05-30T05:59:09Z (8 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

f2460a50

Parents:

456c086

Message:

Rename SYS_CAP_GRANT/REVOKE to SYS_PERM_GRANT/REVOKE

Location:

kernel/generic/include

Files:

• proc/task.h (modified) (3 diffs)
• security/perm.h (moved) (moved from kernel/generic/include/security/cap.h ) (2 diffs)

kernel/generic/include/proc/task.h

@@ -48 +48 @@
 #include <adt/cht.h>
 #include <adt/list.h>
-#include <security/cap.h>
+#include <security/perm.h>
 #include <arch/proc/task.h>
 #include <arch/proc/thread.h>
@@ -93 +93 @@
         atomic_t lifecount;
         
-        /** Task capabilities. */
-        cap_t capabilities;
+        /** Task permissions. */
+        perm_t perms;
         
         /* IPC stuff */
@@ -159 +159 @@
 extern void task_print_list(bool);
 
-extern void cap_set(task_t *, cap_t);
-extern cap_t cap_get(task_t *);
+extern void perm_set(task_t *, perm_t);
+extern perm_t perm_get(task_t *);
 
 #ifndef task_create_arch

kernel/generic/include/security/perm.h

@@ -35 +35 @@
 /**
  * @file
- * @brief Capabilities definitions.
+ * @brief Task permissions definitions.
  *
- * Capabilities represent virtual rights that entitle their
+ * Permissions represent virtual rights that entitle their
  * holder to perform certain security sensitive tasks.
  *
- * Each task can have arbitrary combination of the capabilities
+ * Each task can have arbitrary combination of the permissions 
  * defined in this file. Therefore, they are required to be powers
  * of two.
  */
 
-#ifndef __CAP_H__
-#define __CAP_H__
+#ifndef __PERM_H__
+#define __PERM_H__
 
 #include <typedefs.h>
 
 /**
- * CAP_CAP allows its holder to grant/revoke arbitrary
- * privilege to/from other tasks.
+ * PERM_PERM allows its holder to grant/revoke arbitrary permission to/from
+ * other tasks.
  */
-#define CAP_CAP  (1 << 0)
+#define PERM_PERM        (1 << 0)
 
 /**
- * CAP_MEM_MANAGER allows its holder to map physical memory
- * to other tasks.
+ * PERM_MEM_MANAGER allows its holder to map physical memory to other tasks.
  */
-#define CAP_MEM_MANAGER  (1 << 1)
+#define PERM_MEM_MANAGER (1 << 1)
 
 /**
- * CAP_IO_MANAGER allows its holder to access I/O space
- * to other tasks.
+ * PERM_IO_MANAGER allows its holder to access I/O space to other tasks.
  */
-#define CAP_IO_MANAGER  (1 << 2)
+#define PERM_IO_MANAGER  (1 << 2)
 
 /**
- * CAP_IRQ_REG entitles its holder to register IRQ handlers.
+ * PERM_IRQ_REG entitles its holder to register IRQ handlers.
  */
-#define CAP_IRQ_REG  (1 << 3)
+#define PERM_IRQ_REG     (1 << 3)
 
-typedef uint32_t cap_t;
+typedef uint32_t perm_t;
 
 #ifdef __32_BITS__
 
-extern sysarg_t sys_cap_grant(sysarg64_t *, cap_t);
-extern sysarg_t sys_cap_revoke(sysarg64_t *, cap_t);
+extern sysarg_t sys_perm_grant(sysarg64_t *, perm_t);
+extern sysarg_t sys_perm_revoke(sysarg64_t *, perm_t);
 
 #endif  /* __32_BITS__ */
@@ -84 +82 @@
 #ifdef __64_BITS__
 
-extern sysarg_t sys_cap_grant(sysarg_t, cap_t);
-extern sysarg_t sys_cap_revoke(sysarg_t, cap_t);
+extern sysarg_t sys_perm_grant(sysarg_t, perm_t);
+extern sysarg_t sys_perm_revoke(sysarg_t, perm_t);
 
 #endif  /* __64_BITS__ */