patchelf 1.6.2 → 1.6.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 64cae3b6070bf26b6716a82886fcb183f20213bf0c396501141e93c1e7951ffa
-  data.tar.gz: 49793e2b2bf154c0d4ff70f1533130495a0161db418248fc39105997159c59c8
+  metadata.gz: 72b60be48f5040899d73767baf55e3e4338578e3301c91116a9769a396f28788
+  data.tar.gz: 454399ea53bcbd52931102451dfaac13da564ded12675829e92b80eff77668f2
 SHA512:
-  metadata.gz: d6b6dc9f7caa90f2abe18013a778e4ede2206f848e377e3cfce635b83ffc75b4dbc66c9b318899040bffa9553e8f0820cab95f92af445adc783efbbe47e0395f
-  data.tar.gz: b9566cc7487e8225e07f5ea7a29698e1d280969fde9f93ef0c0b1cd08d11595e92243883ed6123ef3918c1776003939c16a49d89aed6fc5da7a685e92a4a6a5a
+  metadata.gz: d8741f0b203ce8592936f3305305214fff490f64caa145dda380e3d65cbc95809868871c137ef68a674956438a3ea7eac8640b68707ad7146d98f5c90170fedb
+  data.tar.gz: b903bcccd2d07f03470c3915616f26b0d98027c5ffe79c63578b2aa1feb25123a990ea9617f4cc6b4d8796d3caf7832fe2aa6b5e8d52d91e89d9a4700a24497d

data/lib/patchelf/helper.rb

@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
+require 'elftools/constants'
+
 module PatchELF
   # Helper methods for internal usage.
   module Helper
@@ -17,7 +19,8 @@ module PatchELF
     def page_size(e_machine = nil)
       # Different architectures have different minimum section alignments.
       case e_machine
-      when ELFTools::Constants::EM_SPARC,
+      when ELFTools::Constants::EM_ALPHA,
+           ELFTools::Constants::EM_IA_64,
            ELFTools::Constants::EM_MIPS,
            ELFTools::Constants::EM_PPC,
            ELFTools::Constants::EM_PPC64,
@@ -25,6 +28,9 @@ module PatchELF
            ELFTools::Constants::EM_TILEGX,
            ELFTools::Constants::EM_LOONGARCH
         0x10000
+      when ELFTools::Constants::EM_SPARC,
+           ELFTools::Constants::EM_SPARCV9
+        0x2000
       else
         0x1000
       end

data/lib/patchelf/mm.rb

@@ -105,12 +105,19 @@ module PatchELF
       #=>
       # |  1      | |  2  |
       # |  1      |    |  2  |
-      idx = find_gap(check_sz: false) { |prv, nxt| PatchELF::Helper.aligndown(nxt.mem_head) - prv.mem_tail }
+      extension = PatchELF::Helper.alignup(@request_size, page_size)
+      idx = find_gap(check_sz: false) do |prv, nxt|
+        gap = PatchELF::Helper.aligndown(nxt.mem_head, page_size) - prv.mem_tail
+        # Forward growth moves the entire mapping back by the rounded extension.
+        next 0 if !writable?(prv) && gap < extension
+
+        gap
+      end
       return false if idx.nil?
 
       loads = load_segments
       @threshold = loads[idx].file_head
-      @extend_size = PatchELF::Helper.alignup(@request_size)
+      @extend_size = extension
       shift_attributes
       # prefer backward than forward
       return extend_backward?(loads[idx - 1]) if writable?(loads[idx - 1])
@@ -160,8 +167,12 @@ module PatchELF
         next unless seg.header.p_offset >= threshold
 
         seg.header.p_offset += extend_size
-        # We have to change align of LOAD segment since ld.so checks it.
-        seg.header.p_align = Helper.page_size if seg.is_a?(ELFTools::Segments::LoadSegment)
+        # Preserve a valid alignment; ld.so requires LOAD addresses to be congruent.
+        next unless seg.is_a?(ELFTools::Segments::LoadSegment) &&
+                    seg.header.p_align.nonzero? &&
+                    ((seg.header.p_vaddr - seg.header.p_offset) % seg.header.p_align).nonzero?
+
+        seg.header.p_align = page_size
       end
 
       @elf.header.e_shoff += extend_size if @elf.header.e_shoff >= threshold
@@ -179,6 +190,10 @@ module PatchELF
       end
     end
 
+    def page_size
+      Helper.page_size(@elf.header.e_machine)
+    end
+
     def abnormal_elf(msg)
       raise ArgumentError, msg
     end

data/lib/patchelf/version.rb

@@ -2,5 +2,5 @@
 
 module PatchELF
   # Current gem version.
-  VERSION = '1.6.2'
+  VERSION = '1.6.3'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: patchelf
 version: !ruby/object:Gem::Version
-  version: 1.6.2
+  version: 1.6.3
 platform: ruby
 authors:
 - david942j