src: fix largepages regression

Gabriel Schulhof · targos · commit f3115c4d62b5 · 2019-11-10T14:50:07.000+01: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: #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
@@ -359,6 +359,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,
@@ -393,8 +394,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
`@@ -359,6 +359,7 @@ MoveTextRegionToLargePages(const text_region& r) {`
`359`	`359`	`}`
`360`	`360`	`return -1;`
`361`	`361`	`}`
	`362`	`+ memcpy(start, nmem, size);`
`362`	`363`	`#elif defined(__FreeBSD__)`
`363`	`364`	`tmem = mmap(start, size,`
`364`	`365`	`PROT_READ \| PROT_WRITE \| PROT_EXEC,`
`@@ -393,8 +394,6 @@ MoveTextRegionToLargePages(const text_region& r) {`
`393`	`394`	`return -1;`
`394`	`395`	`}`
`395`	`396`	`memcpy(start, tmem, size);`
`396`		`-#else`
`397`		`- memcpy(start, nmem, size);`
`398`	`397`	`#endif`
`399`	`398`
`400`	`399`	`ret = mprotect(start, size, PROT_READ \| PROT_EXEC);`