ARM: Map the initial thread's IPC buffer and boot info as non-executa…

…ble. Note that this also required some irrelevant x86 changes to match function arguments.
seL4 · Mar 9, 2015 · 4f12acd · 4f12acd
1 parent 86751e4
commit 4f12acd
Show file tree

Hide file tree

Showing 7 changed files with 12 additions and 11 deletions.
diff --git a/include/arch/arm/arch/kernel/boot.h b/include/arch/arm/arch/kernel/boot.h
@@ -14,7 +14,7 @@
 #include <types.h>
 
 cap_t create_unmapped_it_frame_cap(pptr_t pptr, bool_t use_large);
-cap_t create_mapped_it_frame_cap(cap_t pd_cap, pptr_t pptr, vptr_t vptr, asid_t asid, bool_t use_large);
+cap_t create_mapped_it_frame_cap(cap_t pd_cap, pptr_t pptr, vptr_t vptr, asid_t asid, bool_t use_large, bool_t executable);
 
 void init_kernel(
     paddr_t ui_p_reg_start,

diff --git a/include/arch/arm/arch/kernel/vspace.h b/include/arch/arm/arch/kernel/vspace.h
@@ -18,7 +18,7 @@
 #define IT_ASID 1 /* initial thread's ASID */
 
 void map_it_pt_cap(cap_t pd_cap, cap_t pt_cap);
-void map_it_frame_cap(cap_t pd_cap, cap_t frame_cap);
+void map_it_frame_cap(cap_t pd_cap, cap_t frame_cap, bool_t executable);
 void map_kernel_window(void);
 void map_kernel_frame(paddr_t paddr, pptr_t vaddr, vm_rights_t vm_rights, vm_attributes_t vm_attributes);
 void activate_global_pd(void);

diff --git a/include/arch/ia32/arch/kernel/boot.h b/include/arch/ia32/arch/kernel/boot.h
@@ -26,7 +26,7 @@ typedef struct ui_info {
 } ui_info_t;
 
 cap_t create_unmapped_it_frame_cap(pptr_t pptr, bool_t use_large);
-cap_t create_mapped_it_frame_cap(cap_t pd_cap, pptr_t pptr, vptr_t vptr, asid_t asid, bool_t use_large);
+cap_t create_mapped_it_frame_cap(cap_t pd_cap, pptr_t pptr, vptr_t vptr, asid_t asid, bool_t use_large, bool_t executable);
 
 bool_t init_node_state(
     p_region_t    avail_p_reg,

diff --git a/src/arch/arm/kernel/boot.c b/src/arch/arm/kernel/boot.c
@@ -169,10 +169,10 @@ create_unmapped_it_frame_cap(pptr_t pptr, bool_t use_large)
 }
 
 BOOT_CODE cap_t
-create_mapped_it_frame_cap(cap_t pd_cap, pptr_t pptr, vptr_t vptr, asid_t asid, bool_t use_large)
+create_mapped_it_frame_cap(cap_t pd_cap, pptr_t pptr, vptr_t vptr, asid_t asid, bool_t use_large, bool_t executable)
 {
     cap_t cap = create_it_frame_cap(pptr, vptr, asid, use_large);
-    map_it_frame_cap(pd_cap, cap);
+    map_it_frame_cap(pd_cap, cap, executable);
     return cap;
 }
 

diff --git a/src/arch/arm/kernel/vspace.c b/src/arch/arm/kernel/vspace.c
@@ -108,7 +108,7 @@ map_it_pt_cap(cap_t pd_cap, cap_t pt_cap)
 }
 
 BOOT_CODE void
-map_it_frame_cap(cap_t pd_cap, cap_t frame_cap)
+map_it_frame_cap(cap_t pd_cap, cap_t frame_cap, bool_t executable)
 {
     pte_t* pt;
     pte_t* targetSlot;
@@ -131,7 +131,7 @@ map_it_frame_cap(cap_t pd_cap, cap_t frame_cap)
                       APFromVMRights(VMReadWrite),
                       1, /* cacheable */
                       1, /* write-back caching */
-                      0  /* executable */
+                      !executable
                   );
 }
 

diff --git a/src/arch/ia32/kernel/boot.c b/src/arch/ia32/kernel/boot.c
@@ -21,6 +21,7 @@
 #include <arch/machine/fpu.h>
 #include <arch/object/ioport.h>
 #include <arch/linker.h>
+#include <util.h>
 
 #ifdef CONFIG_IOMMU
 #include <plat/machine/intel-vtd.h>
@@ -95,7 +96,7 @@ create_unmapped_it_frame_cap(pptr_t pptr, bool_t use_large)
 }
 
 BOOT_CODE cap_t
-create_mapped_it_frame_cap(cap_t vspace_cap, pptr_t pptr, vptr_t vptr, asid_t asid, bool_t use_large)
+create_mapped_it_frame_cap(cap_t vspace_cap, pptr_t pptr, vptr_t vptr, asid_t asid, bool_t use_large, bool_t executable UNUSED)
 {
     cap_t cap = create_it_frame_cap(pptr, vptr, asid, use_large);
     map_it_frame_cap(vspace_cap, cap);

diff --git a/src/kernel/boot.c b/src/kernel/boot.c
@@ -218,7 +218,7 @@ create_ipcbuf_frame(cap_t root_cnode_cap, cap_t pd_cap, vptr_t vptr)
     clearMemory((void*)pptr, PAGE_BITS);
 
     /* create a cap of it and write it into the root CNode */
-    cap = create_mapped_it_frame_cap(pd_cap, pptr, vptr, IT_ASID, false);
+    cap = create_mapped_it_frame_cap(pd_cap, pptr, vptr, IT_ASID, false, false);
     write_slot(SLOT_PTR(pptr_of_cap(root_cnode_cap), BI_CAP_IT_IPCBUF), cap);
 
     return cap;
@@ -235,7 +235,7 @@ create_bi_frame_cap(
     cap_t cap;
 
     /* create a cap of it and write it into the root CNode */
-    cap = create_mapped_it_frame_cap(pd_cap, pptr, vptr, IT_ASID, false);
+    cap = create_mapped_it_frame_cap(pd_cap, pptr, vptr, IT_ASID, false, false);
     write_slot(SLOT_PTR(pptr_of_cap(root_cnode_cap), BI_CAP_BI_FRAME), cap);
 }
 
@@ -300,7 +300,7 @@ create_frames_of_region(
 
     for (f = reg.start; f < reg.end; f += BIT(PAGE_BITS)) {
         if (do_map) {
-            frame_cap = create_mapped_it_frame_cap(pd_cap, f, f - BASE_OFFSET - pv_offset, IT_ASID, false);
+            frame_cap = create_mapped_it_frame_cap(pd_cap, f, f - BASE_OFFSET - pv_offset, IT_ASID, false, true);
         } else {
             frame_cap = create_unmapped_it_frame_cap(f, false);
         }