[haiku-commits] BRANCH pdziepak-github.aslr - src/system/runtime_loader

  • From: pdziepak-github.aslr <community@xxxxxxxxxxxx>
  • To: haiku-commits@xxxxxxxxxxxxx
  • Date: Tue, 16 Apr 2013 03:00:32 +0200 (CEST)

added 1 changeset to branch 'refs/remotes/pdziepak-github/aslr'
old head: db1ca60528285ea0c6620a5acac93c083fbbca6a
new head: 9f3bd49737df7fedbf89ed90570ac1a965814c2b
overview: https://github.com/pdziepak/Haiku/compare/db1ca60...9f3bd49

----------------------------------------------------------------------------

9f3bd49: runtime_loader: explicitly randomize rld_heap and _rld_debug_ positions

                                    [ Pawel Dziepak <pdziepak@xxxxxxxxxxx> ]

----------------------------------------------------------------------------

Commit:      9f3bd49737df7fedbf89ed90570ac1a965814c2b
Author:      Pawel Dziepak <pdziepak@xxxxxxxxxxx>
Date:        Tue Apr 16 00:44:47 2013 UTC

----------------------------------------------------------------------------

2 files changed, 3 insertions(+), 3 deletions(-)
src/system/runtime_loader/elf.cpp  | 2 +-
src/system/runtime_loader/heap.cpp | 4 ++--

----------------------------------------------------------------------------

diff --git a/src/system/runtime_loader/elf.cpp 
b/src/system/runtime_loader/elf.cpp
index 9415d73..edaf863 100644
--- a/src/system/runtime_loader/elf.cpp
+++ b/src/system/runtime_loader/elf.cpp
@@ -1031,7 +1031,7 @@ rldelf_init(void)
 
                runtime_loader_debug_area *area;
                area_id areaID = 
_kern_create_area(RUNTIME_LOADER_DEBUG_AREA_NAME,
-                       (void **)&area, B_ANY_ADDRESS, size, B_NO_LOCK,
+                       (void **)&area, B_RANDOMIZED_ANY_ADDRESS, size, 
B_NO_LOCK,
                        B_READ_AREA | B_WRITE_AREA);
                if (areaID < B_OK) {
                        FATAL("Failed to create debug area.\n");
diff --git a/src/system/runtime_loader/heap.cpp 
b/src/system/runtime_loader/heap.cpp
index 02dc286..8cd57ab 100644
--- a/src/system/runtime_loader/heap.cpp
+++ b/src/system/runtime_loader/heap.cpp
@@ -178,8 +178,8 @@ static status_t
 add_area(size_t size)
 {
        void *base;
-       area_id area = _kern_create_area("rld heap", &base, B_ANY_ADDRESS, size,
-               B_NO_LOCK, B_READ_AREA | B_WRITE_AREA);
+       area_id area = _kern_create_area("rld heap", &base,
+               B_RANDOMIZED_ANY_ADDRESS, size, B_NO_LOCK, B_READ_AREA | 
B_WRITE_AREA);
        if (area < B_OK)
                return area;
 


Other related posts: