commit aac0dc97a9ad91231fa89878e745548d693366c1
author Nick Kralevich <nnk@google.com> Tue Mar 20 10:52:42 2012 -0700
committer Android (Google) Code Review <android-gerrit@google.com> Tue Mar 20 10:52:42 2012 -0700
tree f6e117bc03dc1662455d4cfc8c62245e697acbb8
parent 0814eea3ec6767e2957da9b32261ef52ec881fee
parent d73b5cafa0ef381f7c63a75e968fb7eec8e9f555

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

linker/linker.c

diff --git a/linker/linker.c b/linker/linker.c
index f365fb6..3a923c1 100644
--- a/linker/linker.c
+++ b/linker/linker.c
@@ -1030,7 +1030,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,
@@ -1779,7 +1779,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,