commit 4084b555b2658f6bdbcb64781b3ff6d478228221
author Kalesh Singh <kaleshsingh@google.com> Wed Mar 13 13:35:49 2024 -0700
committer Kalesh Singh <kaleshsingh@google.com> Wed Mar 13 13:37:30 2024 -0700
tree 0f1907124dfcc54e293fd78b86fd31b098b8f0f5
parent 60573deb7242de790f80f1895648152a5ecd148b

Reapply "RELAND: bionic: loader: Extend LOAD segment VMAs"

This reverts commit 7a04fedc78a1355ffad5cedbe7b0195236d26a46.

Test: Dexcom G7 app
Bug: 328797737
Change-Id: I575d626b1313d1c66bf25f29c43a9a101024a4f8
Signed-off-by: Kalesh Singh <kaleshsingh@google.com>

linker/linker_relocate.cpp

diff --git a/linker/linker_relocate.cpp b/linker/linker_relocate.cpp
index 952dade..5b58895 100644
--- a/linker/linker_relocate.cpp
+++ b/linker/linker_relocate.cpp
@@ -187,7 +187,8 @@
   auto protect_segments = [&]() {
     // Make .text executable.
     if (phdr_table_protect_segments(relocator.si->phdr, relocator.si->phnum,
-                                    relocator.si->load_bias) < 0) {
+                                    relocator.si->load_bias,
+                                    relocator.si->should_pad_segments()) < 0) {
       DL_ERR("can't protect segments for \"%s\": %s",
              relocator.si->get_realpath(), strerror(errno));
       return false;
@@ -197,7 +198,8 @@
   auto unprotect_segments = [&]() {
     // Make .text writable.
     if (phdr_table_unprotect_segments(relocator.si->phdr, relocator.si->phnum,
-                                      relocator.si->load_bias) < 0) {
+                                      relocator.si->load_bias,
+                                      relocator.si->should_pad_segments()) < 0) {
       DL_ERR("can't unprotect loadable segments for \"%s\": %s",
              relocator.si->get_realpath(), strerror(errno));
       return false;