diff options
| author | Carlos O'Donell <carlos@systemhalted.org> | 2015-09-18 09:27:45 -0400 |
|---|---|---|
| committer | Carlos O'Donell <carlos@systemhalted.org> | 2015-09-18 09:29:43 -0400 |
| commit | 60084e34b63a9ad5bdd7381bab2d7bc30db106c9 (patch) | |
| tree | 247360de9fca7bc481ab3eb890a06e2f6512af2a /elf | |
| parent | e952e1dfeb2a603ebd74ac5478a1218061ba893b (diff) | |
| download | glibc-60084e34b63a9ad5bdd7381bab2d7bc30db106c9.tar.gz glibc-60084e34b63a9ad5bdd7381bab2d7bc30db106c9.tar.xz glibc-60084e34b63a9ad5bdd7381bab2d7bc30db106c9.zip | |
Use ALIGN_* macros in _dl_map_object_from_fd.
Cleanup _dl_map_object_from_fd to make it clear exactly what we're doing with the mappings i.e. extending the the start of the map down to a page boundary, extending the end of the map up to a page boundary, and offset itself also to page boundary. The result is much easier to read as expected from the ALIGN_* cleanups.
Diffstat (limited to 'elf')
| -rw-r--r-- | elf/dl-load.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/elf/dl-load.c b/elf/dl-load.c index 0c052e449a..993a419bdd 100644 --- a/elf/dl-load.c +++ b/elf/dl-load.c @@ -36,6 +36,7 @@ #include <caller.h> #include <sysdep.h> #include <stap-probe.h> +#include <libc-internal.h> #include <dl-dst.h> #include <dl-load.h> @@ -1077,12 +1078,11 @@ _dl_map_object_from_fd (const char *name, int fd, struct filebuf *fbp, } struct loadcmd *c = &loadcmds[nloadcmds++]; - c->mapstart = ph->p_vaddr & ~(GLRO(dl_pagesize) - 1); - c->mapend = ((ph->p_vaddr + ph->p_filesz + GLRO(dl_pagesize) - 1) - & ~(GLRO(dl_pagesize) - 1)); + c->mapstart = ALIGN_DOWN (ph->p_vaddr, GLRO(dl_pagesize)); + c->mapend = ALIGN_UP (ph->p_vaddr + ph->p_filesz, GLRO(dl_pagesize)); c->dataend = ph->p_vaddr + ph->p_filesz; c->allocend = ph->p_vaddr + ph->p_memsz; - c->mapoff = ph->p_offset & ~(GLRO(dl_pagesize) - 1); + c->mapoff = ALIGN_DOWN (ph->p_offset, GLRO(dl_pagesize)); /* Determine whether there is a gap between the last segment and this one. */ |