fix adjusting startPage

[bartosh]

startPage is adjusted unconditionally for all executables.
This results in incorrect addresses assigned to INTERP and LOAD
program headers, which breaks patched executable.

Adjusting startPage variable only when startOffset > startPage
should fix this.

This change is related to the issue #10

Signed-off-by: Ed Bartosh ed.bartosh@linux.intel.com

[domenkozar]

cc @edolstra

[domenkozar]

Can you provide a test case? For me, applying patchelf on rescuetime and then stripping, even with this patch fails with:

$ /nix/store/7i2vzpxy2fifprh0c0ga2wrcdd6gjya7-rescuetime-2.10.0.1322/bin/rescuetime 
/nix/store/7i2vzpxy2fifprh0c0ga2wrcdd6gjya7-rescuetime-2.10.0.1322/bin/rescuetime: /nix/store/7i2vzpxy2fifprh0c0ga2wrcdd6gjya7-rescuetime-2.10.0.1322/bin/rescuetime: no version information available (required by /nix/store/7i2vzpxy2fifprh0c0ga2wrcdd6gjya7-rescuetime-2.10.0.1322/bin/rescuetime)
/nix/store/7i2vzpxy2fifprh0c0ga2wrcdd6gjya7-rescuetime-2.10.0.1322/bin/rescuetime: /nix/store/7i2vzpxy2fifprh0c0ga2wrcdd6gjya7-rescuetime-2.10.0.1322/bin/rescuetime: no version information available (required by /nix/store/7i2vzpxy2fifprh0c0ga2wrcdd6gjya7-rescuetime-2.10.0.1322/bin/rescuetime)
/nix/store/7i2vzpxy2fifprh0c0ga2wrcdd6gjya7-rescuetime-2.10.0.1322/bin/rescuetime: /nix/store/7i2vzpxy2fifprh0c0ga2wrcdd6gjya7-rescuetime-2.10.0.1322/bin/rescuetime: no version information available (required by /nix/store/7i2vzpxy2fifprh0c0ga2wrcdd6gjya7-rescuetime-2.10.0.1322/bin/rescuetime)
/nix/store/7i2vzpxy2fifprh0c0ga2wrcdd6gjya7-rescuetime-2.10.0.1322/bin/rescuetime: /nix/store/7i2vzpxy2fifprh0c0ga2wrcdd6gjya7-rescuetime-2.10.0.1322/bin/rescuetime: no version information available (required by /nix/store/7i2vzpxy2fifprh0c0ga2wrcdd6gjya7-rescuetime-2.10.0.1322/bin/rescuetime)
/nix/store/7i2vzpxy2fifprh0c0ga2wrcdd6gjya7-rescuetime-2.10.0.1322/bin/rescuetime: /nix/store/7i2vzpxy2fifprh0c0ga2wrcdd6gjya7-rescuetime-2.10.0.1322/bin/rescuetime: no version information available (required by /nix/store/7i2vzpxy2fifprh0c0ga2wrcdd6gjya7-rescuetime-2.10.0.1322/bin/rescuetime)
/nix/store/7i2vzpxy2fifprh0c0ga2wrcdd6gjya7-rescuetime-2.10.0.1322/bin/rescuetime: /nix/store/7i2vzpxy2fifprh0c0ga2wrcdd6gjya7-rescuetime-2.10.0.1322/bin/rescuetime: no version information available (required by /nix/store/7i2vzpxy2fifprh0c0ga2wrcdd6gjya7-rescuetime-2.10.0.1322/bin/rescuetime)
/nix/store/7i2vzpxy2fifprh0c0ga2wrcdd6gjya7-rescuetime-2.10.0.1322/bin/rescuetime: /nix/store/7i2vzpxy2fifprh0c0ga2wrcdd6gjya7-rescuetime-2.10.0.1322/bin/rescuetime: no version information available (required by /nix/store/7i2vzpxy2fifprh0c0ga2wrcdd6gjya7-rescuetime-2.10.0.1322/bin/rescuetime)
/nix/store/7i2vzpxy2fifprh0c0ga2wrcdd6gjya7-rescuetime-2.10.0.1322/bin/rescuetime: /nix/store/7i2vzpxy2fifprh0c0ga2wrcdd6gjya7-rescuetime-2.10.0.1322/bin/rescuetime: no version information available (required by /nix/store/7i2vzpxy2fifprh0c0ga2wrcdd6gjya7-rescuetime-2.10.0.1322/bin/rescuetime)
/nix/store/7i2vzpxy2fifprh0c0ga2wrcdd6gjya7-rescuetime-2.10.0.1322/bin/rescuetime: /nix/store/7i2vzpxy2fifprh0c0ga2wrcdd6gjya7-rescuetime-2.10.0.1322/bin/rescuetime: no version information available (required by /nix/store/7i2vzpxy2fifprh0c0ga2wrcdd6gjya7-rescuetime-2.10.0.1322/bin/rescuetime)
/nix/store/7i2vzpxy2fifprh0c0ga2wrcdd6gjya7-rescuetime-2.10.0.1322/bin/rescuetime: /nix/store/7i2vzpxy2fifprh0c0ga2wrcdd6gjya7-rescuetime-2.10.0.1322/bin/rescuetime: no version information available (required by /nix/store/7i2vzpxy2fifprh0c0ga2wrcdd6gjya7-rescuetime-2.10.0.1322/bin/rescuetime)
/nix/store/7i2vzpxy2fifprh0c0ga2wrcdd6gjya7-rescuetime-2.10.0.1322/bin/rescuetime: /nix/store/7i2vzpxy2fifprh0c0ga2wrcdd6gjya7-rescuetime-2.10.0.1322/bin/rescuetime: no version information available (required by /nix/store/7i2vzpxy2fifprh0c0ga2wrcdd6gjya7-rescuetime-2.10.0.1322/bin/rescuetime)
/nix/store/7i2vzpxy2fifprh0c0ga2wrcdd6gjya7-rescuetime-2.10.0.1322/bin/rescuetime: /nix/store/7i2vzpxy2fifprh0c0ga2wrcdd6gjya7-rescuetime-2.10.0.1322/bin/rescuetime: no version information available (required by /nix/store/7i2vzpxy2fifprh0c0ga2wrcdd6gjya7-rescuetime-2.10.0.1322/bin/rescuetime)
/nix/store/7i2vzpxy2fifprh0c0ga2wrcdd6gjya7-rescuetime-2.10.0.1322/bin/rescuetime: /nix/store/7i2vzpxy2fifprh0c0ga2wrcdd6gjya7-rescuetime-2.10.0.1322/bin/rescuetime: no version information available (required by /nix/store/7i2vzpxy2fifprh0c0ga2wrcdd6gjya7-rescuetime-2.10.0.1322/bin/rescuetime)
/nix/store/7i2vzpxy2fifprh0c0ga2wrcdd6gjya7-rescuetime-2.10.0.1322/bin/rescuetime: /nix/store/7i2vzpxy2fifprh0c0ga2wrcdd6gjya7-rescuetime-2.10.0.1322/bin/rescuetime: no version information available (required by /nix/store/7i2vzpxy2fifprh0c0ga2wrcdd6gjya7-rescuetime-2.10.0.1322/bin/rescuetime)
/nix/store/7i2vzpxy2fifprh0c0ga2wrcdd6gjya7-rescuetime-2.10.0.1322/bin/rescuetime: relocation error: /nix/store/7i2vzpxy2fifprh0c0ga2wrcdd6gjya7-rescuetime-2.10.0.1322/bin/rescuetime: symbol , version  not defined in file  with link time reference

[rpurdie]

FWIW Yocto Project has been using this patch for a few years now, we'd love to see it merged and in any new releases.