summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBernhard Reutner-Fischer <rep.dot.nop@gmail.com>2008-12-03 19:43:01 +0000
committerBernhard Reutner-Fischer <rep.dot.nop@gmail.com>2008-12-03 19:43:01 +0000
commit3cd5e0b1c930820627d85d58b77fc41d74db8822 (patch)
tree1e9ed413a5e20d3b6bf43971cb73170fcce0cd4f
parent5b174cbf6597468a3e78868ff175afd6579adcd7 (diff)
- use proper macros
-rw-r--r--ldso/ldso/dl-elf.c4
-rw-r--r--ldso/ldso/ldso.c2
2 files changed, 3 insertions, 3 deletions
diff --git a/ldso/ldso/dl-elf.c b/ldso/ldso/dl-elf.c
index 2169eb574..ecaaa552c 100644
--- a/ldso/ldso/dl-elf.c
+++ b/ldso/ldso/dl-elf.c
@@ -119,8 +119,8 @@ void
_dl_protect_relro (struct elf_resolve *l)
{
ElfW(Addr) base = (ElfW(Addr)) DL_RELOC_ADDR(l->loadaddr, l->relro_addr);
- ElfW(Addr) start = (base & ~(_dl_pagesize - 1));
- ElfW(Addr) end = ((base + l->relro_size) & ~(_dl_pagesize - 1));
+ ElfW(Addr) start = (base & PAGE_ALIGN);
+ ElfW(Addr) end = ((base + l->relro_size) & PAGE_ALIGN);
_dl_if_debug_dprint("RELRO protecting %s: start:%x, end:%x\n", l->libname, start, end);
if (start != end &&
_dl_mprotect ((void *) start, end - start, PROT_READ) < 0) {
diff --git a/ldso/ldso/ldso.c b/ldso/ldso/ldso.c
index 28f434147..f631fd983 100644
--- a/ldso/ldso/ldso.c
+++ b/ldso/ldso/ldso.c
@@ -914,7 +914,7 @@ void *_dl_malloc(size_t size)
The actual page size doesn't really matter; as long
as we're self-consistent here, we're safe. */
if (size < _dl_pagesize)
- rounded_size = (size + _dl_pagesize - 1) & _dl_pagesize;
+ rounded_size = (size + ADDR_ALIGN) & _dl_pagesize;
else
rounded_size = size;