yystopf
/
openharmony_kernel_liteos_m
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

!130 fix: fix macro typo 

Merge pull request !130 from kenneth/STACK_PROTECTION
This commit is contained in:
openharmony_ci 2021-06-03 15:14:10 +08:00 committed by Gitee
parent caba05985b 16003604a9
commit 804f5a809f
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
kernel/include/los_config.h
View File

@ -541,8 +541,8 @@ extern UINT8 *m_aucSysMem0;
* @ingroup los_config * @ingroup los_config
* Configuration of hardware stack protection * Configuration of hardware stack protection
*/ */
#ifndef LOSCFG_EXC_HRADWARE_STACK_PROTECTION #ifndef LOSCFG_EXC_HARDWARE_STACK_PROTECTION
#define LOSCFG_EXC_HRADWARE_STACK_PROTECTION 0 #define LOSCFG_EXC_HARDWARE_STACK_PROTECTION 0
#endif #endif
/* ============================================================================= /* =============================================================================

10
kernel/src/los_task.c
View File

@ -134,7 +134,7 @@ STATIC VOID OsRecyleFinishedTask(VOID)
taskCB = OS_TCB_FROM_PENDLIST(LOS_DL_LIST_FIRST(&g_taskRecyleList)); taskCB = OS_TCB_FROM_PENDLIST(LOS_DL_LIST_FIRST(&g_taskRecyleList));
LOS_ListDelete(LOS_DL_LIST_FIRST(&g_taskRecyleList)); LOS_ListDelete(LOS_DL_LIST_FIRST(&g_taskRecyleList));
LOS_ListAdd(&g_losFreeTask, &taskCB->pendList); LOS_ListAdd(&g_losFreeTask, &taskCB->pendList);
#if (LOSCFG_EXC_HRADWARE_STACK_PROTECTION == 1) #if (LOSCFG_EXC_HARDWARE_STACK_PROTECTION == 1)
stackPtr = taskCB->topOfStack - OS_TASK_STACK_PROTECT_SIZE; stackPtr = taskCB->topOfStack - OS_TASK_STACK_PROTECT_SIZE;
#else #else
stackPtr = taskCB->topOfStack; stackPtr = taskCB->topOfStack;
@ -450,7 +450,7 @@ LITE_OS_SEC_TEXT CHAR *LOS_CurTaskNameGet(VOID)
} }
#if (LOSCFG_BASE_CORE_TSK_MONITOR == 1) #if (LOSCFG_BASE_CORE_TSK_MONITOR == 1)
#if (LOSCFG_EXC_HRADWARE_STACK_PROTECTION == 0) #if (LOSCFG_EXC_HARDWARE_STACK_PROTECTION == 0)
/***************************************************************************** /*****************************************************************************
Function : OsHandleRunTaskStackOverflow Function : OsHandleRunTaskStackOverflow
Description : handle stack overflow exception of the run task. Description : handle stack overflow exception of the run task.
@ -530,7 +530,7 @@ LITE_OS_SEC_TEXT STATIC VOID OsTaskStackProtect(VOID)
LITE_OS_SEC_TEXT VOID OsTaskSwitchCheck(VOID) LITE_OS_SEC_TEXT VOID OsTaskSwitchCheck(VOID)
{ {
UINT32 intSave = LOS_IntLock(); UINT32 intSave = LOS_IntLock();
#if (LOSCFG_EXC_HRADWARE_STACK_PROTECTION == 0) #if (LOSCFG_EXC_HARDWARE_STACK_PROTECTION == 0)
UINT32 endOfStack = g_losTask.newTask->topOfStack + g_losTask.newTask->stackSize; UINT32 endOfStack = g_losTask.newTask->topOfStack + g_losTask.newTask->stackSize;
if ((*(UINT32 *)(UINTPTR)(g_losTask.runTask->topOfStack)) != OS_TASK_MAGIC_WORD) { if ((*(UINT32 *)(UINTPTR)(g_losTask.runTask->topOfStack)) != OS_TASK_MAGIC_WORD) {
@ -702,7 +702,7 @@ LITE_OS_SEC_TEXT_INIT UINT32 LOS_TaskCreateOnly(UINT32 *taskID, TSK_INIT_PARAM_S
LOS_IntRestore(intSave); LOS_IntRestore(intSave);
#if (LOSCFG_EXC_HRADWARE_STACK_PROTECTION == 1) #if (LOSCFG_EXC_HARDWARE_STACK_PROTECTION == 1)
UINTPTR stackPtr = (UINTPTR)LOS_MemAllocAlign(OS_TASK_STACK_ADDR, taskInitParam->uwStackSize + UINTPTR stackPtr = (UINTPTR)LOS_MemAllocAlign(OS_TASK_STACK_ADDR, taskInitParam->uwStackSize +
OS_TASK_STACK_PROTECT_SIZE, OS_TASK_STACK_PROTECT_SIZE); OS_TASK_STACK_PROTECT_SIZE, OS_TASK_STACK_PROTECT_SIZE);
topOfStack = (VOID *)(stackPtr + OS_TASK_STACK_PROTECT_SIZE); topOfStack = (VOID *)(stackPtr + OS_TASK_STACK_PROTECT_SIZE);
@ -929,7 +929,7 @@ LITE_OS_SEC_TEXT_INIT UINT32 LOS_TaskDelete(UINT32 taskID)
} else { } else {
taskCB->taskStatus = OS_TASK_STATUS_UNUSED; taskCB->taskStatus = OS_TASK_STATUS_UNUSED;
LOS_ListAdd(&g_losFreeTask, &taskCB->pendList); LOS_ListAdd(&g_losFreeTask, &taskCB->pendList);
#if (LOSCFG_EXC_HRADWARE_STACK_PROTECTION == 1) #if (LOSCFG_EXC_HARDWARE_STACK_PROTECTION == 1)
stackPtr = taskCB->topOfStack - OS_TASK_STACK_PROTECT_SIZE; stackPtr = taskCB->topOfStack - OS_TASK_STACK_PROTECT_SIZE;
#else #else
stackPtr = taskCB->topOfStack; stackPtr = taskCB->topOfStack;