Merge cherrypicks of ['android-review.googlesource.com/3019422'] into 24Q2-release.android-14.0.0_r54android-14.0.0_r53android-14.0.0_r52android-14.0.0_r51android-14.0.0_r50android14-qpr3-s2-releaseandroid14-qpr3-release

Change-Id: Ib0189f7e644ed6eae0821ba3cef1721b8521cf23

1 files changed, 10 insertions, 0 deletions

diff --git a/linker/linker_phdr.cpp b/linker/linker_phdr.cpp
index 82b37a44d..38c7e1569 100644
--- a/linker/linker_phdr.cpp
+++ b/linker/linker_phdr.cpp
@@ -724,6 +724,16 @@ bool ElfReader::ReadPadSegmentNote() {
       continue;
     }
 
+    // If the PT_NOTE extends beyond the file. The ELF is doing something
+    // strange -- obfuscation, embedding hidden loaders, ...
+    //
+    // It doesn't contain the pad_segment note. Skip it to avoid SIGBUS
+    // by accesses beyond the file.
+    off64_t note_end_off = file_offset_ + phdr->p_offset + phdr->p_filesz;
+    if (note_end_off > file_size_) {
+      continue;
+    }
+
     // note_fragment is scoped to within the loop so that there is
     // at most 1 PT_NOTE mapped at anytime during this search.
     MappedFileFragment note_fragment;