src: fix largepages regression

Gabriel Schulhof · Gabriel Schulhof · commit 2b373bd27056 · 2020-03-05T14:06:05.000-08:00
During the addition of macOS support for large pages, a `memcpy` ended up under the wrong preprocessor directive. As a result, the newly allocated large pages were not initialized with a copy of the text section. Thanks to Suresh Srinivas <suresh.srinivas@intel.com>! PR-URL: nodejs#29914 Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl> Reviewed-By: James M Snell <jasnell@gmail.com> Reviewed-By: Colin Ihrig <cjihrig@gmail.com> Reviewed-By: David Carlier <devnexen@gmail.com>
diff --git a/src/large_pages/node_large_page.cc b/src/large_pages/node_large_page.cc
@@ -366,6 +366,7 @@ MoveTextRegionToLargePages(const text_region& r) {
     }
     return -1;
   }
+  memcpy(start, nmem, size);
 #elif defined(__FreeBSD__)
   tmem = mmap(start, size,
               PROT_READ | PROT_WRITE | PROT_EXEC,
@@ -400,8 +401,6 @@ MoveTextRegionToLargePages(const text_region& r) {
     return -1;
   }
   memcpy(start, tmem, size);
-#else
-  memcpy(start, nmem, size);
 #endif
 
   ret = mprotect(start, size, PROT_READ | PROT_EXEC);

Original file line number	Diff line number	Diff line change
`@@ -366,6 +366,7 @@ MoveTextRegionToLargePages(const text_region& r) {`
`366`	`366`	`}`
`367`	`367`	`return -1;`
`368`	`368`	`}`
	`369`	`+ memcpy(start, nmem, size);`
`369`	`370`	`#elif defined(__FreeBSD__)`
`370`	`371`	`tmem = mmap(start, size,`
`371`	`372`	`PROT_READ \| PROT_WRITE \| PROT_EXEC,`
`@@ -400,8 +401,6 @@ MoveTextRegionToLargePages(const text_region& r) {`
`400`	`401`	`return -1;`
`401`	`402`	`}`
`402`	`403`	`memcpy(start, tmem, size);`
`403`		`-#else`
`404`		`- memcpy(start, nmem, size);`
`405`	`404`	`#endif`
`406`	`405`
`407`	`406`	`ret = mprotect(start, size, PROT_READ \| PROT_EXEC);`