[haiku-commits] BRANCH pdziepak-github.aslr - in src/system: kernel/vm runtime_loader
- From: pdziepak-github.aslr <community@xxxxxxxxxxxx>
- To: haiku-commits@xxxxxxxxxxxxx
- Date: Thu, 4 Apr 2013 04:15:37 +0200 (CEST)
added 1 changeset to branch 'refs/remotes/pdziepak-github/aslr'
old head: 866b168a4de69a59bfce082d213b0f07e606c1e0
new head: 9cb754e2bb7436b11615ca2e52e4073d8e913b1b
overview: https://github.com/pdziepak/Haiku/compare/866b168...9cb754e
----------------------------------------------------------------------------
9cb754e: vm: implement B_RANDOMIZED_IMAGE_ADDRESS address specification
On some 64 bit architectures program and library images have to be mapped in
the lower 2 GB of the address space (due to instruction pointer relative
addressing). Address specification B_RANDOMIZED_IMAGE_ADDRESS ensures that
created area satisfies that requirement.
[ Pawel Dziepak <pdziepak@xxxxxxxxxxx> ]
----------------------------------------------------------------------------
Commit: 9cb754e2bb7436b11615ca2e52e4073d8e913b1b
Author: Pawel Dziepak <pdziepak@xxxxxxxxxxx>
Date: Thu Apr 4 02:05:37 2013 UTC
----------------------------------------------------------------------------
5 files changed, 30 insertions(+), 9 deletions(-)
headers/os/kernel/OS.h | 1 +
src/system/kernel/vm/VMUserAddressSpace.cpp | 34 +++++++++++++++++++------
src/system/kernel/vm/VMUserAddressSpace.h | 1 +
src/system/kernel/vm/vm.cpp | 1 +
src/system/runtime_loader/images.cpp | 2 +-
----------------------------------------------------------------------------
diff --git a/headers/os/kernel/OS.h b/headers/os/kernel/OS.h
index eac7b7b..9d59167 100644
--- a/headers/os/kernel/OS.h
+++ b/headers/os/kernel/OS.h
@@ -81,6 +81,7 @@ typedef struct area_info {
/* B_ANY_KERNEL_BLOCK_ADDRESS 5 */
#define B_RANDOMIZED_ANY_ADDRESS 6
#define B_RANDOMIZED_BASE_ADDRESS 7
+#define B_RANDOMIZED_IMAGE_ADDRESS 8
/* area protection */
#define B_READ_AREA 1
diff --git a/src/system/kernel/vm/VMUserAddressSpace.cpp
b/src/system/kernel/vm/VMUserAddressSpace.cpp
index 1933eb6..ffb8b62 100644
--- a/src/system/kernel/vm/VMUserAddressSpace.cpp
+++ b/src/system/kernel/vm/VMUserAddressSpace.cpp
@@ -36,6 +36,7 @@ const addr_t VMUserAddressSpace::kMaxInitialRandomize =
0x20000000000ul;
const addr_t VMUserAddressSpace::kMaxRandomize = 0x800000ul;
const addr_t VMUserAddressSpace::kMaxInitialRandomize = 0x2000000ul;
#endif
+const addr_t VMUserAddressSpace::kImageEndAddress = 0x7ffffffful;
/*! Verifies that an area with the given aligned base and size fits into
@@ -69,6 +70,15 @@ log2(uint32_t v)
}
+static inline bool
+is_randomized(uint32 addressSpec)
+{
+ return addressSpec == B_RANDOMIZED_ANY_ADDRESS
+ || addressSpec == B_RANDOMIZED_BASE_ADDRESS
+ || addressSpec == B_RANDOMIZED_IMAGE_ADDRESS;
+}
+
+
VMUserAddressSpace::VMUserAddressSpace(team_id id, addr_t base, size_t size)
:
VMAddressSpace(id, base, size, "address space"),
@@ -183,6 +193,11 @@ VMUserAddressSpace::InsertArea(VMArea* _area, size_t size,
searchEnd = fEndAddress;
break;
+ case B_RANDOMIZED_IMAGE_ADDRESS:
+ searchBase = (addr_t)addressRestrictions->address;
+ searchEnd = min_c(fEndAddress, kImageEndAddress);
+ break;
+
default:
return B_BAD_VALUE;
}
@@ -561,7 +576,9 @@ VMUserAddressSpace::_InsertAreaSlot(addr_t start, addr_t
size, addr_t end,
start = ROUNDUP(start, alignment);
- if (addressSpec == B_RANDOMIZED_BASE_ADDRESS) {
+ if (addressSpec == B_RANDOMIZED_BASE_ADDRESS
+ || addressSpec == B_RANDOMIZED_IMAGE_ADDRESS) {
+
originalStart = start;
start = _RandomizeAddress(start, end - size, alignment, true);
}
@@ -594,7 +611,7 @@ second_chance:
addr_t nextBase = next == NULL ? end :
next->Base();
if (is_valid_spot(start, alignedBase, size,
nextBase)) {
- if (addressSpec ==
B_RANDOMIZED_ANY_ADDRESS) {
+ if (is_randomized(addressSpec)) {
alignedBase =
_RandomizeAddress(alignedBase,
nextBase - size,
alignment);
}
@@ -615,7 +632,7 @@ second_chance:
if (is_valid_spot(last->Base() + (last->Size()
- 1),
alignedBase, size,
next->Base())) {
- if (addressSpec ==
B_RANDOMIZED_ANY_ADDRESS) {
+ if (is_randomized(addressSpec)) {
alignedBase =
_RandomizeAddress(alignedBase,
next->Base() - size,
alignment);
}
@@ -637,7 +654,7 @@ second_chance:
if (is_valid_spot(last->Base() + (last->Size() - 1),
alignedBase,
size, end)) {
- if (addressSpec == B_RANDOMIZED_ANY_ADDRESS) {
+ if (is_randomized(addressSpec)) {
alignedBase =
_RandomizeAddress(alignedBase, end - size,
alignment);
}
@@ -677,7 +694,7 @@ second_chance:
&& alignedBase == next->Base()
&& next->Size() >= size) {
- if (addressSpec ==
B_RANDOMIZED_ANY_ADDRESS) {
+ if (is_randomized(addressSpec))
{
alignedBase =
_RandomizeAddress(next->Base(),
next->Size() -
size, alignment);
}
@@ -699,7 +716,7 @@ second_chance:
// reserved area, and the
reserved area will be resized
// to make space
- if (addressSpec ==
B_RANDOMIZED_ANY_ADDRESS) {
+ if (is_randomized(addressSpec))
{
addr_t alignedNextBase
= ROUNDUP(next->Base(),
alignment);
@@ -731,6 +748,7 @@ second_chance:
case B_BASE_ADDRESS:
case B_RANDOMIZED_BASE_ADDRESS:
+ case B_RANDOMIZED_IMAGE_ADDRESS:
{
// find a hole big enough for a new area beginning with
"start"
if (last == NULL) {
@@ -765,7 +783,7 @@ second_chance:
area->SetBase(start);
else {
start = lastEnd + 1;
- if (addressSpec ==
B_RANDOMIZED_BASE_ADDRESS) {
+ if (is_randomized(addressSpec)) {
addr_t spaceEnd = end;
if (next != NULL)
spaceEnd = next->Base();
@@ -781,7 +799,7 @@ second_chance:
// we didn't find a free spot in the requested range,
so we'll
// try again without any restrictions
- if (addressSpec != B_RANDOMIZED_BASE_ADDRESS) {
+ if (!is_randomized(addressSpec)) {
start = fBase;
addressSpec = B_ANY_ADDRESS;
} else if (originalStart == 0) {
diff --git a/src/system/kernel/vm/VMUserAddressSpace.h
b/src/system/kernel/vm/VMUserAddressSpace.h
index 0aa4261..8bd04bc 100644
--- a/src/system/kernel/vm/VMUserAddressSpace.h
+++ b/src/system/kernel/vm/VMUserAddressSpace.h
@@ -67,6 +67,7 @@ private:
private:
static const addr_t kMaxRandomize;
static const addr_t kMaxInitialRandomize;
+ static const addr_t kImageEndAddress;
VMUserAreaList fAreas;
mutable VMUserArea* fAreaHint;
diff --git a/src/system/kernel/vm/vm.cpp b/src/system/kernel/vm/vm.cpp
index f9a2f4d..a730c0e 100644
--- a/src/system/kernel/vm/vm.cpp
+++ b/src/system/kernel/vm/vm.cpp
@@ -1226,6 +1226,7 @@ vm_create_anonymous_area(team_id team, const char *name,
addr_t size,
case B_ANY_KERNEL_BLOCK_ADDRESS:
case B_RANDOMIZED_ANY_ADDRESS:
case B_RANDOMIZED_BASE_ADDRESS:
+ case B_RANDOMIZED_IMAGE_ADDRESS:
break;
default:
diff --git a/src/system/runtime_loader/images.cpp
b/src/system/runtime_loader/images.cpp
index d7323aa..96a3ea9 100644
--- a/src/system/runtime_loader/images.cpp
+++ b/src/system/runtime_loader/images.cpp
@@ -173,7 +173,7 @@ get_image_region_load_address(image_t* image, uint32 index,
int32 lastDelta,
if (index == 0) {
// but only the first segment gets a free ride
loadAddress = RLD_PROGRAM_BASE;
- addressSpecifier = B_RANDOMIZED_BASE_ADDRESS;
+ addressSpecifier = B_RANDOMIZED_IMAGE_ADDRESS;
} else {
loadAddress = image->regions[index].vmstart + lastDelta;
addressSpecifier = B_EXACT_ADDRESS;
Other related posts:
- » [haiku-commits] BRANCH pdziepak-github.aslr - in src/system: kernel/vm runtime_loader - pdziepak-github . aslr
