Changeset 719a208 in mainline for kernel/generic/src/ddi/ddi.c

Timestamp:

2017-05-30T05:59:09Z (7 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

File:

• kernel/generic/src/ddi/ddi.c (modified) (7 diffs)

kernel/generic/src/ddi/ddi.c

@@ -42 +42 @@
 #include <ddi/ddi.h>
 #include <proc/task.h>
-#include <security/cap.h>
+#include <security/perm.h>
 #include <mm/frame.h>
 #include <mm/as.h>
@@ -96 +96 @@
  *
  * @return EOK on success.
- * @return EPERM if the caller lacks capabilities to use this syscall.
+ * @return EPERM if the caller lacks permissions to use this syscall.
  * @return EBADMEM if phys is not page aligned.
  * @return ENOENT if there is no task matching the specified ID or
@@ -116 +116 @@
          */
         bool priv =
-            ((cap_get(TASK) & CAP_MEM_MANAGER) == CAP_MEM_MANAGER);
+            ((perm_get(TASK) & PERM_MEM_MANAGER) == PERM_MEM_MANAGER);
         
         mem_backend_data_t backend_data;
@@ -260 +260 @@
  * @param size   Size of the enabled I/O space.
  *
- * @return 0 on success, EPERM if the caller lacks capabilities to use this
+ * @return 0 on success, EPERM if the caller lacks permissions to use this
  *           syscall, ENOENT if there is no task matching the specified ID.
  *
@@ -269 +269 @@
          * Make sure the caller is authorised to make this syscall.
          */
-        cap_t caps = cap_get(TASK);
-        if (!(caps & CAP_IO_MANAGER))
+        perm_t perms = perm_get(TASK);
+        if (!(perms & PERM_IO_MANAGER))
                 return EPERM;
         
@@ -301 +301 @@
  * @param size   Size of the enabled I/O space.
  *
- * @return 0 on success, EPERM if the caller lacks capabilities to use this
+ * @return 0 on success, EPERM if the caller lacks permissions to use this
  *           syscall, ENOENT if there is no task matching the specified ID.
  *
@@ -310 +310 @@
          * Make sure the caller is authorised to make this syscall.
          */
-        cap_t caps = cap_get(TASK);
-        if (!(caps & CAP_IO_MANAGER))
+        perm_t perms = perm_get(TASK);
+        if (!(perms & PERM_IO_MANAGER))
                 return EPERM;