commit 4401e5b280b80eef5145a130b70a5abd2dd3860b
author Masayuki Ishikawa <masayuki.ishikawa@gmail.com> Wed Apr 22 08:40:05 2020 +0900
committer patacongo <spudarnia@yahoo.com> Thu Apr 23 17:49:14 2020 -0600
tree 95494ec9c71e75cdae974c8a9220b4820d2dbcf3
parent ca367a259b89a1d289e15f9fdbb6e16c2d41471e

mm: Fix heap corruption in protected build

Signed-off-by: Masayuki Ishikawa <Masayuki.Ishikawa@jp.sony.com>

include/nuttx/mm/mm.h

diff --git a/include/nuttx/mm/mm.h b/include/nuttx/mm/mm.h
index 4536200..f448138 100644
--- a/include/nuttx/mm/mm.h
+++ b/include/nuttx/mm/mm.h
@@ -211,12 +211,10 @@
   FAR struct mm_freenode_s *blink;
 };
 
-#if defined(CONFIG_BUILD_FLAT) || defined(__KERNEL__)
 struct mm_delaynode_s
 {
   struct mm_delaynode_s *flink;
 };
-#endif
 
 /* What is the size of the freenode? */
 
@@ -258,11 +256,9 @@
 
   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 */
 
   struct mm_delaynode_s *mm_delaylist;
-#endif
 };
 
 /****************************************************************************

mm/mm_heap/mm_initialize.c

diff --git a/mm/mm_heap/mm_initialize.c b/mm/mm_heap/mm_initialize.c
index d96b7b1..fa41069 100644
--- a/mm/mm_heap/mm_initialize.c
+++ b/mm/mm_heap/mm_initialize.c
@@ -175,11 +175,9 @@
   heap->mm_nregions = 0;
 #endif
 
-#if defined(CONFIG_BUILD_FLAT) || defined(__KERNEL__)
   /* Initialize mm_delaylist */
 
   heap->mm_delaylist = NULL;
-#endif
 
   /* Initialize the node array */