fixup! pkg/xipfs: add MPU memory isolation to file execution

Author: GGuche-2XS-Univ-Lille

cpu/cortexm_common/include/vectors_cortexm.h

@@ -94,8 +94,8 @@ void hard_fault_default(void);
 /**
  * @brief Default memory manager behavior callback (weak function)
  *
- * @retval 1 when the memory fault has been handled,
- * @retval 0 otherwise.
+ * @retval >=0 when the memory fault has been handled,
+ * @retval < 0 otherwise.
  */
 int mem_manage_handler(void);
 

cpu/cortexm_common/thread_arch.c

@@ -88,6 +88,7 @@
  */
 
 #include <stdio.h>
+#include <errno.h>
 
 #include "sched.h"
 #include "thread.h"
@@ -493,12 +494,12 @@ void __attribute__((naked)) __attribute__((used)) isr_svc(void)
 #endif
 }
 
-__attribute__((weak))int
+__attribute__((weak)) int
 svc_dispatch_handler(unsigned int svc_number, unsigned int *svc_args)
 {
     (void)svc_number;
     (void)svc_args;
-    return 0;
+    return -ENOTSUP;
 }
 
 static void __attribute__((used)) _svc_dispatch(unsigned int *svc_args)

cpu/cortexm_common/vectors_cortexm.c

@@ -22,6 +22,7 @@
 #include <stdint.h>
 #include <stdio.h>
 #include <inttypes.h>
+#include <errno.h>
 
 #include "cpu.h"
 #include "periph_cpu.h"
@@ -473,14 +474,14 @@ void hard_fault_default(void)
     defined(CPU_CORE_CORTEX_M4) || defined(CPU_CORE_CORTEX_M4F) || \
     defined(CPU_CORE_CORTEX_M7)
 
-__attribute__((weak))int mem_manage_handler(void)
+__attribute__((weak)) int mem_manage_handler(void)
 {
-    return 0;
+    return -ENOTSUP;
 }
 
 void mem_manage_default(void)
 {
-    if (mem_manage_handler() == 1) {
+    if (mem_manage_handler() >= 0) {
         return;
     }
     core_panic(PANIC_MEM_MANAGE, "MEM MANAGE HANDLER");

examples/advanced/xipfs/main.c

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2025 Université de Lille
+ * Copyright (C) 2024-2025 Université de Lille
  *
  * This file is subject to the terms and conditions of the GNU Lesser
  * General Public License v2.1. See the file LICENSE in the top level
@@ -99,7 +99,7 @@ static int drop_file(const file_to_drop_t *file_to_drop) {
     int file_handle = vfs_open(file_to_drop->filename, O_RDONLY, 0);
     if (file_handle < 0) {
 
-        /** There's no executable file yet, let's drop one */
+        /* There's no executable file yet, let's drop one */
         int ret = xipfs_extended_driver_new_file(
             file_to_drop->filename, file_to_drop->bytesize, file_to_drop->is_executable
         );
@@ -109,7 +109,7 @@ static int drop_file(const file_to_drop_t *file_to_drop) {
             return EXIT_FAILURE;
         }
 
-        /**
+        /*
          * Fill it with data
          * Take care : vfs does not support O_APPEND with vfs_write, only O_WRONLY or O_RDWR
          */

pkg/xipfs/fs/xipfs_fs.c

@@ -739,28 +739,28 @@ int mem_manage_handler(void)
     uint32_t cfsr = SCB->CFSR;
     uintptr_t psp = __get_PSP();
     if (xipfs_mem_manage_handler((void *)psp, mmfar, cfsr) == 0) {
-        return 1;
+        return 0;
     }
 
-    return 0;
+    return -EINVAL;
 }
 
 int svc_dispatch_handler(unsigned int svc_number, unsigned int *svc_args)
 {
     switch (svc_number) {
-        case XIPFS_ENTER_SVC_NUMBER: {
-            void *crt0_ctx = (void *)svc_args[0];
-            void *entry_point = (void *)svc_args[1];
-            void *stack_top = (void *)svc_args[2];
-            xipfs_safe_exec_enter(crt0_ctx, entry_point, stack_top);
-            return 0;
-        }
-        case XIPFS_SYSCALL_SVC_NUMBER: {
-            xipfs_syscall_dispatcher(svc_args);
-            return 0;
-        }
-        default:
-            return -ENOTSUP;
+    case XIPFS_ENTER_SVC_NUMBER: {
+        void *crt0_ctx = (void *)svc_args[0];
+        void *entry_point = (void *)svc_args[1];
+        void *stack_top = (void *)svc_args[2];
+        xipfs_safe_exec_enter(crt0_ctx, entry_point, stack_top);
+        return 0;
+    }
+    case XIPFS_SYSCALL_SVC_NUMBER: {
+        xipfs_syscall_dispatcher(svc_args);
+        return 0;
+    }
+    default:
+        return -ENOTSUP;
     }
 }