2018-02-01 21:54:18 +00:00
|
|
|
declare -a autoPatchelfLibs
|
|
|
|
|
|
|
|
gatherLibraries() {
|
|
|
|
autoPatchelfLibs+=("$1/lib")
|
|
|
|
}
|
|
|
|
|
|
|
|
addEnvHooks "$targetOffset" gatherLibraries
|
|
|
|
|
|
|
|
isExecutable() {
|
autoPatchelfHook: Correctly detect PIE binaries
I originally thought it would just be enough to just check for an INTERP
section in isExecutable, however this would mean that we don't detect
statically linked ELF files, which would break our recent improvement to
gracefully handle those.
In theory, we are only interested in ELF files that have an INTERP
section, so checking for INTERP would be enough. Unfortunately the
isExecutable function is already used outside of autoPatchelfHook, so we
can't easily get rid of it now, so let's actually strive for more
correctness and make isExecutable actually match ELF files that are
executable.
So what we're doing instead now is to check whether either the ELF type
is EXEC *or* we have an INTERP section and if one of them is true we
should have an ELF executable, even if it's statically linked.
Along the way I also set LANG=C for the invocations of readelf, just to
be sure we don't get locale-dependent output.
Tested this with the following command (which contains almost[1] all the
packages using autoPatchelfHook), checking whether we run into any
library-related errors:
nix-build -E 'with import ./. { config.allowUnfree = true; };
runCommand "test-executables" {
drvs = [
anydesk cups-kyodialog3 elasticsearch franz gurobi
masterpdfeditor oracle-instantclient powershell reaper
sourcetrail teamviewer unixODBCDrivers.msodbcsql17 virtlyst
vk-messenger wavebox zoom-us
];
} ("for i in $drvs; do for b in $i/bin/*; do " +
"[ -x \"$b\" ] && timeout 10 \"$b\" || :; done; done")
'
Apart from testing against library-related errors I also compared the
resulting store paths against the ones prior to this commit. Only
anydesk and virtlyst had the same as they didn't have self-references,
everything else differed only because of self-references, except
elasticsearch, which had the following PIE binaries:
* modules/x-pack/x-pack-ml/platform/linux-x86_64/bin/autoconfig
* modules/x-pack/x-pack-ml/platform/linux-x86_64/bin/autodetect
* modules/x-pack/x-pack-ml/platform/linux-x86_64/bin/categorize
* modules/x-pack/x-pack-ml/platform/linux-x86_64/bin/controller
* modules/x-pack/x-pack-ml/platform/linux-x86_64/bin/normalize
These binaries were now patched, which is what this commit is all about.
[1]: I didn't include the "maxx" package (MaXX Interactive Desktop)
because the upstream URLs are no longer existing and I couldn't
find them elsewhere on the web.
Signed-off-by: aszlig <aszlig@nix.build>
Fixes: https://github.com/NixOS/nixpkgs/issues/48330
Cc: @gnidorah (for MaXX Interactive Desktop)
2018-11-03 03:50:26 +00:00
|
|
|
# For dynamically linked ELF files it would be enough to check just for the
|
|
|
|
# INTERP section. However, we won't catch statically linked executables as
|
|
|
|
# they only have an ELF type of EXEC but no INTERP.
|
|
|
|
#
|
|
|
|
# So what we do here is just check whether *either* the ELF type is EXEC
|
|
|
|
# *or* there is an INTERP section. This also catches position-independent
|
|
|
|
# executables, as they typically have an INTERP section but their ELF type
|
|
|
|
# is DYN.
|
|
|
|
LANG=C readelf -h -l "$1" 2> /dev/null \
|
|
|
|
| grep -q '^ *Type: *EXEC\>\|^ *INTERP\>'
|
2018-02-01 21:54:18 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
# We cache dependencies so that we don't need to search through all of them on
|
|
|
|
# every consecutive call to findDependency.
|
|
|
|
declare -a cachedDependencies
|
|
|
|
|
|
|
|
addToDepCache() {
|
|
|
|
local existing
|
|
|
|
for existing in "${cachedDependencies[@]}"; do
|
|
|
|
if [ "$existing" = "$1" ]; then return; fi
|
|
|
|
done
|
|
|
|
cachedDependencies+=("$1")
|
|
|
|
}
|
|
|
|
|
|
|
|
declare -gi depCacheInitialised=0
|
|
|
|
declare -gi doneRecursiveSearch=0
|
|
|
|
declare -g foundDependency
|
|
|
|
|
|
|
|
getDepsFromSo() {
|
|
|
|
ldd "$1" 2> /dev/null | sed -n -e 's/[^=]*=> *\(.\+\) \+([^)]*)$/\1/p'
|
|
|
|
}
|
|
|
|
|
|
|
|
populateCacheWithRecursiveDeps() {
|
|
|
|
local so found foundso
|
|
|
|
for so in "${cachedDependencies[@]}"; do
|
|
|
|
for found in $(getDepsFromSo "$so"); do
|
|
|
|
local libdir="${found%/*}"
|
|
|
|
local base="${found##*/}"
|
|
|
|
local soname="${base%.so*}"
|
|
|
|
for foundso in "${found%/*}/$soname".so*; do
|
|
|
|
addToDepCache "$foundso"
|
|
|
|
done
|
|
|
|
done
|
|
|
|
done
|
|
|
|
}
|
|
|
|
|
|
|
|
getSoArch() {
|
|
|
|
objdump -f "$1" | sed -ne 's/^architecture: *\([^,]\+\).*/\1/p'
|
|
|
|
}
|
|
|
|
|
|
|
|
# NOTE: If you want to use this function outside of the autoPatchelf function,
|
|
|
|
# keep in mind that the dependency cache is only valid inside the subshell
|
|
|
|
# spawned by the autoPatchelf function, so invoking this directly will possibly
|
|
|
|
# rebuild the dependency cache. See the autoPatchelf function below for more
|
|
|
|
# information.
|
|
|
|
findDependency() {
|
|
|
|
local filename="$1"
|
|
|
|
local arch="$2"
|
|
|
|
local lib dep
|
|
|
|
|
|
|
|
if [ $depCacheInitialised -eq 0 ]; then
|
|
|
|
for lib in "${autoPatchelfLibs[@]}"; do
|
|
|
|
for so in "$lib/"*.so*; do addToDepCache "$so"; done
|
|
|
|
done
|
|
|
|
depCacheInitialised=1
|
|
|
|
fi
|
|
|
|
|
|
|
|
for dep in "${cachedDependencies[@]}"; do
|
|
|
|
if [ "$filename" = "${dep##*/}" ]; then
|
|
|
|
if [ "$(getSoArch "$dep")" = "$arch" ]; then
|
|
|
|
foundDependency="$dep"
|
|
|
|
return 0
|
|
|
|
fi
|
|
|
|
fi
|
|
|
|
done
|
|
|
|
|
|
|
|
# Populate the dependency cache with recursive dependencies *only* if we
|
|
|
|
# didn't find the right dependency so far and afterwards run findDependency
|
|
|
|
# again, but this time with $doneRecursiveSearch set to 1 so that it won't
|
|
|
|
# recurse again (and thus infinitely).
|
|
|
|
if [ $doneRecursiveSearch -eq 0 ]; then
|
|
|
|
populateCacheWithRecursiveDeps
|
|
|
|
doneRecursiveSearch=1
|
|
|
|
findDependency "$filename" "$arch" || return 1
|
|
|
|
return 0
|
|
|
|
fi
|
|
|
|
return 1
|
|
|
|
}
|
|
|
|
|
|
|
|
autoPatchelfFile() {
|
|
|
|
local dep rpath="" toPatch="$1"
|
|
|
|
|
|
|
|
local interpreter="$(< "$NIX_CC/nix-support/dynamic-linker")"
|
|
|
|
if isExecutable "$toPatch"; then
|
|
|
|
patchelf --set-interpreter "$interpreter" "$toPatch"
|
|
|
|
if [ -n "$runtimeDependencies" ]; then
|
|
|
|
for dep in $runtimeDependencies; do
|
|
|
|
rpath="$rpath${rpath:+:}$dep/lib"
|
|
|
|
done
|
|
|
|
fi
|
|
|
|
fi
|
|
|
|
|
|
|
|
echo "searching for dependencies of $toPatch" >&2
|
|
|
|
|
|
|
|
# We're going to find all dependencies based on ldd output, so we need to
|
|
|
|
# clear the RPATH first.
|
|
|
|
patchelf --remove-rpath "$toPatch"
|
|
|
|
|
|
|
|
local missing="$(
|
|
|
|
ldd "$toPatch" 2> /dev/null | \
|
|
|
|
sed -n -e 's/^[\t ]*\([^ ]\+\) => not found.*/\1/p'
|
|
|
|
)"
|
|
|
|
|
|
|
|
# This ensures that we get the output of all missing dependencies instead
|
|
|
|
# of failing at the first one, because it's more useful when working on a
|
|
|
|
# new package where you don't yet know its dependencies.
|
|
|
|
local -i depNotFound=0
|
|
|
|
|
|
|
|
for dep in $missing; do
|
|
|
|
echo -n " $dep -> " >&2
|
|
|
|
if findDependency "$dep" "$(getSoArch "$toPatch")"; then
|
|
|
|
rpath="$rpath${rpath:+:}${foundDependency%/*}"
|
|
|
|
echo "found: $foundDependency" >&2
|
|
|
|
else
|
|
|
|
echo "not found!" >&2
|
|
|
|
depNotFound=1
|
|
|
|
fi
|
|
|
|
done
|
|
|
|
|
|
|
|
# This makes sure the builder fails if we didn't find a dependency, because
|
|
|
|
# the stdenv setup script is run with set -e. The actual error is emitted
|
|
|
|
# earlier in the previous loop.
|
|
|
|
[ $depNotFound -eq 0 ]
|
|
|
|
|
|
|
|
if [ -n "$rpath" ]; then
|
|
|
|
echo "setting RPATH to: $rpath" >&2
|
|
|
|
patchelf --set-rpath "$rpath" "$toPatch"
|
|
|
|
fi
|
|
|
|
}
|
|
|
|
|
|
|
|
autoPatchelf() {
|
|
|
|
echo "automatically fixing dependencies for ELF files" >&2
|
|
|
|
|
|
|
|
# Add all shared objects of the current output path to the start of
|
|
|
|
# cachedDependencies so that it's choosen first in findDependency.
|
|
|
|
cachedDependencies+=(
|
|
|
|
$(find "$prefix" \! -type d \( -name '*.so' -o -name '*.so.*' \))
|
|
|
|
)
|
|
|
|
local elffile
|
|
|
|
|
|
|
|
# Here we actually have a subshell, which also means that
|
|
|
|
# $cachedDependencies is final at this point, so whenever we want to run
|
|
|
|
# findDependency outside of this, the dependency cache needs to be rebuilt
|
|
|
|
# from scratch, so keep this in mind if you want to run findDependency
|
|
|
|
# outside of this function.
|
2018-09-23 14:45:32 +01:00
|
|
|
while IFS= read -r -d $'\0' file; do
|
|
|
|
isELF "$file" || continue
|
2018-09-25 03:11:33 +01:00
|
|
|
if isExecutable "$file"; then
|
|
|
|
# Skip if the executable is statically linked.
|
autoPatchelfHook: Correctly detect PIE binaries
I originally thought it would just be enough to just check for an INTERP
section in isExecutable, however this would mean that we don't detect
statically linked ELF files, which would break our recent improvement to
gracefully handle those.
In theory, we are only interested in ELF files that have an INTERP
section, so checking for INTERP would be enough. Unfortunately the
isExecutable function is already used outside of autoPatchelfHook, so we
can't easily get rid of it now, so let's actually strive for more
correctness and make isExecutable actually match ELF files that are
executable.
So what we're doing instead now is to check whether either the ELF type
is EXEC *or* we have an INTERP section and if one of them is true we
should have an ELF executable, even if it's statically linked.
Along the way I also set LANG=C for the invocations of readelf, just to
be sure we don't get locale-dependent output.
Tested this with the following command (which contains almost[1] all the
packages using autoPatchelfHook), checking whether we run into any
library-related errors:
nix-build -E 'with import ./. { config.allowUnfree = true; };
runCommand "test-executables" {
drvs = [
anydesk cups-kyodialog3 elasticsearch franz gurobi
masterpdfeditor oracle-instantclient powershell reaper
sourcetrail teamviewer unixODBCDrivers.msodbcsql17 virtlyst
vk-messenger wavebox zoom-us
];
} ("for i in $drvs; do for b in $i/bin/*; do " +
"[ -x \"$b\" ] && timeout 10 \"$b\" || :; done; done")
'
Apart from testing against library-related errors I also compared the
resulting store paths against the ones prior to this commit. Only
anydesk and virtlyst had the same as they didn't have self-references,
everything else differed only because of self-references, except
elasticsearch, which had the following PIE binaries:
* modules/x-pack/x-pack-ml/platform/linux-x86_64/bin/autoconfig
* modules/x-pack/x-pack-ml/platform/linux-x86_64/bin/autodetect
* modules/x-pack/x-pack-ml/platform/linux-x86_64/bin/categorize
* modules/x-pack/x-pack-ml/platform/linux-x86_64/bin/controller
* modules/x-pack/x-pack-ml/platform/linux-x86_64/bin/normalize
These binaries were now patched, which is what this commit is all about.
[1]: I didn't include the "maxx" package (MaXX Interactive Desktop)
because the upstream URLs are no longer existing and I couldn't
find them elsewhere on the web.
Signed-off-by: aszlig <aszlig@nix.build>
Fixes: https://github.com/NixOS/nixpkgs/issues/48330
Cc: @gnidorah (for MaXX Interactive Desktop)
2018-11-03 03:50:26 +00:00
|
|
|
LANG=C readelf -l "$file" | grep -q "^ *INTERP\\>" || continue
|
2018-09-25 03:11:33 +01:00
|
|
|
fi
|
2018-09-23 14:45:32 +01:00
|
|
|
autoPatchelfFile "$file"
|
|
|
|
done < <(find "$prefix" -type f -print0)
|
2018-02-01 21:54:18 +00:00
|
|
|
}
|
|
|
|
|
2018-07-16 00:06:43 +01:00
|
|
|
# XXX: This should ultimately use fixupOutputHooks but we currently don't have
|
|
|
|
# a way to enforce the order. If we have $runtimeDependencies set, the setup
|
|
|
|
# hook of patchelf is going to ruin everything and strip out those additional
|
|
|
|
# RPATHs.
|
|
|
|
#
|
|
|
|
# So what we do here is basically run in postFixup and emulate the same
|
|
|
|
# behaviour as fixupOutputHooks because the setup hook for patchelf is run in
|
|
|
|
# fixupOutput and the postFixup hook runs later.
|
|
|
|
postFixupHooks+=(
|
|
|
|
'for output in $outputs; do prefix="${!output}" autoPatchelf; done'
|
|
|
|
)
|