commit 296bd992b7918dcf27a1d67d16edeccececa0887
author Elliott Hughes <enh@google.com> Sat Jan 18 05:40:45 2025 -0800
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Sat Jan 18 05:40:45 2025 -0800
tree 568519f3e185417c5a5ac74b205a282c91a4ccaf
parent d5e064d698f10f6419e30fc5f3b162f0b4a6cdce
parent ec79de0907aeecfe4cb94cc1fb0510ba148eb8c5

Merge "Skip rather than reject invalid ELF notes for existing apps." into main

linker/linker_phdr.cpp

diff --git a/linker/linker_phdr.cpp b/linker/linker_phdr.cpp
index 086c867..2eadbf9 100644
--- a/linker/linker_phdr.cpp
+++ b/linker/linker_phdr.cpp
@@ -772,8 +772,14 @@
         __builtin_add_overflow(note_end_off, phdr->p_filesz, &note_end_off) ||
         phdr->p_filesz != phdr->p_memsz ||
         note_end_off > file_size_) {
-      DL_ERR("\"%s\": NT_ANDROID_TYPE_PAD_SEGMENT note runs off end of file",
-             name_.c_str());
+
+      if (get_application_target_sdk_version() < 37) {
+        // Some in-market apps have invalid ELF notes (http://b/390328213),
+        // so ignore them until/unless they bump their target sdk version.
+        continue;
+      }
+
+      DL_ERR_AND_LOG("\"%s\": NT_ANDROID_TYPE_PAD_SEGMENT note runs off end of file", name_.c_str());
       return false;
     }