Changeset 95c675b in mainline for kernel/generic/src/proc/program.c

Timestamp:

2017-10-17T13:11:35Z (7 years ago)

Author:

Ondřej Hlavatý <aearsis@…>

Branches:

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

Children:

60af4cdb

Parents:

dbf32b1 (diff), a416d070 (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

File:

• kernel/generic/src/proc/program.c (modified) (2 diffs)

kernel/generic/src/proc/program.c

@@ -46 +46 @@
 #include <ipc/ipc.h>
 #include <ipc/ipcrsc.h>
-#include <security/cap.h>
+#include <security/perm.h>
 #include <lib/elf_load.h>
 #include <errno.h>
@@ -244 +244 @@
                 return rc;
         
-        // FIXME: control the capabilities
-        cap_set(prg.task, cap_get(TASK));
+        // FIXME: control the permissions 
+        perm_set(prg.task, perm_get(TASK));
         program_ready(&prg);