commit d73b5cafa0ef381f7c63a75e968fb7eec8e9f555
author Nick Kralevich <nnk@google.com> Fri Mar 16 11:38:58 2012 -0700
committer Nick Kralevich <nnk@google.com> Tue Mar 20 09:24:58 2012 -0700
tree d28334136a7a2580531c85ddc4ddaef7006675b3
parent adb6989786dcc7248d51a3a5a76221b93951f84a

linker: fix off-by-one error in GNU_RELRO handling

Fix a bug where the GNU_RELRO end address could be exactly
the end of the loadable segment.

Change-Id: If6c43acabc06e9aff9217c0f6016e158b28bb41f

linker/linker.c

diff --git a/linker/linker.c b/linker/linker.c
index 7463811..17d8555 100644
--- a/linker/linker.c
+++ b/linker/linker.c
@@ -1032,7 +1032,7 @@
             si->dynamic = (unsigned *)(base + phdr->p_vaddr);
         } else if (phdr->p_type == PT_GNU_RELRO) {
             if ((phdr->p_vaddr >= si->size)
-                    || ((phdr->p_vaddr + phdr->p_memsz) >= si->size)
+                    || ((phdr->p_vaddr + phdr->p_memsz) > si->size)
                     || ((base + phdr->p_vaddr + phdr->p_memsz) < base)) {
                 DL_ERR("%d invalid GNU_RELRO in '%s' "
                        "p_vaddr=0x%08x p_memsz=0x%08x", pid, si->name,
@@ -1781,7 +1781,7 @@
                 si->dynamic = (unsigned *) (si->base + phdr->p_vaddr);
             } else if (phdr->p_type == PT_GNU_RELRO) {
                 if ((phdr->p_vaddr >= si->size)
-                        || ((phdr->p_vaddr + phdr->p_memsz) >= si->size)
+                        || ((phdr->p_vaddr + phdr->p_memsz) > si->size)
                         || ((si->base + phdr->p_vaddr + phdr->p_memsz) < si->base)) {
                     DL_ERR("%d invalid GNU_RELRO in '%s' "
                            "p_vaddr=0x%08x p_memsz=0x%08x", pid, si->name,