Merge branch '0.15-maintenance' into 0.16-maintenance

Author: Ericson2314

ChangeLog.md

@@ -22,6 +22,17 @@ Changes from 0.15.3:
 (These notes are the remainder of 0.16.0 that was not backported to 0.15.3.
 Originally, 0.16.0 was branched from 0.15.0, and those changes were fresh in this release, having never been backported.)
 
+## 0.15.5 (August 12, 2025)
+
+Bugfix backports from 0.18.0:
+
+* Adjust `roundUp` for 0 as input by @cgzones in https://github.com/NixOS/patchelf/pull/466
+
+Bugfix backports from 0.17.{0, 1}:
+
+* Fix page size constants for Itanium and SPARC.
+* Fix Out-of-bounds read in the function `modifySoname` by @yairKoskas in https://github.com/NixOS/patchelf/pull/451
+
 ## 0.15.4 (August 12, 2025)
 
 * Update to a later glibc `elf.h`.

src/patchelf.cc

@@ -322,14 +322,18 @@ unsigned int ElfFile<ElfFileParamNames>::getPageSize() const noexcept
     // requirements. There is no authoritative list of these values. The
     // current list is extracted from GNU gold's source code (abi_pagesize).
     switch (rdi(hdr()->e_machine)) {
-      case EM_SPARC:
+      case EM_IA_64:
       case EM_MIPS:
       case EM_PPC:
       case EM_PPC64:
       case EM_AARCH64:
       case EM_TILEGX:
       case EM_LOONGARCH:
         return 0x10000;
+      case EM_SPARC: // This should be sparc 32-bit. According to the linux
+                     // kernel 4KB should be also fine, but it seems that solaris is doing 8KB
+      case EM_SPARCV9: /* SPARC64 support */
+        return 0x2000;
       default:
         return 0x1000;
     }
@@ -431,6 +435,8 @@ static void writeFile(const std::string & fileName, const FileContents & content
 
 static uint64_t roundUp(uint64_t n, uint64_t m)
 {
+    if (n == 0)
+        return m;
     return ((n - 1) / m + 1) * m;
 }
 
@@ -1262,6 +1268,7 @@ void ElfFile<ElfFileParamNames>::modifySoname(sonameMode op, const std::string &
         if (rdi(dyn->d_tag) == DT_SONAME) {
             dynSoname = dyn;
             soname = strTab + rdi(dyn->d_un.d_val);
+            checkPointer(fileContents, strTab, rdi(dyn->d_un.d_val));
         }
     }
 

tests/set-rpath-library.sh

@@ -3,7 +3,7 @@ SCRATCH=scratch/$(basename "$0" .sh)
 
 if test "$(uname)" = FreeBSD; then
     echo "skipping on FreeBSD"
-    exit 0
+    exit 77
 fi
 
 rm -rf "${SCRATCH}"

tests/set-rpath-rel-map.sh

@@ -6,7 +6,7 @@ OBJCOPY=${OBJCOPY:-objcopy}
 
 if ! $OBJDUMP -p main | grep -q MIPS_RLD_MAP_REL; then
     echo "No MIPS_RLD_MAP_REL dynamic section entry, skipping"
-    exit 0
+    exit 77
 fi
 
 rm -rf "${SCRATCH}"