Remove user Mode Access to VGA / Heap and Kernel Methods.

5 files changed, 15 insertions, 5 deletions

diff --git a/arch/x86_64/src/interrupt_handling/generic_interrupt_handler.cpp b/arch/x86_64/src/interrupt_handling/generic_interrupt_handler.cpp
index 8e2c62d..9d061a8 100644
--- a/arch/x86_64/src/interrupt_handling/generic_interrupt_handler.cpp
+++ b/arch/x86_64/src/interrupt_handling/generic_interrupt_handler.cpp
@@ -8,5 +8,6 @@ namespace teachos::arch::interrupt_handling
   {
     (void)frame;
     video::vga::text::write("An Interrupt occurred.", video::vga::text::common_attributes::green_on_black);
+    video::vga::text::newline();
   }
 }  // namespace teachos::arch::interrupt_handling
diff --git a/arch/x86_64/src/memory/main.cpp b/arch/x86_64/src/memory/main.cpp
index 4cccabb..bd094e0 100644
--- a/arch/x86_64/src/memory/main.cpp
+++ b/arch/x86_64/src/memory/main.cpp
@@ -31,8 +31,7 @@ namespace teachos::arch::memory
 
       for (auto const & page : pages)
       {
-        active_table.map_page_to_next_free_frame(allocator, page,
-                                                 paging::entry::WRITABLE | paging::entry::USER_ACCESSIBLE);
+        active_table.map_page_to_next_free_frame(allocator, page, paging::entry::WRITABLE);
       }
     }
   }  // namespace
diff --git a/arch/x86_64/src/memory/paging/inactive_page_table.cpp b/arch/x86_64/src/memory/paging/inactive_page_table.cpp
index 780f12c..4e0610e 100644
--- a/arch/x86_64/src/memory/paging/inactive_page_table.cpp
+++ b/arch/x86_64/src/memory/paging/inactive_page_table.cpp
@@ -14,7 +14,7 @@ namespace teachos::arch::memory::paging
   {
     auto table = temporary_page.map_table_frame(page_table_level_4_frame, active_page_table);
     table.zero_entries();
-    table[511].set_entry(page_table_level_4_frame, entry::PRESENT | entry::WRITABLE | entry::USER_ACCESSIBLE);
+    table[511].set_entry(page_table_level_4_frame, entry::PRESENT | entry::WRITABLE);
     temporary_page.unmap_page(active_page_table);
   }
 }  // namespace teachos::arch::memory::paging
diff --git a/arch/x86_64/src/memory/paging/temporary_page.cpp b/arch/x86_64/src/memory/paging/temporary_page.cpp
index 9946f36..8e73523 100644
--- a/arch/x86_64/src/memory/paging/temporary_page.cpp
+++ b/arch/x86_64/src/memory/paging/temporary_page.cpp
@@ -18,7 +18,7 @@ namespace teachos::arch::memory::paging
     exception_handling::assert(!active_table.translate_page(page).has_value(),
                                "[Temporary page] Page is already mapped");
 
-    active_table.map_page_to_frame(allocator, page, frame, entry::WRITABLE | entry::USER_ACCESSIBLE);
+    active_table.map_page_to_frame(allocator, page, frame, entry::WRITABLE);
     return page.start_address();
   }
 
diff --git a/arch/x86_64/src/user/main.cpp b/arch/x86_64/src/user/main.cpp
index 3ddcb32..3e7b0ec 100644
--- a/arch/x86_64/src/user/main.cpp
+++ b/arch/x86_64/src/user/main.cpp
@@ -3,21 +3,31 @@
 #include "arch/context_switching/syscall/main.hpp"
 
 // TODO: Disallow this import
+#include "arch/kernel/cpu/if.hpp"
 #include "arch/video/vga/text.hpp"
 
 namespace teachos::arch::user
 {
-  [[gnu::section(".user_text")]]
   auto main() -> void
   {
     char constexpr syscall_message[] = "Successfully entered user mode and wrote to VGA buffer via syscall!";
     auto const error = context_switching::syscall::syscall(context_switching::syscall::type::WRITE,
                                                            {reinterpret_cast<uint64_t>(&syscall_message)});
 
+    kernel::cpu::clear_interrupt_flag();  // Causes crash Kernel Code (.text) is not mapped in User mMde
+
+    auto test = new int{20};  // Causes crash Heap is not mapped in User Mode
+    (void)test;
+
     if (!error)
     {
+      // Causes crash vga is not mapped in User Mode
       video::vga::text::write("Successfully made a SYSCALL and returned with SYSRETQ!",
                               video::vga::text::common_attributes::green_on_black);
     }
+
+    for (;;)
+    {
+    }
   }
 }  // namespace teachos::arch::user