Revert "MPU Hal (#1492)"

This reverts commit eed4296890.

applications/archive/scenes/archive_scene_rename.c

@@ -37,7 +37,7 @@ void archive_scene_rename_on_enter(void* context) {
         false);
 
     ValidatorIsFile* validator_is_file = validator_is_file_alloc_init(
-        string_get_cstr(archive->browser->path), archive->file_extension, "");
+        string_get_cstr(archive->browser->path), archive->file_extension, NULL);
     text_input_set_validator(text_input, validator_is_file_callback, validator_is_file);
 
     string_clear(filename);

applications/bad_usb/bad_usb_app.c

@@ -59,7 +59,7 @@ BadUsbApp* bad_usb_app_alloc(char* arg) {
 
     string_init(app->file_path);
     string_init(app->keyboard_layout);
-    if(arg && strlen(arg)) {
+    if(arg != NULL) {
         string_set_str(app->file_path, arg);
     }
 
@@ -121,6 +121,7 @@ void bad_usb_app_free(BadUsbApp* app) {
     }
 
     // Views
+    view_dispatcher_remove_view(app->view_dispatcher, BadUsbAppViewFileSelect);
     view_dispatcher_remove_view(app->view_dispatcher, BadUsbAppViewWork);
     view_dispatcher_remove_view(app->view_dispatcher, BadUsbAppViewConfigLayout);
     bad_usb_free(app->bad_usb_view);

applications/bad_usb/bad_usb_app_i.h

@@ -43,6 +43,7 @@ struct BadUsbApp {
 
 typedef enum {
     BadUsbAppViewError,
+    BadUsbAppViewFileSelect,
     BadUsbAppViewWork,
     BadUsbAppViewConfig,
     BadUsbAppViewConfigLayout,

applications/bt/bt_service/bt.c

@@ -347,8 +347,7 @@ static void bt_close_connection(Bt* bt) {
     furi_event_flag_set(bt->api_event, BT_API_UNLOCK_EVENT);
 }
 
-int32_t bt_srv(void* p) {
+int32_t bt_srv() {
-    UNUSED(p);
     Bt* bt = bt_alloc();
 
     if(furi_hal_rtc_get_boot_mode() != FuriHalRtcBootModeNormal) {

applications/desktop/animations/views/bubble_animation_view.c

@@ -143,7 +143,7 @@ static void bubble_animation_activate(BubbleAnimationView* view, bool force) {
     furi_assert(view);
     bool activate = true;
     BubbleAnimationViewModel* model = view_get_model(view->view);
-    if(model->current == NULL) {
+    if(!model->current) {
         activate = false;
     } else if(model->freeze_frame) {
         activate = false;
@@ -151,7 +151,6 @@ static void bubble_animation_activate(BubbleAnimationView* view, bool force) {
         activate = false;
     }
 
-    if(model->current != NULL) {
     if(!force) {
         if((model->active_ended_at + model->current->active_cooldown * 1000) >
            xTaskGetTickCount()) {
@@ -162,7 +161,6 @@ static void bubble_animation_activate(BubbleAnimationView* view, bool force) {
             activate = false;
         }
     }
-    }
     view_commit_model(view->view, false);
 
     if(!activate && !force) {
@@ -290,10 +288,7 @@ static void bubble_animation_enter(void* context) {
     bubble_animation_activate(view, false);
 
     BubbleAnimationViewModel* model = view_get_model(view->view);
-    uint8_t frame_rate = 0;
+    uint8_t frame_rate = model->current->icon_animation.frame_rate;
-    if(model->current != NULL) {
-        frame_rate = model->current->icon_animation.frame_rate;
-    }
     view_commit_model(view->view, false);
 
     if(frame_rate) {

applications/desktop/desktop_settings/desktop_settings_app.c

@@ -90,7 +90,7 @@ void desktop_settings_app_free(DesktopSettingsApp* app) {
 extern int32_t desktop_settings_app(void* p) {
     DesktopSettingsApp* app = desktop_settings_app_alloc();
     LOAD_DESKTOP_SETTINGS(&app->settings);
-    if(p && (strcmp(p, DESKTOP_SETTINGS_RUN_PIN_SETUP_ARG) == 0)) {
+    if(!strcmp(p, DESKTOP_SETTINGS_RUN_PIN_SETUP_ARG)) {
         scene_manager_next_scene(app->scene_manager, DesktopSettingsAppScenePinSetupHowto);
     } else {
         scene_manager_next_scene(app->scene_manager, DesktopSettingsAppSceneStart);

applications/gui/modules/button_menu.c

@@ -185,7 +185,6 @@ static void button_menu_process_ok(ButtonMenu* button_menu, InputType type) {
             return false;
         });
 
-    if(item) {
     if(item->type == ButtonMenuItemTypeControl) {
         if(type == InputTypeShort) {
             if(item && item->callback) {
@@ -200,7 +199,6 @@ static void button_menu_process_ok(ButtonMenu* button_menu, InputType type) {
             }
         }
     }
-    }
 }
 
 static bool button_menu_view_input_callback(InputEvent* event, void* context) {

applications/gui/modules/text_input.c

@@ -147,7 +147,7 @@ static void text_input_backspace_cb(TextInputModel* model) {
 
 static void text_input_view_draw_callback(Canvas* canvas, void* _model) {
     TextInputModel* model = _model;
-    uint8_t text_length = model->text_buffer ? strlen(model->text_buffer) : 0;
+    uint8_t text_length = strlen(model->text_buffer);
     uint8_t needed_string_width = canvas_width(canvas) - 8;
     uint8_t start_pos = 4;
 

applications/gui/modules/validators.h

@@ -1,7 +1,7 @@
 #pragma once
 
+// #include <gui/view.h>
 #include <m-string.h>
-#include <core/common_defines.h>
 
 #ifdef __cplusplus
 extern "C" {

applications/ibutton/ibutton.c

@@ -353,7 +353,7 @@ int32_t ibutton_app(void* p) {
     bool key_loaded = false;
     bool rpc_mode = false;
 
-    if(p && strlen(p)) {
+    if(p) {
         uint32_t rpc_ctx = 0;
         if(sscanf(p, "RPC %lX", &rpc_ctx) == 1) {
             FURI_LOG_D(TAG, "Running in RPC mode");

applications/infrared/infrared.c

@@ -405,7 +405,7 @@ int32_t infrared_app(void* p) {
     bool is_remote_loaded = false;
     bool is_rpc_mode = false;
 
-    if(p && strlen(p)) {
+    if(p) {
         uint32_t rpc_ctx = 0;
         if(sscanf(p, "RPC %lX", &rpc_ctx) == 1) {
             infrared->rpc_ctx = (void*)rpc_ctx;

applications/input/input.c

@@ -64,8 +64,7 @@ const char* input_get_type_name(InputType type) {
     return "Unknown";
 }
 
-int32_t input_srv(void* p) {
+int32_t input_srv() {
-    UNUSED(p);
     input = malloc(sizeof(Input));
     input->thread_id = furi_thread_get_current_id();
     input->event_pubsub = furi_pubsub_alloc();

applications/lfrfid/lfrfid_app.cpp

@@ -74,7 +74,7 @@ void LfRfidApp::run(void* _args) {
 
     make_app_folder();
 
-    if(args && strlen(args)) {
+    if(strlen(args)) {
         uint32_t rpc_ctx_ptr = 0;
         if(sscanf(args, "RPC %lX", &rpc_ctx_ptr) == 1) {
             rpc_ctx = (RpcAppSystem*)rpc_ctx_ptr;

applications/music_player/music_player.c

@@ -300,7 +300,7 @@ int32_t music_player_app(void* p) {
     string_init(file_path);
 
     do {
-        if(p && strlen(p)) {
+        if(p) {
             string_cat_str(file_path, p);
         } else {
             string_set_str(file_path, MUSIC_PLAYER_APP_PATH_FOLDER);

applications/nfc/nfc.c

@@ -238,7 +238,7 @@ int32_t nfc_app(void* p) {
     char* args = p;
 
     // Check argument and run corresponding scene
-    if(args && strlen(args)) {
+    if((*args != '\0')) {
         nfc_device_set_loading_callback(nfc->dev, nfc_show_loading_popup, nfc);
         uint32_t rpc_ctx = 0;
         if(sscanf(p, "RPC %lX", &rpc_ctx) == 1) {

applications/power/power_service/power.c

@@ -200,7 +200,7 @@ static void power_check_battery_level_change(Power* power) {
 }
 
 int32_t power_srv(void* p) {
-    UNUSED(p);
+    (void)p;
     Power* power = power_alloc();
     power_update_info(power);
     furi_record_create(RECORD_POWER, power);

applications/power/power_settings_app/power_settings_app.c

@@ -76,7 +76,7 @@ void power_settings_app_free(PowerSettingsApp* app) {
 
 int32_t power_settings_app(void* p) {
     uint32_t first_scene = PowerSettingsAppSceneStart;
-    if(p && strlen(p) && !strcmp(p, "off")) {
+    if(p && !strcmp(p, "off")) {
         first_scene = PowerSettingsAppScenePowerOff;
     }
     PowerSettingsApp* app = power_settings_app_alloc(first_scene);

applications/rpc/rpc_system.c

@@ -78,8 +78,6 @@ static void rpc_system_system_device_info_callback(
     furi_assert(value);
     RpcSystemContext* ctx = context;
 
-    furi_assert(key);
-    furi_assert(value);
     char* str_key = strdup(key);
     char* str_value = strdup(value);
 
@@ -234,8 +232,6 @@ static void rpc_system_system_power_info_callback(
     furi_assert(value);
     RpcSystemContext* ctx = context;
 
-    furi_assert(key);
-    furi_assert(value);
     char* str_key = strdup(key);
     char* str_value = strdup(value);
 

applications/subghz/scenes/subghz_scene_save_name.c

@@ -59,8 +59,8 @@ void subghz_scene_save_name_on_enter(void* context) {
         MAX_TEXT_INPUT_LEN, // buffer size
         dev_name_empty);
 
-    ValidatorIsFile* validator_is_file =
+    ValidatorIsFile* validator_is_file = validator_is_file_alloc_init(
-        validator_is_file_alloc_init(string_get_cstr(subghz->file_path), SUBGHZ_APP_EXTENSION, "");
+        string_get_cstr(subghz->file_path), SUBGHZ_APP_EXTENSION, NULL);
     text_input_set_validator(text_input, validator_is_file_callback, validator_is_file);
 
     string_clear(file_name);

applications/subghz/subghz.c

@@ -331,7 +331,7 @@ int32_t subghz_app(void* p) {
     subghz_environment_load_keystore(
         subghz->txrx->environment, EXT_PATH("subghz/assets/keeloq_mfcodes_user"));
     // Check argument and run corresponding scene
-    if(p && strlen(p)) {
+    if(p) {
         uint32_t rpc_ctx = 0;
         if(sscanf(p, "RPC %lX", &rpc_ctx) == 1) {
             subghz->rpc_ctx = (void*)rpc_ctx;

applications/unit_tests/rpc/rpc_test.c

@@ -421,13 +421,11 @@ static void
     mu_check(result_msg_file->size == expected_msg_file->size);
     mu_check(result_msg_file->type == expected_msg_file->type);
 
-    if(result_msg_file->data && result_msg_file->type != PB_Storage_File_FileType_DIR) {
+    mu_check(!result_msg_file->data == !expected_msg_file->data);
-        mu_check(!result_msg_file->data == !expected_msg_file->data); // Zlo: WTF???
     mu_check(result_msg_file->data->size == expected_msg_file->data->size);
     for(int i = 0; i < result_msg_file->data->size; ++i) {
         mu_check(result_msg_file->data->bytes[i] == expected_msg_file->data->bytes[i]);
     }
-    }
 }
 
 static void test_rpc_compare_messages(PB_Main* result, PB_Main* expected) {
@@ -1349,7 +1347,8 @@ static void test_rpc_storage_rename_run(
 }
 
 MU_TEST(test_storage_rename) {
-    test_rpc_storage_rename_run("", "", ++command_id, PB_CommandStatus_ERROR_STORAGE_INVALID_NAME);
+    test_rpc_storage_rename_run(
+        NULL, NULL, ++command_id, PB_CommandStatus_ERROR_STORAGE_INVALID_NAME);
 
     furi_check(!test_is_exists(TEST_DIR "empty.txt"));
     test_create_file(TEST_DIR "empty.txt", 0);

applications/updater/updater.c

@@ -34,7 +34,7 @@ static void
 
 Updater* updater_alloc(const char* arg) {
     Updater* updater = malloc(sizeof(Updater));
-    if(arg && strlen(arg)) {
+    if(arg) {
         string_init_set_str(updater->startup_arg, arg);
         string_replace_str(updater->startup_arg, ANY_PATH(""), EXT_PATH(""));
     } else {

firmware/targets/f7/Inc/FreeRTOSConfig.h

@@ -32,7 +32,7 @@ extern uint32_t SystemCoreClock;
 #define configUSE_16_BIT_TICKS 0
 #define configUSE_MUTEXES 1
 #define configQUEUE_REGISTRY_SIZE 0
-#define configCHECK_FOR_STACK_OVERFLOW 0
+#define configCHECK_FOR_STACK_OVERFLOW 2
 #define configUSE_RECURSIVE_MUTEXES 1
 #define configUSE_COUNTING_SEMAPHORES 1
 #define configENABLE_BACKWARD_COMPATIBILITY 0
@@ -145,7 +145,3 @@ standard names. */
 #define USE_CUSTOM_SYSTICK_HANDLER_IMPLEMENTATION 1
 #define configOVERRIDE_DEFAULT_TICK_CONFIGURATION \
     1 /* required only for Keil but does not hurt otherwise */
-
-#define traceTASK_SWITCHED_IN()                                     \
-    extern void furi_hal_mpu_set_stack_protection(uint32_t* stack); \
-    furi_hal_mpu_set_stack_protection((uint32_t*)pxCurrentTCB->pxStack)

firmware/targets/f7/furi_hal/furi_hal.c

@@ -1,5 +1,4 @@
 #include <furi_hal.h>
-#include <furi_hal_mpu.h>
 
 #include <stm32wbxx_ll_cortex.h>
 
@@ -36,7 +35,6 @@ void furi_hal_deinit_early() {
 }
 
 void furi_hal_init() {
-    furi_hal_mpu_init();
     furi_hal_clock_init();
     furi_hal_console_init();
     furi_hal_rtc_init();
@@ -82,6 +80,17 @@ void furi_hal_init() {
     // FatFS driver initialization
     MX_FATFS_Init();
     FURI_LOG_I(TAG, "FATFS OK");
+
+    // Partial null pointer dereference protection
+    LL_MPU_Disable();
+    LL_MPU_ConfigRegion(
+        LL_MPU_REGION_NUMBER0,
+        0x00,
+        0x0,
+        LL_MPU_REGION_SIZE_1MB | LL_MPU_REGION_PRIV_RO_URO | LL_MPU_ACCESS_BUFFERABLE |
+            LL_MPU_ACCESS_CACHEABLE | LL_MPU_ACCESS_SHAREABLE | LL_MPU_TEX_LEVEL1 |
+            LL_MPU_INSTRUCTION_ACCESS_ENABLE);
+    LL_MPU_Enable(LL_MPU_CTRL_PRIVILEGED_DEFAULT);
 }
 
 void furi_hal_switch(void* address) {

firmware/targets/f7/furi_hal/furi_hal_interrupt.c

@@ -6,7 +6,6 @@
 #include <stm32wbxx.h>
 #include <stm32wbxx_ll_tim.h>
 #include <stm32wbxx_ll_rcc.h>
-#include <stm32wbxx_ll_cortex.h>
 
 #define TAG "FuriHalInterrupt"
 
@@ -96,10 +95,6 @@ void furi_hal_interrupt_init() {
     LL_SYSCFG_DisableIT_FPU_IDC();
     LL_SYSCFG_DisableIT_FPU_IXC();
 
-    LL_HANDLER_EnableFault(LL_HANDLER_FAULT_USG);
-    LL_HANDLER_EnableFault(LL_HANDLER_FAULT_BUS);
-    LL_HANDLER_EnableFault(LL_HANDLER_FAULT_MEM);
-
     FURI_LOG_I(TAG, "Init OK");
 }
 
@@ -246,20 +241,6 @@ void HardFault_Handler() {
 }
 
 void MemManage_Handler() {
-    if(FURI_BIT(SCB->CFSR, SCB_CFSR_MMARVALID_Pos)) {
-        uint32_t memfault_address = SCB->MMFAR;
-        if(memfault_address < (1024 * 1024)) {
-            // from 0x00 to 1MB, see FuriHalMpuRegionNULL
-            furi_crash("NULL pointer dereference");
-        } else {
-            // write or read of MPU region 1 (FuriHalMpuRegionStack)
-            furi_crash("MPU fault, possibly stack overflow");
-        }
-    } else if(FURI_BIT(SCB->CFSR, SCB_CFSR_MSTKERR_Pos)) {
-        // push to stack on MPU region 1 (FuriHalMpuRegionStack)
-        furi_crash("MemManage fault, possibly stack overflow");
-    }
-
     furi_crash("MemManage");
 }
 

firmware/targets/f7/furi_hal/furi_hal_mpu.c

@@ -1,66 +0,0 @@
-#include <furi_hal_mpu.h>
-#include <stm32wbxx_ll_cortex.h>
-
-#define FURI_HAL_MPU_ATTRIBUTES                                                     \
-    (LL_MPU_ACCESS_BUFFERABLE | LL_MPU_ACCESS_CACHEABLE | LL_MPU_ACCESS_SHAREABLE | \
-     LL_MPU_TEX_LEVEL1 | LL_MPU_INSTRUCTION_ACCESS_ENABLE)
-
-#define FURI_HAL_MPU_STACK_PROTECT_REGION FuriHalMPURegionSize32B
-
-void furi_hal_mpu_init() {
-    furi_hal_mpu_enable();
-
-    // NULL pointer dereference protection
-    furi_hal_mpu_protect_no_access(FuriHalMpuRegionNULL, 0x00, FuriHalMPURegionSize1MB);
-}
-
-void furi_hal_mpu_enable() {
-    LL_MPU_Enable(LL_MPU_CTRL_PRIVILEGED_DEFAULT);
-}
-
-void furi_hal_mpu_disable() {
-    LL_MPU_Disable();
-}
-
-void furi_hal_mpu_protect_no_access(
-    FuriHalMpuRegion region,
-    uint32_t address,
-    FuriHalMPURegionSize size) {
-    uint32_t size_ll = size;
-    size_ll = size_ll << MPU_RASR_SIZE_Pos;
-
-    furi_hal_mpu_disable();
-    LL_MPU_ConfigRegion(
-        region, 0x00, address, FURI_HAL_MPU_ATTRIBUTES | LL_MPU_REGION_NO_ACCESS | size_ll);
-    furi_hal_mpu_enable();
-}
-
-void furi_hal_mpu_protect_read_only(
-    FuriHalMpuRegion region,
-    uint32_t address,
-    FuriHalMPURegionSize size) {
-    uint32_t size_ll = size;
-    size_ll = size_ll << MPU_RASR_SIZE_Pos;
-
-    furi_hal_mpu_disable();
-    LL_MPU_ConfigRegion(
-        region, 0x00, address, FURI_HAL_MPU_ATTRIBUTES | LL_MPU_REGION_PRIV_RO_URO | size_ll);
-    furi_hal_mpu_enable();
-}
-
-void furi_hal_mpu_protect_disable(FuriHalMpuRegion region) {
-    furi_hal_mpu_disable();
-    LL_MPU_DisableRegion(region);
-    furi_hal_mpu_enable();
-}
-
-void furi_hal_mpu_set_stack_protection(uint32_t* stack) {
-    // Protection area address must be aligned to region size
-    uint32_t stack_ptr = (uint32_t)stack;
-    uint32_t mask = ((1 << (FURI_HAL_MPU_STACK_PROTECT_REGION + 2)) - 1);
-    stack_ptr &= ~mask;
-    if(stack_ptr < (uint32_t)stack) stack_ptr += (mask + 1);
-
-    furi_hal_mpu_protect_read_only(
-        FuriHalMpuRegionStack, stack_ptr, FURI_HAL_MPU_STACK_PROTECT_REGION);
-}

firmware/targets/furi_hal_include/furi_hal_mpu.h

@@ -1,86 +0,0 @@
-/**
- * @file furi_hal_light.h
- * Light control HAL API
- */
-
-#pragma once
-
-#include <stdbool.h>
-#include <stdint.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-typedef enum {
-    FuriHalMpuRegionNULL = 0x00, // region 0 used to protect null pointer dereference
-    FuriHalMpuRegionStack = 0x01, // region 1 used to protect stack
-    FuriHalMpuRegion2 = 0x02,
-    FuriHalMpuRegion3 = 0x03,
-    FuriHalMpuRegion4 = 0x04,
-    FuriHalMpuRegion5 = 0x05,
-    FuriHalMpuRegion6 = 0x06,
-    FuriHalMpuRegion7 = 0x07,
-} FuriHalMpuRegion;
-
-typedef enum {
-    FuriHalMPURegionSize32B = 0x04U,
-    FuriHalMPURegionSize64B = 0x05U,
-    FuriHalMPURegionSize128B = 0x06U,
-    FuriHalMPURegionSize256B = 0x07U,
-    FuriHalMPURegionSize512B = 0x08U,
-    FuriHalMPURegionSize1KB = 0x09U,
-    FuriHalMPURegionSize2KB = 0x0AU,
-    FuriHalMPURegionSize4KB = 0x0BU,
-    FuriHalMPURegionSize8KB = 0x0CU,
-    FuriHalMPURegionSize16KB = 0x0DU,
-    FuriHalMPURegionSize32KB = 0x0EU,
-    FuriHalMPURegionSize64KB = 0x0FU,
-    FuriHalMPURegionSize128KB = 0x10U,
-    FuriHalMPURegionSize256KB = 0x11U,
-    FuriHalMPURegionSize512KB = 0x12U,
-    FuriHalMPURegionSize1MB = 0x13U,
-    FuriHalMPURegionSize2MB = 0x14U,
-    FuriHalMPURegionSize4MB = 0x15U,
-    FuriHalMPURegionSize8MB = 0x16U,
-    FuriHalMPURegionSize16MB = 0x17U,
-    FuriHalMPURegionSize32MB = 0x18U,
-    FuriHalMPURegionSize64MB = 0x19U,
-    FuriHalMPURegionSize128MB = 0x1AU,
-    FuriHalMPURegionSize256MB = 0x1BU,
-    FuriHalMPURegionSize512MB = 0x1CU,
-    FuriHalMPURegionSize1GB = 0x1DU,
-    FuriHalMPURegionSize2GB = 0x1EU,
-    FuriHalMPURegionSize4GB = 0x1FU,
-} FuriHalMPURegionSize;
-
-/**
- * @brief Initialize memory protection unit
- */
-void furi_hal_mpu_init();
-
-/**
-* @brief Enable memory protection unit
-*/
-void furi_hal_mpu_enable();
-
-/**
-* @brief Disable memory protection unit
-*/
-void furi_hal_mpu_disable();
-
-void furi_hal_mpu_protect_no_access(
-    FuriHalMpuRegion region,
-    uint32_t address,
-    FuriHalMPURegionSize size);
-
-void furi_hal_mpu_protect_read_only(
-    FuriHalMpuRegion region,
-    uint32_t address,
-    FuriHalMPURegionSize size);
-
-void furi_hal_mpu_protect_disable(FuriHalMpuRegion region);
-
-#ifdef __cplusplus
-}
-#endif

furi/core/memmgr.c

@@ -36,8 +36,10 @@ void* calloc(size_t count, size_t size) {
 }
 
 char* strdup(const char* s) {
-    // arg s marked as non-null, so we need hack to check for NULL
+    const char* s_null = s;
-    furi_check(((uint32_t)s << 2) != 0);
+    if(s_null == NULL) {
+        return NULL;
+    }
 
     size_t siz = strlen(s) + 1;
     char* y = pvPortMalloc(siz);

furi/core/thread.c

@@ -114,7 +114,7 @@ void furi_thread_set_name(FuriThread* thread, const char* name) {
     furi_assert(thread);
     furi_assert(thread->state == FuriThreadStateStopped);
     if(thread->name) free((void*)thread->name);
-    thread->name = name ? strdup(name) : NULL;
+    thread->name = strdup(name);
 }
 
 void furi_thread_set_stack_size(FuriThread* thread, size_t stack_size) {