OrgApache/incubator-nuttx
OrgApache
/
incubator-nuttx
mirror of https://github.com/apache/incubator-nuttx.git
1
0
Fork 0
Code Issues Releases Wiki Activity

mm: Fix heap corruption in protected build 

Signed-off-by: Masayuki Ishikawa <Masayuki.Ishikawa@jp.sony.com>
This commit is contained in:
Masayuki Ishikawa 2020-04-22 08:40:05 +09:00 committed by Xiang Xiao
parent 79589eca1a
commit ad9db974cb
2 changed files with 0 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/nuttx/mm/mm.h
View File

@ -211,12 +211,10 @@ struct mm_freenode_s
FAR struct mm_freenode_s *blink; FAR struct mm_freenode_s *blink;
}; };
#if defined(CONFIG_BUILD_FLAT) || defined(__KERNEL__)
struct mm_delaynode_s struct mm_delaynode_s
{ {
struct mm_delaynode_s *flink; struct mm_delaynode_s *flink;
}; };
#endif
/* What is the size of the freenode? */ /* What is the size of the freenode? */
@ -258,11 +256,9 @@ struct mm_heap_s
struct mm_freenode_s mm_nodelist[MM_NNODES]; struct mm_freenode_s mm_nodelist[MM_NNODES];
#if defined(CONFIG_BUILD_FLAT) || defined(__KERNEL__)
/* Free delay list, for some situation can't do free immdiately */ /* Free delay list, for some situation can't do free immdiately */
struct mm_delaynode_s *mm_delaylist; struct mm_delaynode_s *mm_delaylist;
#endif
}; };
/**************************************************************************** /****************************************************************************

2
mm/mm_heap/mm_initialize.c
View File

@ -175,11 +175,9 @@ void mm_initialize(FAR struct mm_heap_s *heap, FAR void *heapstart,
heap->mm_nregions = 0; heap->mm_nregions = 0;
#endif #endif
#if defined(CONFIG_BUILD_FLAT) || defined(__KERNEL__)
/* Initialize mm_delaylist */ /* Initialize mm_delaylist */
heap->mm_delaylist = NULL; heap->mm_delaylist = NULL;
#endif
/* Initialize the node array */ /* Initialize the node array */