- use proper macros

diff --git a/ldso/ldso/dl-elf.c b/ldso/ldso/dl-elf.c
index 2169eb5..ecaaa55 100644 (file)
--- 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 28f4341..f631fd9 100644 (file)
--- 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;